Skip to contentSkip to conversation

i.MX25 dts updates

PATCH Superseded Sascha Hauer 4 participants 12 messages May 7, 2014 – May 9, 2014

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Sascha Hauer

author maintainer
#0 lore raw

PATCH 1/1 i.MX25 dts updates

The following contains some updates to the i.MX25 dtsi files and the Karo TX25 board.

Sascha

----------------------------------------------------------------
Sascha Hauer (6):
ARM: dts: i.MX25: Add mmc aliases
ARM: dts: i.MX25: remove disabled property of usbmisc unit
ARM: dts: i.MX25: Add IRAM node
ARM: dts: Karo TX25: Add pinctrl nodes
ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC
ARM: dts: Karo TX25: use hardware ecc

 arch/arm/boot/dts/imx25-karo-tx25.dts | 72 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx25.dtsi          |  8 +++-
 2 files changed, 79 insertions(+), 1 deletion(-)
author maintainer
#1 lore raw

PATCH 1/6 ARM: dts: i.MX25: Add mmc aliases

Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx25.dtsi +2 -0
index ea323f0..680486a 100644
@@ -21,6 +21,8 @@
 		i2c0 = &i2c1;
 		i2c1 = &i2c2;
 		i2c2 = &i2c3;
+		mmc0 = &esdhc1;
+		mmc2 = &esdhc2;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
Signature · 1 line
2.0.0.rc0
reviewer
#2 lore raw

PATCH 1/6 ARM: dts: i.MX25: Add mmc aliases

Quoted 10 lines · Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx25.dtsi +0 -0
index ea323f0..680486a 100644

arch/arm/boot/dts/imx25.dtsi line 25

Quoted 5 lines
arch/arm/boot/dts/imx25.dtsi +2 -0
@@ -21,6 +21,8 @@
                i2c0 = &i2c1;
                i2c1 = &i2c2;
                i2c2 = &i2c3;
+               mmc0 = &esdhc1;
+               mmc2 = &esdhc2;

Shouldn't this be:

                   mmc1 = &esdhc2;

instead?

author maintainer
#3 lore raw

PATCH 1/6 ARM: dts: i.MX25: Add mmc aliases

Quoted 18 lines · Fabio Estevam
Quoted 10 lines · Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx25.dtsi +0 -0
index ea323f0..680486a 100644

arch/arm/boot/dts/imx25.dtsi line 25

Quoted 5 lines
arch/arm/boot/dts/imx25.dtsi +2 -0
@@ -21,6 +21,8 @@
                i2c0 = &i2c1;
                i2c1 = &i2c2;
                i2c2 = &i2c3;
+               mmc0 = &esdhc1;
+               mmc2 = &esdhc2;

Shouldn't this be:

Quoted 3 lines
                   mmc1 = &esdhc2;

instead?

Yes, sure.

Shawn, Lothar, is this series otherwise ok?

Sascha

Signature · 4 lines
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 |
#4 lore raw

PATCH 1/6 ARM: dts: i.MX25: Add mmc aliases

Quoted 21 lines · Sascha Hauer
Quoted 20 lines · Fabio Estevam
Quoted 10 lines · Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx25.dtsi +0 -0
index ea323f0..680486a 100644

arch/arm/boot/dts/imx25.dtsi line 25

Quoted 5 lines
arch/arm/boot/dts/imx25.dtsi +2 -0
@@ -21,6 +21,8 @@
                i2c0 = &i2c1;
                i2c1 = &i2c2;
                i2c2 = &i2c3;
+               mmc0 = &esdhc1;
+               mmc2 = &esdhc2;

Shouldn't this be:

                   mmc1 = &esdhc2;
Quoted 5 lines
Quoted 1 line

instead?

Yes, sure.

Shawn, Lothar, is this series otherwise ok?

I'm fine with the series, and can fix above typo, if this is the only comment from people.

Shawn

author maintainer
#5 lore raw

PATCH 2/6 ARM: dts: i.MX25: remove disabled property of usbmisc unit

In reply to Sascha Hauer

It's a unit only used by the usb devices. No need to enable them manually.

Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 1 -
 1 file changed, 1 deletion(-)
arch/arm/boot/dts/imx25.dtsi +0 -1
index 680486a..399b25b 100644
@@ -520,7 +520,6 @@
 				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
 				clock-names = "ipg", "ahb", "per";
 				reg = <0x53ff4600 0x00f>;
-				status = "disabled";
 			};
 
 			dryice at 53ffc000 {
Signature · 1 line
2.0.0.rc0
author maintainer
#6 lore raw

PATCH 3/6 ARM: dts: i.MX25: Add IRAM node

In reply to Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25.dtsi | 5 +++++
 1 file changed, 5 insertions(+)
arch/arm/boot/dts/imx25.dtsi +5 -0
index 399b25b..07aff54 100644
@@ -531,6 +531,11 @@
 			};
 		};
 
+		iram: sram at 78000000 {
+			compatible = "mmio-sram";
+			reg = <0x78000000 0x20000>;
+		};
+
 		emi at 80000000 {
 			compatible = "fsl,emi-bus", "simple-bus";
 			#address-cells = <1>;
Signature · 1 line
2.0.0.rc0
author maintainer
#7 lore raw

PATCH 4/6 ARM: dts: Karo TX25: Add pinctrl nodes

In reply to Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 53 +++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
arch/arm/boot/dts/imx25-karo-tx25.dts +53 -0
index f8db366..aeb1fce 100644
@@ -21,16 +21,69 @@
 	};
 };
 
+&iomuxc {
+	pinctrl_uart1: uart1grp {
+		fsl,pins = <
+			MX25_PAD_UART1_TXD__UART1_TXD 0x80000000
+			MX25_PAD_UART1_RXD__UART1_RXD 0x80000000
+			MX25_PAD_UART1_CTS__UART1_CTS 0x80000000
+			MX25_PAD_UART1_RTS__UART1_RTS 0x80000000
+		>;
+	};
+
+	pinctrl_fec: fecgrp {
+		fsl,pins = <
+			MX25_PAD_D11__GPIO_4_9		0x80000000 /* FEC PHY power on pin */
+			MX25_PAD_D13__GPIO_4_7		0x80000000 /* FEC reset */
+			MX25_PAD_FEC_MDC__FEC_MDC	0x80000000
+			MX25_PAD_FEC_MDIO__FEC_MDIO	0x80000000
+			MX25_PAD_FEC_TDATA0__FEC_TDATA0	0x80000000
+			MX25_PAD_FEC_TDATA1__FEC_TDATA1	0x80000000
+			MX25_PAD_FEC_TX_EN__FEC_TX_EN	0x80000000
+			MX25_PAD_FEC_RDATA0__FEC_RDATA0	0x80000000
+			MX25_PAD_FEC_RDATA1__FEC_RDATA1	0x80000000
+			MX25_PAD_FEC_RX_DV__FEC_RX_DV	0x80000000
+			MX25_PAD_FEC_TX_CLK__FEC_TX_CLK	0x80000000
+		>;
+	};
+
+	pinctrl_nfc: nfcgrp {
+		fsl,pins = <
+			MX25_PAD_NF_CE0__NF_CE0		0x80000000
+			MX25_PAD_NFWE_B__NFWE_B		0x80000000
+			MX25_PAD_NFRE_B__NFRE_B		0x80000000
+			MX25_PAD_NFALE__NFALE		0x80000000
+			MX25_PAD_NFCLE__NFCLE		0x80000000
+			MX25_PAD_NFWP_B__NFWP_B		0x80000000
+			MX25_PAD_NFRB__NFRB		0x80000000
+			MX25_PAD_D7__D7			0x80000000
+			MX25_PAD_D6__D6			0x80000000
+			MX25_PAD_D5__D5			0x80000000
+			MX25_PAD_D4__D4			0x80000000
+			MX25_PAD_D3__D3			0x80000000
+			MX25_PAD_D2__D2			0x80000000
+			MX25_PAD_D1__D1			0x80000000
+			MX25_PAD_D0__D0			0x80000000
+		>;
+	};
+};
+
 &uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_uart1>;
 	status = "okay";
 };
 
 &fec {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_fec>;
 	phy-mode = "rmii";
 	status = "okay";
 };
 
 &nfc {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_nfc>;
 	nand-on-flash-bbt;
 	status = "okay";
 };
Signature · 1 line
2.0.0.rc0
author maintainer
#8 lore raw

PATCH 5/6 ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC

In reply to Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/boot/dts/imx25-karo-tx25.dts +17 -0
index aeb1fce..ea7dddc 100644
@@ -16,6 +16,21 @@
 	model = "Ka-Ro TX25";
 	compatible = "karo,imx25-tx25", "fsl,imx25";
 
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		reg_fec_phy: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "fec-phy";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio4 9 0>;
+		};
+	};
+
 	memory {
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
 	};

@@ -77,7 +92,9 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_fec>;
+	phy-reset-gpios = <&gpio4 7 0>;
 	phy-mode = "rmii";
+	phy-supply = <&reg_fec_phy>;
 	status = "okay";
 };
Signature · 1 line
2.0.0.rc0
#9 lore raw

PATCH 5/6 ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC

Hi,

Quoted 16 lines · Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/boot/dts/imx25-karo-tx25.dts +3 -0
index aeb1fce..ea7dddc 100644
@@ -16,6 +16,21 @@
 	model = "Ka-Ro TX25";
 	compatible = "karo,imx25-tx25", "fsl,imx25";
 
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;

arch/arm/boot/dts/imx25-karo-tx25.dts line 31

Quoted 10 lines
arch/arm/boot/dts/imx25-karo-tx25.dts +9 -0
+		#size-cells = <0>;
+
+		reg_fec_phy: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "fec-phy";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio4 9 0>;
 

			enable-active-high;

missing here.

arch/arm/boot/dts/imx25-karo-tx25.dts line 96

Quoted 12 lines
arch/arm/boot/dts/imx25-karo-tx25.dts +3 -0
+		};
+	};
+
 	memory {
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
arch/arm/boot/dts/imx25-karo-tx25.dts +1 -0
 	};

@@ -77,7 +92,9 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_fec>;
+	phy-reset-gpios = <&gpio4 7 0>;

This must be: <&gpio3 7 0>;

Lothar Wa?mann

Signature · 9 lines
___________________________________________________________

Ka-Ro electronics GmbH | Pascalstra?e 22 | D - 52076 Aachen
Phone: +49 2408 1402-0 | Fax: +49 2408 1402-10
Gesch?ftsf?hrer: Matthias Kaussen
Handelsregistereintrag: Amtsgericht Aachen, HRB 4996

www.karo-electronics.de | info at karo-electronics.de
___________________________________________________________
author maintainer
#10 lore raw

PATCH 5/6 ARM: dts: Karo TX25: Add phy reset gpio and supply for FEC

Hi Lothar,

Quoted 32 lines · Lothar Wa?mann

Hi,

Quoted 16 lines · Sascha Hauer
Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/boot/dts/imx25-karo-tx25.dts +3 -0
index aeb1fce..ea7dddc 100644
@@ -16,6 +16,21 @@
 	model = "Ka-Ro TX25";
 	compatible = "karo,imx25-tx25", "fsl,imx25";
 
+	regulators {
+		compatible = "simple-bus";
+		#address-cells = <1>;

arch/arm/boot/dts/imx25-karo-tx25.dts line 31

Quoted 10 lines
arch/arm/boot/dts/imx25-karo-tx25.dts +9 -0
+		#size-cells = <0>;
+
+		reg_fec_phy: regulator at 0 {
+			compatible = "regulator-fixed";
+			reg = <0>;
+			regulator-name = "fec-phy";
+			regulator-min-microvolt = <3300000>;
+			regulator-max-microvolt = <3300000>;
+			gpio = <&gpio4 9 0>;
 

			enable-active-high;

missing here.

Quoted 13 lines

arch/arm/boot/dts/imx25-karo-tx25.dts line 96

Quoted 12 lines
arch/arm/boot/dts/imx25-karo-tx25.dts +3 -0
+		};
+	};
+
 	memory {
 		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
arch/arm/boot/dts/imx25-karo-tx25.dts +1 -0
 	};

@@ -77,7 +92,9 @@
 &fec {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_fec>;
+	phy-reset-gpios = <&gpio4 7 0>;

This must be: <&gpio3 7 0>;

Thanks for reviewing. The second round is out.

Sascha

Signature · 4 lines
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 |
author maintainer
#11 lore raw

PATCH 6/6 ARM: dts: Karo TX25: use hardware ecc

In reply to Sascha Hauer

We should use hardware ecc on i.MX. While at it, add the optional nand-bus-width property.

Signed-off-by Sascha Hauer <[email protected]>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx25-karo-tx25.dts +2 -0
index ea7dddc..182704e 100644
@@ -102,5 +102,7 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_nfc>;
 	nand-on-flash-bbt;
+	nand-ecc-mode = "hw";
+	nand-bus-width = <8>;
 	status = "okay";
 };
Signature · 1 line
2.0.0.rc0