[PATCH] i.MX25 dts updates

[PATCH] i.MX25 dts updates

[Sascha Hauer]

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(-)

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

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index ea323f0..680486a 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -21,6 +21,8 @@
 		i2c0 = &i2c1;
 		i2c1 = &i2c2;
 		i2c2 = &i2c3;
+		mmc0 = &esdhc1;
+		mmc2 = &esdhc2;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
-- 
2.0.0.rc0

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

[Fabio Estevam]

On Wed, May 7, 2014 at 10:31 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/boot/dts/imx25.dtsi | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
> index ea323f0..680486a 100644
> --- a/arch/arm/boot/dts/imx25.dtsi
> +++ b/arch/arm/boot/dts/imx25.dtsi
> @@ -21,6 +21,8 @@
>                 i2c0 = &i2c1;
>                 i2c1 = &i2c2;
>                 i2c2 = &i2c3;
> +               mmc0 = &esdhc1;
> +               mmc2 = &esdhc2;

Shouldn't this be:
                   mmc1 = &esdhc2;

instead?

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

[Sascha Hauer]

On Wed, May 07, 2014 at 11:46:19AM -0300, Fabio Estevam wrote:
> On Wed, May 7, 2014 at 10:31 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  arch/arm/boot/dts/imx25.dtsi | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
> > index ea323f0..680486a 100644
> > --- a/arch/arm/boot/dts/imx25.dtsi
> > +++ b/arch/arm/boot/dts/imx25.dtsi
> > @@ -21,6 +21,8 @@
> >                 i2c0 = &i2c1;
> >                 i2c1 = &i2c2;
> >                 i2c2 = &i2c3;
> > +               mmc0 = &esdhc1;
> > +               mmc2 = &esdhc2;
> 
> Shouldn't this be:
>                    mmc1 = &esdhc2;
> 
> instead?

Yes, sure.

Shawn, Lothar, is this series otherwise ok?

Sascha

-- 
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 |

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

[Shawn Guo]

On Thu, May 08, 2014 at 10:04:02AM +0200, Sascha Hauer wrote:
> On Wed, May 07, 2014 at 11:46:19AM -0300, Fabio Estevam wrote:
> > On Wed, May 7, 2014 at 10:31 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote:
> > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > > ---
> > >  arch/arm/boot/dts/imx25.dtsi | 2 ++
> > >  1 file changed, 2 insertions(+)
> > >
> > > diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
> > > index ea323f0..680486a 100644
> > > --- a/arch/arm/boot/dts/imx25.dtsi
> > > +++ b/arch/arm/boot/dts/imx25.dtsi
> > > @@ -21,6 +21,8 @@
> > >                 i2c0 = &i2c1;
> > >                 i2c1 = &i2c2;
> > >                 i2c2 = &i2c3;
> > > +               mmc0 = &esdhc1;
> > > +               mmc2 = &esdhc2;
> > 
> > Shouldn't this be:
> >                    mmc1 = &esdhc2;
> > 
> > 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

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

[Sascha Hauer]

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

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx25.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 680486a..399b25b 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -520,7 +520,6 @@
 				clocks = <&clks 9>, <&clks 70>, <&clks 8>;
 				clock-names = "ipg", "ahb", "per";
 				reg = <0x53ff4600 0x00f>;
-				status = "disabled";
 			};
 
 			dryice at 53ffc000 {
-- 
2.0.0.rc0

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

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx25.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 399b25b..07aff54 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -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>;
-- 
2.0.0.rc0

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

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 53 +++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
index f8db366..aeb1fce 100644
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@@ -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";
 };
-- 
2.0.0.rc0

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

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
index aeb1fce..ea7dddc 100644
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@@ -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";
 };
 
-- 
2.0.0.rc0

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

[Lothar Waßmann]

Hi,

Sascha Hauer wrote:
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
>  arch/arm/boot/dts/imx25-karo-tx25.dts | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
> index aeb1fce..ea7dddc 100644
> --- a/arch/arm/boot/dts/imx25-karo-tx25.dts
> +++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
> @@ -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>;
>
			enable-active-high;
missing here.

> +		};
> +	};
> +
>  	memory {
>  		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
>  	};
> @@ -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
-- 
___________________________________________________________

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
___________________________________________________________

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

[Sascha Hauer]

Hi Lothar,

On Thu, May 08, 2014 at 02:27:42PM +0200, Lothar Wa?mann wrote:
> Hi,
> 
> Sascha Hauer wrote:
> > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> > ---
> >  arch/arm/boot/dts/imx25-karo-tx25.dts | 17 +++++++++++++++++
> >  1 file changed, 17 insertions(+)
> > 
> > diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
> > index aeb1fce..ea7dddc 100644
> > --- a/arch/arm/boot/dts/imx25-karo-tx25.dts
> > +++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
> > @@ -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>;
> >
> 			enable-active-high;
> missing here.
> 
> > +		};
> > +	};
> > +
> >  	memory {
> >  		reg = <0x80000000 0x02000000 0x90000000 0x02000000>;
> >  	};
> > @@ -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

-- 
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 |

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

[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 <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx25-karo-tx25.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/imx25-karo-tx25.dts b/arch/arm/boot/dts/imx25-karo-tx25.dts
index ea7dddc..182704e 100644
--- a/arch/arm/boot/dts/imx25-karo-tx25.dts
+++ b/arch/arm/boot/dts/imx25-karo-tx25.dts
@@ -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";
 };
-- 
2.0.0.rc0

[PATCH v2] i.MX25 dts updates

[Sascha Hauer]

Changes since v1:

- Fix mmc1 alias name
- Add enable-active-high to FEC phy regulator
- Fix gpio number for FEC phy reset

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 | 73 +++++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/imx25.dtsi          |  8 +++-
 2 files changed, 80 insertions(+), 1 deletion(-)

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

[Sascha Hauer]

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/boot/dts/imx25.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index ea323f0..83fdda3 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -21,6 +21,8 @@
 		i2c0 = &i2c1;
 		i2c1 = &i2c2;
 		i2c2 = &i2c3;
+		mmc0 = &esdhc1;
+		mmc1 = &esdhc2;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
-- 
2.0.0.rc0