diff mbox

[v2] ARM: dts: mx27: Fix the AIPI bus for FEC

Message ID 1353525578-20309-1-git-send-email-fabio.estevam@freescale.com (mailing list archive)
State New, archived
Headers show

Commit Message

Fabio Estevam Nov. 21, 2012, 7:19 p.m. UTC 
FEC controller is connected to AIPI2 bus.

Also fix the AIPI1 address range.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
Changes since v1:
- Remove ethernet from aipi1 bus on phytec board.

 arch/arm/boot/dts/imx27-3ds.dts            |    8 ++++----
 arch/arm/boot/dts/imx27-phytec-phycore.dts |   13 +++++++------
 arch/arm/boot/dts/imx27.dtsi               |   12 +++++++++++-
 3 files changed, 22 insertions(+), 11 deletions(-)

Comments

Fabio Estevam Nov. 27, 2012, 4:28 p.m. UTC | #1 
Hi Sascha,

On Wed, Nov 21, 2012 at 5:19 PM, Fabio Estevam
<fabio.estevam@freescale.com> wrote:
> FEC controller is connected to AIPI2 bus.
>
> Also fix the AIPI1 address range.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
> Changes since v1:
> - Remove ethernet from aipi1 bus on phytec board.

This one is a bug fix. Could this be applied?

Regards,

Fabio Estevam
Sascha Hauer Nov. 28, 2012, 7:22 a.m. UTC | #2 
On Tue, Nov 27, 2012 at 02:28:41PM -0200, Fabio Estevam wrote:
> Hi Sascha,
> 
> On Wed, Nov 21, 2012 at 5:19 PM, Fabio Estevam
> <fabio.estevam@freescale.com> wrote:
> > FEC controller is connected to AIPI2 bus.
> >
> > Also fix the AIPI1 address range.
> >
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > ---
> > Changes since v1:
> > - Remove ethernet from aipi1 bus on phytec board.
> 
> This one is a bug fix. Could this be applied?

Just did that.

Sascha
diff mbox

Patch

diff --git a/arch/arm/boot/dts/imx27-3ds.dts b/arch/arm/boot/dts/imx27-3ds.dts
index 0a8978a..b1a6df2 100644
--- a/arch/arm/boot/dts/imx27-3ds.dts
+++ b/arch/arm/boot/dts/imx27-3ds.dts
@@ -21,8 +21,7 @@ 
 	};
 
 	soc {
-		aipi@10000000 { /* aipi */
-
+		aipi@10000000 { /* aipi1 */
 			wdog@10002000 {
 				status = "okay";
 			};
@@ -31,11 +30,12 @@ 
 				fsl,uart-has-rtscts;
 				status = "okay";
 			};
+		};
 
-			fec@1002b000 {
+		aipi@10020000 { /* aipi2 */
+			ethernet@1002b000 {
 				status = "okay";
 			};
 		};
 	};
-
 };
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore.dts b/arch/arm/boot/dts/imx27-phytec-phycore.dts
index af50469..53b0ec0 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore.dts
@@ -21,8 +21,7 @@ 
 	};
 
 	soc {
-		aipi@10000000 { /* aipi */
-
+		aipi@10000000 { /* aipi1 */
 			serial@1000a000 {
 				fsl,uart-has-rtscts;
 				status = "okay";
@@ -38,10 +37,6 @@ 
 				status = "okay";
 			};
 
-			ethernet@1002b000 {
-				status = "okay";
-			};
-
 			i2c@1001d000 {
 				clock-frequency = <400000>;
 				status = "okay";
@@ -60,6 +55,12 @@ 
 				};
 			};
 		};
+
+		aipi@10020000 { /* aipi2 */
+			ethernet@1002b000 {
+				status = "okay";
+			};
+		};
 	};
 
 	nor_flash@c0000000 {
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 3e54f14..8676152 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -55,7 +55,7 @@ 
 			compatible = "fsl,aipi-bus", "simple-bus";
 			#address-cells = <1>;
 			#size-cells = <1>;
-			reg = <0x10000000 0x10000000>;
+			reg = <0x10000000 0x20000>;
 			ranges;
 
 			wdog@10002000 {
@@ -211,6 +211,15 @@ 
 				status = "disabled";
 			};
 
+		};
+
+		aipi@10020000 { /* AIPI2 */
+			compatible = "fsl,aipi-bus", "simple-bus";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			reg = <0x10020000 0x20000>;
+			ranges;
+
 			fec: ethernet@1002b000 {
 				compatible = "fsl,imx27-fec";
 				reg = <0x1002b000 0x4000>;
@@ -218,6 +227,7 @@ 
 				status = "disabled";
 			};
 		};
+
 		nand@d8000000 {
 			#address-cells = <1>;
 			#size-cells = <1>;