* [PATCH 2/2] ARM: i.MX50: Kindle-MX50 DT fixes
2017-05-14 21:26 [PATCH 1/2] ARM: i.MX50: Amazon Kindle: Model EY21 compatibility check Alexander Kurz
@ 2017-05-14 21:26 ` Alexander Kurz
2017-05-16 5:36 ` [PATCH 1/2] ARM: i.MX50: Amazon Kindle: Model EY21 compatibility check Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Kurz @ 2017-05-14 21:26 UTC (permalink / raw)
To: barebox; +Cc: Alexander Kurz
* 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>
---
arch/arm/dts/imx50-kindle-common.dtsi | 2 +-
arch/arm/dts/imx50-kindle-d01100.dts | 6 +++---
arch/arm/dts/imx50-kindle-d01200.dts | 2 +-
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 a6ea504..048e953 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 23bfbb5..55171d7 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 d8e5ed3..cf65966 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 0be7001..3b8b5d8 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";
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] ARM: i.MX50: Amazon Kindle: Model EY21 compatibility check
2017-05-14 21:26 [PATCH 1/2] ARM: i.MX50: Amazon Kindle: Model EY21 compatibility check Alexander Kurz
2017-05-14 21:26 ` [PATCH 2/2] ARM: i.MX50: Kindle-MX50 DT fixes Alexander Kurz
@ 2017-05-16 5:36 ` Sascha Hauer
1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2017-05-16 5:36 UTC (permalink / raw)
To: Alexander Kurz; +Cc: barebox
On Sun, May 14, 2017 at 11:26:25PM +0200, Alexander Kurz wrote:
> Extend the compatibility check for i.MX50 based kindles also on model EY21.
>
> Signed-off-by: Alexander Kurz <akurz@blala.de>
> ---
> arch/arm/boards/kindle-mx50/board.c | 3 ++-
> arch/arm/dts/imx50-kindle-ey21.dts | 2 +-
> 2 files changed, 3 insertions(+), 2 deletions(-)
Applied, thanks
Sascha
>
> diff --git a/arch/arm/boards/kindle-mx50/board.c b/arch/arm/boards/kindle-mx50/board.c
> index 7bd4f91..089dd8e 100644
> --- a/arch/arm/boards/kindle-mx50/board.c
> +++ b/arch/arm/boards/kindle-mx50/board.c
> @@ -123,7 +123,8 @@ static void kindle_rev_init(void)
> static int is_mx50_kindle(void)
> {
> return of_machine_is_compatible("amazon,kindle-d01100") ||
> - of_machine_is_compatible("amazon,kindle-d01200");
> + of_machine_is_compatible("amazon,kindle-d01200") ||
> + of_machine_is_compatible("amazon,kindle-ey21");
> }
>
> static int kindle_mx50_late_init(void)
> diff --git a/arch/arm/dts/imx50-kindle-ey21.dts b/arch/arm/dts/imx50-kindle-ey21.dts
> index 1b8f2ad..0be7001 100644
> --- a/arch/arm/dts/imx50-kindle-ey21.dts
> +++ b/arch/arm/dts/imx50-kindle-ey21.dts
> @@ -17,7 +17,7 @@
>
> / {
> model = "Amazon Kindle EY21";
> - compatible = "fsl,imx50";
> + compatible = "amazon,kindle-ey21", "fsl,imx50";
>
> memory {
> device_type = "memory";
> --
> 2.1.4
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 3+ messages in thread