diff options
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/imx50-kindle-common.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/imx50-kindle-d01100.dts | 8 | ||||
| -rw-r--r-- | arch/arm/dts/imx50-kindle-d01200.dts | 4 | ||||
| -rw-r--r-- | arch/arm/dts/imx50-kindle-ey21.dts | 15 |
4 files changed, 18 insertions, 11 deletions
diff --git a/arch/arm/dts/imx50-kindle-common.dtsi b/arch/arm/dts/imx50-kindle-common.dtsi index a6ea504f6c..048e953898 100644 --- a/arch/arm/dts/imx50-kindle-common.dtsi +++ b/arch/arm/dts/imx50-kindle-common.dtsi @@ -124,7 +124,7 @@ pinctrl_charger_detect: chargerdetectgrp { fsl,pins = < - MX50_PAD_OWIRE__GPIO6_26 0x84 + MX50_PAD_OWIRE__GPIO6_26 0xe4 >; }; }; diff --git a/arch/arm/dts/imx50-kindle-d01100.dts b/arch/arm/dts/imx50-kindle-d01100.dts index edbc929120..55171d7f2e 100644 --- a/arch/arm/dts/imx50-kindle-d01100.dts +++ b/arch/arm/dts/imx50-kindle-d01100.dts @@ -17,7 +17,7 @@ / { model = "Amazon Kindle D01100"; - compatible = "fsl,imx50"; + compatible = "amazon,kindle-d01100", "fsl,imx50"; chosen { linux,stdout-path = &uart1; @@ -34,8 +34,8 @@ pinctrl-0 = <&pinctrl_hog>; imx50-kindle-d01100 { - pinctrl_hog: hoggrp { - fsl,pins = < + pinctrl_hog: hoggrp { + fsl,pins = < MX50_PAD_EIM_EB1__GPIO1_20 0xc0 MX50_PAD_EIM_EB0__GPIO1_19 0xc0 MX50_PAD_EIM_CS2__GPIO1_16 0xc0 @@ -60,7 +60,7 @@ pinctrl-0 = <&pinctrl_charger_detect>; interrupt-parent = <&gpio6>; interrupts = <26 IRQ_TYPE_LEVEL_HIGH>; - }; + }; smart-battery@55 { compatible = "ti,bq27210"; diff --git a/arch/arm/dts/imx50-kindle-d01200.dts b/arch/arm/dts/imx50-kindle-d01200.dts index 8f93c1b520..cf65966a70 100644 --- a/arch/arm/dts/imx50-kindle-d01200.dts +++ b/arch/arm/dts/imx50-kindle-d01200.dts @@ -17,7 +17,7 @@ / { model = "Amazon Kindle D01200"; - compatible = "fsl,imx50"; + compatible = "amazon,kindle-d01200", "fsl,imx50"; chosen { linux,stdout-path = &uart1; @@ -68,7 +68,7 @@ pinctrl-0 = <&pinctrl_charger_detect>; interrupt-parent = <&gpio6>; interrupts = <26 IRQ_TYPE_LEVEL_HIGH>; - }; + }; smart-battery@55 { compatible = "ti,bq27210"; diff --git a/arch/arm/dts/imx50-kindle-ey21.dts b/arch/arm/dts/imx50-kindle-ey21.dts index 1b8f2ad89a..3b8b5d8fcf 100644 --- a/arch/arm/dts/imx50-kindle-ey21.dts +++ b/arch/arm/dts/imx50-kindle-ey21.dts @@ -17,7 +17,11 @@ / { model = "Amazon Kindle EY21"; - compatible = "fsl,imx50"; + compatible = "amazon,kindle-ey21", "fsl,imx50"; + + chosen { + linux,stdout-path = &uart1; + }; memory { device_type = "memory"; @@ -27,9 +31,12 @@ &iomuxc { imx50-kindle-ey21 { - pinctrl_gpiokey: gpiokeygrp { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hog>; + + pinctrl_hog: hoggrp { fsl,pins = < - MX50_PAD_EIM_EB1__GPIO1_20 0x40 + MX50_PAD_SD2_WP__GPIO5_16 0xe4 /* hall */ >; }; }; @@ -48,7 +55,7 @@ pinctrl-0 = <&pinctrl_charger_detect>; interrupt-parent = <&gpio6>; interrupts = <26 IRQ_TYPE_LEVEL_HIGH>; - }; + }; smart-battery@55 { compatible = "ti,bq27210"; |