]> Git Repo - linux.git/commitdiff
Merge tag 'omap-for-v6.13/dt-signed-1' of https://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <[email protected]>
Tue, 12 Nov 2024 21:44:07 +0000 (22:44 +0100)
committerArnd Bergmann <[email protected]>
Tue, 12 Nov 2024 21:44:07 +0000 (22:44 +0100)
ARM: dts: OMAP updates for v6.13

Misc. minor updates for OMAP3, OMAP4, AM3 and DRA7 platforms.

* tag 'omap-for-v6.13/dt-signed-1' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap:
  ARM: dts: omap4-kc1: fix twl6030 power node
  ARM: dts: am335x-bone-common: Increase MDIO reset deassert delay to 50ms
  ARM: dts: ti/omap: omap4-epson-embt2ws: add charger
  ARM: dts: omap36xx: declare 1GHz OPP as turbo again
  ARM: ti/omap: omap3-gta04a5: add Bluetooth
  ARM: dts: ti/omap: dra7: fix redundant clock divider definition
  ARM: dts: ti/omap: use standard node name for twl4030 charger
  ARM: dts: omap: omap4-epson-embt2ws: add GPIO expander
  ARM: dts: omap: omap4-epson-embt2ws: add unknown gpio outputs
  ARM: dts: omap: omap4-epson-embt2ws: wire up regulators
  ARM: dts: omap: omap4-epson-embt2ws: define GPIO regulators
  ARM: dts: ti: dra7: Remove double include of clock bindings
  ARM: dts: ti: omap3434-sdp: drop linux,mtd-name from onenand node
  ARM: dts: ti: omap: am335x-baltos: drop "gpmc,device-nand" from NAND node
  ARM: dts: ti: drop linux,mtd-name from NAND nodes
  ARM: dts: ti/omap: Fix at24 EEPROM node names

37 files changed:
arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi
arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
arch/arm/boot/dts/ti/omap/am335x-pdu001.dts
arch/arm/boot/dts/ti/omap/am335x-shc.dts
arch/arm/boot/dts/ti/omap/am3517-som.dtsi
arch/arm/boot/dts/ti/omap/am3874-iceboard.dts
arch/arm/boot/dts/ti/omap/am437x-cm-t43.dts
arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts
arch/arm/boot/dts/ti/omap/am437x-sbc-t43.dts
arch/arm/boot/dts/ti/omap/am437x-sk-evm.dts
arch/arm/boot/dts/ti/omap/am43x-epos-evm.dts
arch/arm/boot/dts/ti/omap/am57xx-cl-som-am57x.dts
arch/arm/boot/dts/ti/omap/am57xx-sbc-am57x.dts
arch/arm/boot/dts/ti/omap/dm8148-evm.dts
arch/arm/boot/dts/ti/omap/dm8168-evm.dts
arch/arm/boot/dts/ti/omap/dra62x-j5eco-evm.dts
arch/arm/boot/dts/ti/omap/dra7.dtsi
arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi
arch/arm/boot/dts/ti/omap/logicpd-som-lv.dtsi
arch/arm/boot/dts/ti/omap/logicpd-torpedo-som.dtsi
arch/arm/boot/dts/ti/omap/omap3-cm-t3x.dtsi
arch/arm/boot/dts/ti/omap/omap3-evm-37xx.dts
arch/arm/boot/dts/ti/omap/omap3-evm.dts
arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi
arch/arm/boot/dts/ti/omap/omap3-gta04a5.dts
arch/arm/boot/dts/ti/omap/omap3-igep.dtsi
arch/arm/boot/dts/ti/omap/omap3-ldp.dts
arch/arm/boot/dts/ti/omap/omap3-overo-base.dtsi
arch/arm/boot/dts/ti/omap/omap3-sb-t35.dtsi
arch/arm/boot/dts/ti/omap/omap3430-sdp.dts
arch/arm/boot/dts/ti/omap/omap36xx.dtsi
arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
arch/arm/boot/dts/ti/omap/omap4-kc1.dts
arch/arm/boot/dts/ti/omap/omap5-cm-t54.dts
arch/arm/boot/dts/ti/omap/omap5-sbc-t54.dts
arch/arm/boot/dts/ti/omap/twl4030.dtsi

index a4beb718559c428c0fd337c576cc27c8d6d53af2..ae2e8dffbe0492ed9684e65ddcc06cda22c8c13f 100644 (file)
                ti,nand-ecc-opt = "bch8";
                ti,nand-xfer-type = "prefetch-dma";
 
-               gpmc,device-nand = "true";
                gpmc,device-width = <1>;
                gpmc,sync-clk-ps = <0>;
                gpmc,cs-on-ns = <0>;
                pinctrl-0 = <&tps65910_pins>;
        };
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c02";
                pagesize = <8>;
                reg = <0x50>;
index a0fb431aec8411d85804b7f8822f0d9ef1bfdf56..c400b7b70d0d20040bfd47ff0779e40ed1c72bc2 100644 (file)
                reg = <0x24>;
        };
 
-       baseboard_eeprom: baseboard_eeprom@50 {
+       baseboard_eeprom: eeprom@50 {
                compatible = "atmel,24c256";
                reg = <0x50>;
                vcc-supply = <&ldo4_reg>;
        status = "okay";
        clock-frequency = <100000>;
 
-       cape_eeprom0: cape_eeprom0@54 {
+       cape_eeprom0: eeprom@54 {
                compatible = "atmel,24c256";
                reg = <0x54>;
 
                };
        };
 
-       cape_eeprom1: cape_eeprom1@55 {
+       cape_eeprom1: eeprom@55 {
                compatible = "atmel,24c256";
                reg = <0x55>;
 
                };
        };
 
-       cape_eeprom2: cape_eeprom2@56 {
+       cape_eeprom2: eeprom@56 {
                compatible = "atmel,24c256";
                reg = <0x56>;
 
                };
        };
 
-       cape_eeprom3: cape_eeprom3@57 {
+       cape_eeprom3: eeprom@57 {
                compatible = "atmel,24c256";
                reg = <0x57>;
 
                /* Support GPIO reset on revision C3 boards */
                reset-gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
                reset-assert-us = <300>;
-               reset-deassert-us = <13000>;
+               reset-deassert-us = <50000>;
        };
 };
 
index 8878da773d679017a6b409981c16105ac69a6cbc..f579df4c2c540dd7f6a688ad4a6d9bf0d1e6fc5b 100644 (file)
 };
 
 &i2c0 {
-       baseboard_eeprom: baseboard_eeprom@50 {
+       baseboard_eeprom: eeprom@50 {
                compatible = "atmel,24c256";
                reg = <0x50>;
 
index 17574d0d05259ebb785e554300adb9b9abb724b9..ded19e24e66655b43277ea5cd8f654232b547f4b 100644 (file)
                reg = <0x2d>;
        };
 
-       m2_eeprom: m2_eeprom@50 {
+       m2_eeprom: eeprom@50 {
                compatible = "atmel,24c256";
                reg = <0x50>;
                status = "okay";
        status = "okay";
        clock-frequency = <100000>;
 
-       board_24aa025e48: board_24aa025e48@50 {
+       board_24aa025e48: eeprom@50 {
                compatible = "atmel,24c02";
                reg = <0x50>;
        };
 
-       backplane_24aa025e48: backplane_24aa025e48@53 {
+       backplane_24aa025e48: eeprom@53 {
                compatible = "atmel,24c02";
                reg = <0x53>;
        };
index 9297cb1efcd4b6991a4b67cdc861a2045dd7082e..5974828226082f0a609fc6d2604c8e0fbf083f5d 100644 (file)
                reg = <0x24>;
        };
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c32";
                pagesize = <32>;
                reg = <0x50>;
index bd0a6c95afa16dda1752a24e59612c2a1961bb16..e36cd98f57fab4951719768042e889870352c931 100644 (file)
@@ -44,7 +44,6 @@
 
        nand@0,0 {
                compatible = "ti,omap2-nand";
-               linux,mtd-name = "micron,mt29f4g16abchch";
                reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
                nand-bus-width = <16>;
                ti,nand-ecc-opt = "bch8";
index ac082e83a9a2045cdee565c5687ae2e2843f5b37..bbb9200a1f268da0245071471d24b6b7b9329b9a 100644 (file)
                        tmp100@4c { compatible = "ti,tmp100"; reg = <0x4c>; };
 
                        /* EEPROM bank and serial number are treated as separate devices */
-                       at24c01@57 { compatible = "atmel,24c01"; reg = <0x57>; };
-                       at24cs01@5f { compatible = "atmel,24cs01"; reg = <0x5f>; };
+                       eeprom@57 { compatible = "atmel,24c01"; reg = <0x57>; };
+                       eeprom@5f { compatible = "atmel,24cs01"; reg = <0x5f>; };
                };
        };
 };
                        multi-master;
 
                        /* All backplanes should have this -- it's how we know they're there. */
-                       at24c08@54 { compatible="atmel,24c08"; reg=<0x54>; };
-                       at24cs08@5c { compatible="atmel,24cs08"; reg=<0x5c>; };
+                       eeprom@54 { compatible="atmel,24c08"; reg=<0x54>; };
+                       eeprom@5c { compatible="atmel,24cs08"; reg=<0x5c>; };
 
                        /* 16 slot backplane */
                        tmp421@4d { compatible="ti,tmp421"; reg=<0x4d>; };
index 172516a7667e19cbe527e03018bee2fc010c4c3c..e06fc30091c89e473fca29a87b95c8b6cd79e9de 100644 (file)
                };
        };
 
-       eeprom_module: at24@50 {
+       eeprom_module: eeprom@50 {
                compatible = "atmel,24c02";
                reg = <0x50>;
                pagesize = <16>;
index 00682ce7e14c4d23d962f30115af0a4ca4aa64e4..826f687c368abeda307d957a6947453e20dbb153 100644 (file)
        pinctrl-1 = <&i2c0_pins_sleep>;
        clock-frequency = <400000>;
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c256";
                pagesize = <64>;
                reg = <0x50>;
index 5ec57dcb06592c8305124f4f5b0a557cd269d9ee..73badf80b4ff361df5f6de551916e2f7edc230bd 100644 (file)
                #gpio-cells = <2>;
        };
 
-       eeprom_base: at24@50 {
+       eeprom_base: eeprom@50 {
                compatible = "atmel,24c02";
                reg = <0x50>;
                pagesize = <16>;
index 9c97006ffd5b01b879ad88b04bed11596506c744..4700f9879d2d279262109d03b2e184797305066f 100644 (file)
                };
        };
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c256";
                pagesize = <64>;
                reg = <0x50>;
index 9193a4cfba78a91f98e8cea3486a0e31cf480a75..4ac94be8d0003743c8cac6dd256008e505804a10 100644 (file)
                };
        };
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c256";
                pagesize = <64>;
                reg = <0x50>;
index d6e3152b02f70b2fe7822c393b57349ba0c21712..3dd898955e767ea506b85648224812454b2b1045 100644 (file)
                reg = <0x56>;
        };
 
-       eeprom_module: atmel@50 {
+       eeprom_module: eeprom@50 {
                compatible = "atmel,24c08";
                reg = <0x50>;
                pagesize = <16>;
index 64675f4edb6013c8425445d0056684cbe421b6f4..41bef36c55541d0e4b51836d132adffd42e86406 100644 (file)
        pinctrl-0 = <&i2c5_pins_default>;
        clock-frequency = <400000>;
 
-       eeprom_base: atmel@54 {
+       eeprom_base: eeprom@54 {
                compatible = "atmel,24c08";
                reg = <0x54>;
                pagesize = <16>;
index ae8d9fa09d16b999088c2cf1579afa5f9e20cdf7..57a9eef09f6f09e6ccfcf4e8a2f5bd4e1ff4eff4 100644 (file)
@@ -51,7 +51,6 @@
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,mt29f2g16aadwp";
                #address-cells = <1>;
                #size-cells = <1>;
                ti,nand-ecc-opt = "bch8";
index 1d80288f6ba5fad1ca6bbf710ae7d1ac16bf29d8..6130b9a5f660680d86c1c7d4dad57b5a3a2d7ba1 100644 (file)
 
        nand@0,0 {
                compatible = "ti,omap2-nand";
-               linux,mtd-name = "micron,mt29f2g16aadwp";
                reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
index 2f6ac267fc150330c44371c1cf0ea7ab1bc13923..df05a06823221b43cd6711dd97aa5a3c1e08a0d7 100644 (file)
@@ -51,7 +51,6 @@
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,mt29f2g16aadwp";
                #address-cells = <1>;
                #size-cells = <1>;
                ti,nand-ecc-opt = "bch8";
index 164fa88c459e97375b589cf579f34dc58f0ebbe8..b709703f6c0d42a9a76d3a4fcf84ad9f11247382 100644 (file)
@@ -9,7 +9,6 @@
 #include <dt-bindings/clock/dra7.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/pinctrl/dra.h>
-#include <dt-bindings/clock/dra7.h>
 
 #define MAX_SOURCES 400
 
index 04f08b8c64d2783b7afb7d0980c6c3d380e23d3b..0de16ee262cf47e576630543652b3855f76d98e3 100644 (file)
                clocks = <&apll_pcie_ck>;
                #clock-cells = <0>;
                reg = <0x021c>;
-               ti,dividers = <2>, <1>;
                ti,bit-shift = <8>;
                ti,max-div = <2>;
        };
index c0e6b73fa472db9648911e06a7bcc80ecc650f9b..d51a436d9774d605959fdf9767b39bc064a199cb 100644 (file)
@@ -51,7 +51,6 @@
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,mt29f4g16abbda3w";
                nand-bus-width = <16>;
                ti,nand-ecc-opt = "bch8";
                rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */
index 227699890890a6fb3ac4e637cd6b0f8199727061..0b65ac5b4230933b47097c1c035be022494f1658 100644 (file)
@@ -49,7 +49,6 @@
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,mt29f4g16abbda3w";
                nand-bus-width = <16>;
                ti,nand-ecc-opt = "bch8";
                rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */
        pinctrl-names = "default";
        pinctrl-0 = <&i2c3_pins>;
        clock-frequency = <400000>;
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c64";
                readonly;
                reg = <0x50>;
index 950a29f9b4a0b724012be0972b34ba3ff2e6ccea..cd13826d033d8ec40c72740d5e2ac3733aeafe3f 100644 (file)
 
        clock-frequency = <400000>;
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
index e0346bf842fcd142b87e245fe7d1c051b51077f0..9c60ac853a4045053fde2340fe32a7f21961d433 100644 (file)
@@ -60,7 +60,6 @@
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "hynix,h8kds0un0mer-4em";
                nand-bus-width = <16>;
                gpmc,device-width = <2>;
                ti,nand-ecc-opt = "bch8";
index a2a1613c45c3ef111b0b53e6f2e456b63ac6a220..28caa5d93b87cda8a0e8212398d27edd995285ee 100644 (file)
@@ -60,7 +60,6 @@
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,mt29f2g16abdhc";
                nand-bus-width = <16>;
                gpmc,device-width = <2>;
                ti,nand-ecc-opt = "bch8";
index 3661340009e7a4a1ca6ccb30fd872a767ea33b2d..2ee3ddd640209b6cfb2213470176cb8210317d11 100644 (file)
        };
 
        /* RFID EEPROM */
-       m24lr64@50 {
+       eeprom@50 {
                compatible = "atmel,24c64";
                reg = <0x50>;
        };
index 8bd6b4b1f30b89c998647ac83fe2d6f0233ca02f..d3a81f0b880fd7c471d76e36e6ab3a02ce3727c2 100644 (file)
        };
 };
 
+&uart1 {
+       bluetooth {
+               compatible = "ti,wl1837-st";
+               pinctrl-names = "default";
+               pinctrl-0 = <&bt_pins>;
+               enable-gpios = <&gpio5 9 GPIO_ACTIVE_HIGH>;     /* GPIO_137 */
+       };
+};
+
+
 &i2c2 {
        /delete-node/ bmp085@77;
        /delete-node/ bma180@41;
index e068ecf86b8f8ae0643843f4f32c0083313a2f7b..7346cad84edab98f0f8081e6832897da8e96510d 100644 (file)
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,mt29c4g96maz";
                nand-bus-width = <16>;
                gpmc,device-width = <2>;
                ti,nand-ecc-opt = "bch8";
index bb6fab9fa47dfd6a190d94e4cfdb048728e29028..cf325f56b464458e586d59cc3be30ec37450b029 100644 (file)
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,nand";
                nand-bus-width = <16>;
                gpmc,device-width = <2>;
                ti,nand-ecc-opt = "bch8";
index cc57626ea6076daffc4a59d09de500ddb091a032..2793821b2c33832b2ffcc956fdf3f577551aca00 100644 (file)
 
        nand@0,0 {
                compatible = "ti,omap2-nand";
-               linux,mtd-name = "micron,mt29c4g96maz";
                reg = <0 0 4>;  /* CS0, offset 0, IO size 4 */
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
index 6730c749d5eaf7cb778188f2ea89afd0c03646fa..da80d7b7d4b149eeb06c103e3d5f56e07ceb53f5 100644 (file)
@@ -89,7 +89,7 @@
 
        clock-frequency = <400000>;
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
index 258ecd9e45198feb4b7cc29669bb156692db32da..cc5e9035ef73a35fe2982e69cb5757688c54a645 100644 (file)
                interrupt-parent = <&gpmc>;
                interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
                             <1 IRQ_TYPE_NONE>; /* termcount */
-               linux,mtd-name = "micron,mt29f1g08abb";
                #address-cells = <1>;
                #size-cells = <1>;
                ti,nand-ecc-opt = "sw";
        };
 
        onenand@2,0 {
-               linux,mtd-name = "samsung,kfm2g16q2m-deb8";
                #address-cells = <1>;
                #size-cells = <1>;
                compatible = "ti,omap2-onenand";
index c3d79ecd56e3982cf4bb374271f9dbc790bb97df..c217094b50abc9d1e9d4c6bf0b571389beb59d19 100644 (file)
@@ -72,6 +72,7 @@
                                         <1375000 1375000 1375000>;
                        /* only on am/dm37x with speed-binned bit set */
                        opp-supported-hw = <0xffffffff 2>;
+                       turbo-mode;
                };
        };
 
index 339e52ba3614b63a0a65afb70a9c9d3966ba0ce1..c90f43cc2fae9c650442b7eb6e3b1587b0aa706a 100644 (file)
                reg = <0x80000000 0x40000000>; /* 1024M */
        };
 
+       battery: battery {
+               compatible = "simple-battery";
+               device-chemistry = "lithium-ion";
+               charge-full-design-microamp-hours = <2720000>;
+               voltage-max-design-microvolt = <4200000>;
+               voltage-min-design-microvolt = <3300000>;
+
+               constant-charge-voltage-max-microvolt = <4200000>;
+               /*
+                * vendor kernel says max charge 1400000, input limit 900000
+                * and charges only with dcp chargers. So it is unclear what
+                * is really allowed. Play safe for now and restrict things
+                * here. Maybe 900000 is just the limit of the vendor charger?
+                */
+               constant-charge-current-max-microamp = <900000>;
+               charge-term-current-microamp = <200000>;
+       };
+
        backlight-left {
                compatible = "pwm-backlight";
                pwms = <&twl_pwm 1 7812500>;
-               power-supply = <&unknown_supply>;
+               power-supply = <&lb_v50>;
        };
 
        backlight-right {
                compatible = "pwm-backlight";
                pwms = <&twl_pwm 0 7812500>;
-               power-supply = <&unknown_supply>;
+               power-supply = <&lb_v50>;
        };
 
        chosen {
                };
        };
 
-       unknown_supply: unknown-supply {
+       cb_v18: regulator-cb-v18 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&cb_v18_pins>;
+               compatible = "regulator-fixed";
+               regulator-name = "cb_v18";
+               regulator-min-microvolt = <1800000>;
+               regulator-max-microvolt = <1800000>;
+               regulator-always-on;
+               gpio = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       cb_v33: regulator-cb-v33 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&cb_v33_pins>;
+               compatible = "regulator-fixed";
+               regulator-name = "cb_v33";
+               regulator-min-microvolt = <3300000>;
+               regulator-max-microvolt = <3300000>;
+               regulator-always-on;
+               gpio = <&gpio6 30 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       regulator-cb-v50 {
+               pinctrl-names = "default";
+               pinctrl-0 = <&cb_v50_pins>;
+               compatible = "regulator-fixed";
+               regulator-name = "cb_v50";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               gpio = <&gpio6 31 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
+       };
+
+       lb_v50: regulator-lb-v50 {
+               /* required for many things at the head (probably indirectly) */
+               pinctrl-names = "default";
+               pinctrl-0 = <&lb_v50_pins>;
                compatible = "regulator-fixed";
-               regulator-name = "unknown";
+               regulator-name = "lb_v50";
+               regulator-min-microvolt = <5000000>;
+               regulator-max-microvolt = <5000000>;
+               regulator-always-on;
+               gpio = <&gpio1 27 GPIO_ACTIVE_HIGH>;
+               enable-active-high;
        };
 
        wl12xx_pwrseq: wl12xx-pwrseq {
        };
 };
 
+&gpio1 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&gpio1_hog_pins &gpio1wk_hog_pins>;
+
+       lb-reset-hog {
+               gpio-hog;
+               gpios = <9 GPIO_ACTIVE_HIGH>;
+               output-low;
+               line-name = "lb_reset";
+       };
+
+       power-en-hog {
+               gpio-hog;
+               gpios = <10 GPIO_ACTIVE_HIGH>;
+               output-high;
+               line-name = "power_en";
+       };
+
+       /*
+        * Name taken from vendor kernel but no evidence of actual usage found
+        * nor what it really controls.
+        */
+       panel-power-en-hog {
+               gpio-hog;
+               gpios = <14 GPIO_ACTIVE_HIGH>;
+               output-low;
+               line-name = "panel_power_en";
+       };
+
+       /*
+        * These two are exported to sysfs in vendor kernel, usage unknown,
+        * backlight state seems unrelated to these.
+        */
+       blc-r-hog {
+               gpio-hog;
+               gpios = <17 GPIO_ACTIVE_HIGH>;
+               output-low;
+               line-name = "blc_r";
+       };
+
+       blc-l-hog {
+               gpio-hog;
+               gpios = <16 GPIO_ACTIVE_HIGH>;
+               output-low;
+               line-name = "blc_l";
+       };
+
+       high-hog {
+               gpio-hog;
+               gpios = <15 GPIO_ACTIVE_HIGH /* maybe dsi to dpi chip reset? */
+                        21 GPIO_ACTIVE_HIGH
+                        26 GPIO_ACTIVE_HIGH>;
+               output-high;
+               line-name = "unknown-high";
+       };
+
+       low-hog {
+               gpio-hog;
+               gpios = <18 GPIO_ACTIVE_HIGH
+                        19 GPIO_ACTIVE_HIGH
+                        20 GPIO_ACTIVE_HIGH
+                        22 GPIO_ACTIVE_HIGH>;
+               output-low;
+               line-name = "unknown-low";
+       };
+};
+
 &i2c1 {
        pinctrl-names = "default";
        pinctrl-0 = <&i2c1_pins>;
                #interrupt-cells = <1>;
                system-power-controller;
 
+               charger {
+                       compatible = "ti,twl6032-charger", "ti,twl6030-charger";
+                       interrupts = <2>, <5>;
+                       io-channels = <&gpadc 10>;
+                       io-channel-names = "vusb";
+                       monitored-battery = <&battery>;
+               };
+
                rtc {
                        compatible = "ti,twl4030-rtc";
                        interrupts = <11>;
                        #pwm-cells = <2>;
                };
 
-               gpadc {
+               gpadc: gpadc {
                        compatible = "ti,twl6032-gpadc";
                        interrupts = <3>;
                        #io-channel-cells = <1>;
 
        clock-frequency = <200000>;
 
+       /* is sometimes not available, research needed */
+       gpio_head: gpio@20 {
+               compatible = "ti,tca6408";
+               reg = <0x20>;
+               gpio-controller;
+               #gpio-cells = <2>;
+       };
+
+       /*
+        * camera chip at 0x3c, available if <&gpio_head 1> high
+        * and <&gpio_head 5> low
+        */
+
        /* at head/glasses */
        mpu9150h: imu@68 {
                compatible = "invensense,mpu9150";
                pinctrl-0 = <&mpu9150_pins>;
                interrupt-parent = <&gpio2>;
                interrupt = <7 IRQ_TYPE_LEVEL_HIGH>;
+               vddio-supply = <&cb_v18>;
+               vdd-supply = <&cb_v33>;
                invensense,level-shifter;
        };
 };
                >;
        };
 
+       cb_v18_pins: pinmux-cb-v18-pins {
+               pinctrl-single,pins = <
+                       OMAP4_IOPAD(0x1d0, PIN_OUTPUT | MUX_MODE3) /* gpio28 */
+               >;
+       };
+
+       cb_v33_pins: pinmux-cb-v33-pins {
+               pinctrl-single,pins = <
+                       OMAP4_IOPAD(0x1d2, PIN_OUTPUT | MUX_MODE3) /* gpio190 */
+               >;
+       };
+
+       cb_v50_pins: pinmux-cb-v50-pins {
+               pinctrl-single,pins = <
+                       OMAP4_IOPAD(0x1d4, PIN_OUTPUT | MUX_MODE3) /* gpio191 */
+               >;
+       };
+
        gpio_keys_pins: pinmux-gpio-key-pins {
                pinctrl-single,pins = <
                        OMAP4_IOPAD(0x56, PIN_INPUT_PULLUP | MUX_MODE3) /* gpio35 */
                >;
        };
 
+       gpio1_hog_pins: pinmux-gpio1-hog-pins {
+               pinctrl-single,pins = <
+                       OMAP4_IOPAD(0x1b4, PIN_OUTPUT | MUX_MODE3) /* gpio14 */
+                       OMAP4_IOPAD(0x1b8, PIN_OUTPUT | MUX_MODE3) /* gpio16 */
+                       OMAP4_IOPAD(0x1ba, PIN_OUTPUT | MUX_MODE3) /* gpio17 */
+
+                       OMAP4_IOPAD(0x1b6, PIN_OUTPUT | MUX_MODE3) /* gpio15 */
+                       OMAP4_IOPAD(0x1bc, PIN_OUTPUT | MUX_MODE3) /* gpio18 */
+                       OMAP4_IOPAD(0x1be, PIN_OUTPUT | MUX_MODE3) /* gpio19 */
+                       OMAP4_IOPAD(0x1c0, PIN_OUTPUT | MUX_MODE3) /* gpio20 */
+                       OMAP4_IOPAD(0x1c2, PIN_OUTPUT | MUX_MODE3) /* gpio21 */
+                       OMAP4_IOPAD(0x1c4, PIN_OUTPUT | MUX_MODE3) /* gpio22 */
+                       OMAP4_IOPAD(0x1cc, PIN_OUTPUT | MUX_MODE3) /* gpio26 */
+               >;
+       };
+
        i2c1_pins: pinmux-i2c1-pins {
                pinctrl-single,pins = <
                           OMAP4_IOPAD(0x122, PIN_INPUT_PULLUP | MUX_MODE0)     /* i2c1_scl */
                >;
        };
 
+       lb_v50_pins: pinmux-lb-v50-pins {
+               pinctrl-single,pins = <
+                       OMAP4_IOPAD(0x1ce, PIN_OUTPUT | MUX_MODE3) /* gpio27 */
+               >;
+       };
+
        mcbsp2_pins: pinmux-mcbsp2-pins {
                pinctrl-single,pins = <
                        OMAP4_IOPAD(0x0f6, PIN_INPUT | MUX_MODE0)       /* abe_mcbsp2_clkx */
        };
 };
 
+&omap4_pmx_wkup {
+       gpio1wk_hog_pins: pinmux-gpio1wk-hog-pins {
+               pinctrl-single,pins = <
+                       OMAP4_IOPAD(0x68, PIN_INPUT_PULLDOWN | MUX_MODE3) /* gpio9 */
+                       OMAP4_IOPAD(0x6a, PIN_INPUT | MUX_MODE3) /* gpio10 */
+               >;
+       };
+};
+
 &uart2 {
        pinctrl-names = "default";
        pinctrl-0 = <&uart2_pins &bt_pins>;
index c6b79ba8bbc91a250e3a4e93e741298d7e7d3f4d..df874d5f5327fc5c7ca724d7d01c64fb7cc89ed5 100644 (file)
                reg = <0x48>;
                /* IRQ# = 7 */
                interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
-
-               twl_power: power {
-                       compatible = "ti,twl6030-power";
-                       ti,system-power-controller;
-               };
+               system-power-controller;
        };
 };
 
index 6767382996ab3343038618f0da6523ac16ce2823..2fd8111de903670c035d3c994a026873eecb8847 100644 (file)
 
        clock-frequency = <400000>;
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
index 02716fb796bda154810a0b6767585109f60b9cb4..7ae60dc198f303b3d42a7013482d0c409a913789 100644 (file)
@@ -44,7 +44,7 @@
 
        clock-frequency = <400000>;
 
-       at24@50 {
+       eeprom@50 {
                compatible = "atmel,24c02";
                pagesize = <16>;
                reg = <0x50>;
index a5d9c5738317aac9a140cc5993a9de7773a422b8..07b9ca942e78d089d5b2d4ecf66ab894e95e25e5 100644 (file)
@@ -16,7 +16,7 @@
                interrupts = <11>;
        };
 
-       charger: bci {
+       charger: charger {
                compatible = "ti,twl4030-bci";
                interrupts = <9>, <2>;
                bci3v1-supply = <&vusb3v1>;
This page took 0.108277 seconds and 4 git commands to generate.