Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: OMAP updates for v6.13

Browse Source 
Misc. minor updates for OMAP3, OMAP4, AM3 and DRA7 platforms.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEe4dGDhaSf6n1v/EMWTcYmtP7xmUFAmcpG0wACgkQWTcYmtP7
 xmVAqA/+Mv7F+6LSiDQPMETWJ1N2V/AcFI88fIvsHryx1TaaIiqrsVZ02BJF/gRI
 w2CEBS7ioMmdNWgpT3OB3A1vaaoYNEX7NEYCapVR/loK5xwtnOoG3IZyHSQU7VcF
 np42qkzxnAbnafV2MYuDxadXstKYrU++M1kVshKY4rNo+db85Fk3yopofl4QHSfW
 yLQs1xSXj8Flw11fm0BIehENMYFUYvs0fwy1PJviw9GJhVzlBByd8groeiNBgl0K
 JMKq4/yi4xeI/5ooo7Ltlv+BEzP3UZzwTOjLRdiJYGbO8M6ScTHNmnRjrm5Cv+3o
 EC562u28czaZhhAbX1r9gVLsKvKO4FX5q8GNbYXtjVKGudkwGJKxsQlgqtBDmCJu
 YNvdhZTjgRFVKtFdjzfLyZXSvJX+9mzTSH4n3zncoJ4fbRrtpMrOoxEuadrrNP3X
 UPf1i23j42XjlHxgqzn80/jcZKMnK22JZ8Sd1vg8+Iq+huMGcLcPd5ICYcaP38uc
 UQaHjHt9Youw0PsKWzb0c6+55XotKYi8eHCwgX2uxiFj8XmjJmU/MGDR6Df0NJJZ
 Zjh77lwVptk3tsyddlzfmdx0uw4W1iwa4EMi7M8uxfxqpHIUNnTiTSGXuXovccAR
 IOtQEKhv1hdQXRienXPdkEznuR8o7G//lzb/B+us872qhOSRpKo=
 =tPAO
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v6.13/dt-signed-1' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap into soc/dt

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
This commit is contained in:
Arnd Bergmann 2024-11-12 22:44:07 +01:00
commit cbfa4e486e
37 changed files with 248 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/ti/omap/am335x-baltos.dtsi
View File

@ -199,7 +199,6 @@
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>;
@ -251,7 +250,7 @@
pinctrl-0 = <&tps65910_pins>;
};
at24@50 {
eeprom@50 {
compatible = "atmel,24c02";
pagesize = <8>;
reg = <0x50>;

12
arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi
View File

@ -216,7 +216,7 @@
reg = <0x24>;
};
baseboard_eeprom: baseboard_eeprom@50 {
baseboard_eeprom: eeprom@50 {
compatible = "atmel,24c256";
reg = <0x50>;
vcc-supply = <&ldo4_reg>;
@ -240,7 +240,7 @@
status = "okay";
clock-frequency = <100000>;
cape_eeprom0: cape_eeprom0@54 {
cape_eeprom0: eeprom@54 {
compatible = "atmel,24c256";
reg = <0x54>;
@ -255,7 +255,7 @@
};
};
cape_eeprom1: cape_eeprom1@55 {
cape_eeprom1: eeprom@55 {
compatible = "atmel,24c256";
reg = <0x55>;
@ -270,7 +270,7 @@
};
};
cape_eeprom2: cape_eeprom2@56 {
cape_eeprom2: eeprom@56 {
compatible = "atmel,24c256";
reg = <0x56>;
@ -285,7 +285,7 @@
};
};
cape_eeprom3: cape_eeprom3@57 {
cape_eeprom3: eeprom@57 {
compatible = "atmel,24c256";
reg = <0x57>;
@ -409,7 +409,7 @@
/* 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>;
};
};

2
arch/arm/boot/dts/ti/omap/am335x-boneblue.dts
View File

@ -313,7 +313,7 @@
};
&i2c0 {
baseboard_eeprom: baseboard_eeprom@50 {
baseboard_eeprom: eeprom@50 {
compatible = "atmel,24c256";
reg = <0x50>;

6
arch/arm/boot/dts/ti/omap/am335x-pdu001.dts
View File

@ -289,7 +289,7 @@
reg = <0x2d>;
};
m2_eeprom: m2_eeprom@50 {
m2_eeprom: eeprom@50 {
compatible = "atmel,24c256";
reg = <0x50>;
status = "okay";
@ -303,12 +303,12 @@
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>;
};

2
arch/arm/boot/dts/ti/omap/am335x-shc.dts
View File

@ -169,7 +169,7 @@
reg = <0x24>;
};
at24@50 {
eeprom@50 {
compatible = "atmel,24c32";
pagesize = <32>;
reg = <0x50>;

1
arch/arm/boot/dts/ti/omap/am3517-som.dtsi
View 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";

8
arch/arm/boot/dts/ti/omap/am3874-iceboard.dts
View File

@ -249,8 +249,8 @@
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>; };
};
};
};
@ -270,8 +270,8 @@
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>; };

2
arch/arm/boot/dts/ti/omap/am437x-cm-t43.dts
View File

@ -254,7 +254,7 @@
};
};
eeprom_module: at24@50 {
eeprom_module: eeprom@50 {
compatible = "atmel,24c02";
reg = <0x50>;
pagesize = <16>;

2
arch/arm/boot/dts/ti/omap/am437x-idk-evm.dts
View File

@ -333,7 +333,7 @@
pinctrl-1 = <&i2c0_pins_sleep>;
clock-frequency = <400000>;
at24@50 {
eeprom@50 {
compatible = "atmel,24c256";
pagesize = <64>;
reg = <0x50>;

2
arch/arm/boot/dts/ti/omap/am437x-sbc-t43.dts
View File

@ -112,7 +112,7 @@
#gpio-cells = <2>;
};
eeprom_base: at24@50 {
eeprom_base: eeprom@50 {
compatible = "atmel,24c02";
reg = <0x50>;
pagesize = <16>;

2
arch/arm/boot/dts/ti/omap/am437x-sk-evm.dts
View File

@ -570,7 +570,7 @@
};
};
at24@50 {
eeprom@50 {
compatible = "atmel,24c256";
pagesize = <64>;
reg = <0x50>;

2
arch/arm/boot/dts/ti/omap/am43x-epos-evm.dts
View File

@ -651,7 +651,7 @@
};
};
at24@50 {
eeprom@50 {
compatible = "atmel,24c256";
pagesize = <64>;
reg = <0x50>;

2
arch/arm/boot/dts/ti/omap/am57xx-cl-som-am57x.dts
View File

@ -429,7 +429,7 @@
reg = <0x56>;
};
eeprom_module: atmel@50 {
eeprom_module: eeprom@50 {
compatible = "atmel,24c08";
reg = <0x50>;
pagesize = <16>;

2
arch/arm/boot/dts/ti/omap/am57xx-sbc-am57x.dts
View File

@ -105,7 +105,7 @@
pinctrl-0 = <&i2c5_pins_default>;
clock-frequency = <400000>;
eeprom_base: atmel@54 {
eeprom_base: eeprom@54 {
compatible = "atmel,24c08";
reg = <0x54>;
pagesize = <16>;

1
arch/arm/boot/dts/ti/omap/dm8148-evm.dts
View 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";

1
arch/arm/boot/dts/ti/omap/dm8168-evm.dts
View File

@ -119,7 +119,6 @@
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 */

1
arch/arm/boot/dts/ti/omap/dra62x-j5eco-evm.dts
View 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";

1
arch/arm/boot/dts/ti/omap/dra7.dtsi
View 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

1
arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi
View File

@ -1376,7 +1376,6 @@
clocks = <&apll_pcie_ck>;
#clock-cells = <0>;
reg = <0x021c>;
ti,dividers = <2>, <1>;
ti,bit-shift = <8>;
ti,max-div = <2>;
};

1
arch/arm/boot/dts/ti/omap/logicpd-som-lv.dtsi
View 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 */

3
arch/arm/boot/dts/ti/omap/logicpd-torpedo-som.dtsi
View 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 */
@ -103,7 +102,7 @@
pinctrl-names = "default";
pinctrl-0 = <&i2c3_pins>;
clock-frequency = <400000>;
at24@50 {
eeprom@50 {
compatible = "atmel,24c64";
readonly;
reg = <0x50>;

2
arch/arm/boot/dts/ti/omap/omap3-cm-t3x.dtsi
View File

@ -190,7 +190,7 @@
clock-frequency = <400000>;
at24@50 {
eeprom@50 {
compatible = "atmel,24c02";
pagesize = <16>;
reg = <0x50>;

1
arch/arm/boot/dts/ti/omap/omap3-evm-37xx.dts
View 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";

1
arch/arm/boot/dts/ti/omap/omap3-evm.dts
View 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";

2
arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi
View File

@ -601,7 +601,7 @@
};
/* RFID EEPROM */
m24lr64@50 {
eeprom@50 {
compatible = "atmel,24c64";
reg = <0x50>;
};

10
arch/arm/boot/dts/ti/omap/omap3-gta04a5.dts
View File

@ -114,6 +114,16 @@
};
};
&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;

1
arch/arm/boot/dts/ti/omap/omap3-igep.dtsi
View File

@ -111,7 +111,6 @@
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";

1
arch/arm/boot/dts/ti/omap/omap3-ldp.dts
View File

@ -103,7 +103,6 @@
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";

1
arch/arm/boot/dts/ti/omap/omap3-overo-base.dtsi
View File

@ -222,7 +222,6 @@
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 */

2
arch/arm/boot/dts/ti/omap/omap3-sb-t35.dtsi
View File

@ -89,7 +89,7 @@
clock-frequency = <400000>;
at24@50 {
eeprom@50 {
compatible = "atmel,24c02";
pagesize = <16>;
reg = <0x50>;

2
arch/arm/boot/dts/ti/omap/omap3430-sdp.dts
View File

@ -105,7 +105,6 @@
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";
@ -148,7 +147,6 @@
};
onenand@2,0 {
linux,mtd-name = "samsung,kfm2g16q2m-deb8";
#address-cells = <1>;
#size-cells = <1>;
compatible = "ti,omap2-onenand";

1
arch/arm/boot/dts/ti/omap/omap36xx.dtsi
View File

@ -72,6 +72,7 @@
<1375000 1375000 1375000>;
/* only on am/dm37x with speed-binned bit set */
opp-supported-hw = <0xffffffff 2>;
turbo-mode;
};
};

211
arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts
View File

@ -17,16 +17,34 @@
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 {
@ -46,9 +64,53 @@
};
};
unknown_supply: unknown-supply {
cb_v18: regulator-cb-v18 {
pinctrl-names = "default";
pinctrl-0 = <&cb_v18_pins>;
compatible = "regulator-fixed";
regulator-name = "unknown";
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 = "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 {
@ -71,6 +133,73 @@
};
};
&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>;
@ -87,6 +216,14 @@
#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>;
@ -166,7 +303,7 @@
#pwm-cells = <2>;
};
gpadc {
gpadc: gpadc {
compatible = "ti,twl6032-gpadc";
interrupts = <3>;
#io-channel-cells = <1>;
@ -188,6 +325,19 @@
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";
@ -259,6 +409,8 @@
pinctrl-0 = <&mpu9150_pins>;
interrupt-parent = <&gpio2>;
interrupt = <7 IRQ_TYPE_LEVEL_HIGH>;
vddio-supply = <&cb_v18>;
vdd-supply = <&cb_v33>;
invensense,level-shifter;
};
};
@ -336,12 +488,46 @@
>;
};
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 */
@ -387,6 +573,12 @@
>;
};
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 */
@ -457,6 +649,15 @@
};
};
&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>;

6
arch/arm/boot/dts/ti/omap/omap4-kc1.dts
View File

@ -112,11 +112,7 @@
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;
};
};

2
arch/arm/boot/dts/ti/omap/omap5-cm-t54.dts
View File

@ -413,7 +413,7 @@
clock-frequency = <400000>;
at24@50 {
eeprom@50 {
compatible = "atmel,24c02";
pagesize = <16>;
reg = <0x50>;

2
arch/arm/boot/dts/ti/omap/omap5-sbc-t54.dts
View File

@ -44,7 +44,7 @@
clock-frequency = <400000>;
at24@50 {
eeprom@50 {
compatible = "atmel,24c02";
pagesize = <16>;
reg = <0x50>;

2
arch/arm/boot/dts/ti/omap/twl4030.dtsi
View File

@ -16,7 +16,7 @@
interrupts = <11>;
};
charger: bci {
charger: charger {
compatible = "ti,twl4030-bci";
interrupts = <9>, <2>;
bci3v1-supply = <&vusb3v1>;