Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 509ea1b8 authored Mar 22, 2013 by Nicolas Ferre

ARM: at91/dt: fix macb node declaration



Macb0 node cannot be activated in generic sam9x5ek.dtsi file
as the sam9g15 does not have one.
Move the macb0 & macb1 activation in board .dts file that
support them.

Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

parent b090e5f6

arch/arm/boot/dts/at91sam9g25ek.dts

+9 −0

Original line number	Diff line number	Diff line
		@@ -13,4 +13,13 @@
		/ {
		model = "Atmel AT91SAM9G25-EK";
		compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";

		ahb {
		apb {
		macb0: ethernet@f802c000 {
		phy-mode = "rmii";
		status = "okay";
		};
		};
		};
		};

arch/arm/boot/dts/at91sam9g35ek.dts

+9 −0

Original line number	Diff line number	Diff line
		@@ -13,4 +13,13 @@
		/ {
		model = "Atmel AT91SAM9G35-EK";
		compatible = "atmel,at91sam9g35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";

		ahb {
		apb {
		macb0: ethernet@f802c000 {
		phy-mode = "rmii";
		status = "okay";
		};
		};
		};
		};

arch/arm/boot/dts/at91sam9x25ek.dts

+14 −0

Original line number	Diff line number	Diff line
		@@ -13,4 +13,18 @@
		/ {
		model = "Atmel AT91SAM9G25-EK";
		compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";

		ahb {
		apb {
		macb0: ethernet@f802c000 {
		phy-mode = "rmii";
		status = "okay";
		};

		macb1: ethernet@f8030000 {
		phy-mode = "rmii";
		status = "okay";
		};
		};
		};
		};

arch/arm/boot/dts/at91sam9x35ek.dts

+9 −0

Original line number	Diff line number	Diff line
		@@ -13,4 +13,13 @@
		/ {
		model = "Atmel AT91SAM9X35-EK";
		compatible = "atmel,at91sam9x35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";

		ahb {
		apb {
		macb0: ethernet@f802c000 {
		phy-mode = "rmii";
		status = "okay";
		};
		};
		};
		};

arch/arm/boot/dts/at91sam9x5ek.dtsi

+0 −5

Original line number	Diff line number	Diff line
		@@ -52,11 +52,6 @@
		status = "okay";
		};

		macb0: ethernet@f802c000 {
		phy-mode = "rmii";
		status = "okay";
		};

		i2c0: i2c@f8010000 {
		status = "okay";
		};