Skip to content

Commit

Permalink
ARM: at91/dt: fix macb node declaration
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nicolas Ferre committed Apr 4, 2013
1 parent b090e5f commit 509ea1b
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 5 deletions.
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/at91sam9g25ek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};
};
};
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/at91sam9g35ek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};
};
};
14 changes: 14 additions & 0 deletions arch/arm/boot/dts/at91sam9x25ek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};
};
};
9 changes: 9 additions & 0 deletions arch/arm/boot/dts/at91sam9x35ek.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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";
};
};
};
};
5 changes: 0 additions & 5 deletions arch/arm/boot/dts/at91sam9x5ek.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@
status = "okay";
};

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

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

0 comments on commit 509ea1b

Please sign in to comment.