diff options
| author | Alexander Kurz <akurz@blala.de> | 2017-05-14 23:26:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-05-16 07:36:00 +0200 |
| commit | c825e0649a14e11eb9cb52a0f5ac10304afec04a (patch) | |
| tree | ecb91acb8f2e9b4c7cd748f835aea7f275b38977 | |
| parent | 873f51ba8dbf14173a62ca938675bfb00caef0c8 (diff) | |
| download | barebox-c825e0649a14e11eb9cb52a0f5ac10304afec04a.tar.gz barebox-c825e0649a14e11eb9cb52a0f5ac10304afec04a.tar.xz | |
ARM: i.MX50: Kindle-MX50 DT fixes
* fix IOMUX for MAX14656 IRQ, it requires a pull-up to work
* enable UART console for Model EY21
* set up IOMUX for EY21 GPIO lid-close hall sensor
* remove IOMUX for non-existing EY21 GPIO keys
* replace space indention with tabs
Signed-off-by: Alexander Kurz <akurz@blala.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/dts/imx50-kindle-common.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/dts/imx50-kindle-d01100.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/imx50-kindle-d01200.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/imx50-kindle-ey21.dts | 13 |
4 files changed, 15 insertions, 8 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 23bfbb5d24..55171d7f2e 100644 --- a/arch/arm/dts/imx50-kindle-d01100.dts +++ b/arch/arm/dts/imx50-kindle-d01100.dts @@ -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 d8e5ed3283..cf65966a70 100644 --- a/arch/arm/dts/imx50-kindle-d01200.dts +++ b/arch/arm/dts/imx50-kindle-d01200.dts @@ -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 0be7001a8d..3b8b5d8fcf 100644 --- a/arch/arm/dts/imx50-kindle-ey21.dts +++ b/arch/arm/dts/imx50-kindle-ey21.dts @@ -19,6 +19,10 @@ model = "Amazon Kindle EY21"; compatible = "amazon,kindle-ey21", "fsl,imx50"; + chosen { + linux,stdout-path = &uart1; + }; + memory { device_type = "memory"; reg = <0x70000000 0x10000000>; @@ -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"; |