ARM: at91: little DT fixes
Subsystems (2)
cover ARM: at91: little DT fixes
Hi,
Here are some little fixes found while adding device tree boards. I plan to request a pull on this material early next week.
Nicolas Ferre (4):
ARM: at91/dt: fix macb node declaration
ARM: at91/trivial: typos in compatible property
ARM: at91/trivial: fix model name for SAM9G15-EK
ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi
arch/arm/boot/dts/at91sam9g15.dtsi | 2 +- arch/arm/boot/dts/at91sam9g15ek.dts | 2 +- arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- arch/arm/boot/dts/at91sam9g25ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- arch/arm/boot/dts/at91sam9g35ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9x25.dtsi | 2 +- arch/arm/boot/dts/at91sam9x25ek.dts | 14 ++++++++++++++ arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- arch/arm/boot/dts/at91sam9x35ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9x5ek.dtsi | 7 +------ 11 files changed, 48 insertions(+), 12 deletions(-)
Signature · 1 line
1.8.0
PATCH 1/4 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.
--- arch/arm/boot/dts/at91sam9g25ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9g35ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9x25ek.dts | 14 ++++++++++++++ arch/arm/boot/dts/at91sam9x35ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9x5ek.dtsi | 5 ----- 5 files changed, 41 insertions(+), 5 deletions(-)
arch/arm/boot/dts/at91sam9g25ek.dts +9 -0
@@ -13,4 +13,13 @@ / { model = "Atmel AT91SAM9G25-EK"; compatible = "atmel,at91sam9g25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; + + ahb { + apb { + macb0: ethernet at f802c000 { + phy-mode = "rmii"; + status = "okay"; + }; + }; + }; };
arch/arm/boot/dts/at91sam9g35ek.dts +9 -0
@@ -13,4 +13,13 @@ / { model = "Atmel AT91SAM9G35-EK"; compatible = "atmel,at91sam9g35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; + + ahb { + apb { + macb0: ethernet at f802c000 { + phy-mode = "rmii"; + status = "okay"; + }; + }; + }; };
arch/arm/boot/dts/at91sam9x25ek.dts +14 -0
@@ -13,4 +13,18 @@ / { model = "Atmel AT91SAM9G25-EK"; compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; + + ahb { + apb { + macb0: ethernet at f802c000 { + phy-mode = "rmii"; + status = "okay"; + }; + + macb1: ethernet at f8030000 { + phy-mode = "rmii"; + status = "okay"; + }; + }; + }; };
arch/arm/boot/dts/at91sam9x35ek.dts +9 -0
@@ -13,4 +13,13 @@ / { model = "Atmel AT91SAM9X35-EK"; compatible = "atmel,at91sam9x35ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; + + ahb { + apb { + macb0: ethernet at f802c000 { + phy-mode = "rmii"; + status = "okay"; + }; + }; + }; };
arch/arm/boot/dts/at91sam9x5ek.dtsi +0 -5
@@ -52,11 +52,6 @@ status = "okay"; }; - macb0: ethernet at f802c000 { - phy-mode = "rmii"; - status = "okay"; - }; - i2c0: i2c at f8010000 { status = "okay"; };
Signature · 1 line
1.8.0
PATCH 2/4 ARM: at91/trivial: typos in compatible property
In reply to Nicolas Ferre- unneeded whitespace
- missing double quote
--- arch/arm/boot/dts/at91sam9g15.dtsi | 2 +- arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- arch/arm/boot/dts/at91sam9x25.dtsi | 2 +- arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/at91sam9g15.dtsi +1 -1
@@ -10,7 +10,7 @@ / { model = "Atmel AT91SAM9G15 SoC"; - compatible = "atmel, at91sam9g15, atmel,at91sam9x5"; + compatible = "atmel,at91sam9g15", "atmel,at91sam9x5"; ahb { apb {
arch/arm/boot/dts/at91sam9g25.dtsi +1 -1
@@ -10,7 +10,7 @@ / { model = "Atmel AT91SAM9G25 SoC"; - compatible = "atmel, at91sam9g25, atmel,at91sam9x5"; + compatible = "atmel,at91sam9g25", "atmel,at91sam9x5"; ahb { apb {
arch/arm/boot/dts/at91sam9g35.dtsi +1 -1
@@ -10,7 +10,7 @@ / { model = "Atmel AT91SAM9G35 SoC"; - compatible = "atmel, at91sam9g35, atmel,at91sam9x5"; + compatible = "atmel,at91sam9g35", "atmel,at91sam9x5"; ahb { apb {
arch/arm/boot/dts/at91sam9x25.dtsi +1 -1
@@ -10,7 +10,7 @@ / { model = "Atmel AT91SAM9X25 SoC"; - compatible = "atmel, at91sam9x25, atmel,at91sam9x5"; + compatible = "atmel,at91sam9x25", "atmel,at91sam9x5"; ahb { apb {
arch/arm/boot/dts/at91sam9x35.dtsi +1 -1
@@ -10,7 +10,7 @@ / { model = "Atmel AT91SAM9X35 SoC"; - compatible = "atmel, at91sam9x35, atmel,at91sam9x5"; + compatible = "atmel,at91sam9x35", "atmel,at91sam9x5"; ahb { apb {
Signature · 1 line
1.8.0
PATCH 3/4 ARM: at91/trivial: fix model name for SAM9G15-EK
In reply to Nicolas Ferre--- arch/arm/boot/dts/at91sam9g15ek.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/at91sam9g15ek.dts +1 -1
@@ -11,6 +11,6 @@ /include/ "at91sam9x5ek.dtsi" / { - model = "Atmel AT91SAM9G25-EK"; + model = "Atmel AT91SAM9G15-EK"; compatible = "atmel,at91sam9g15ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; };
Signature · 1 line
1.8.0
PATCH 4/4 ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi
In reply to Nicolas FerreRemove the malformed "mem=" bootargs parameter in at91sam9x5ek.dtsi
--- arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/at91sam9x5ek.dtsi +1 -1
@@ -13,7 +13,7 @@ compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9"; chosen { - bootargs = "128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; + bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; }; ahb {
Signature · 1 line
1.8.0
Quoted 11 lines · Nicolas Ferre
Hi,
Here are some little fixes found while adding device tree boards. I plan to request a pull on this material early next week.
Nicolas Ferre (4):
ARM: at91/dt: fix macb node declaration
ARM: at91/trivial: typos in compatible property
ARM: at91/trivial: fix model name for SAM9G15-EK
ARM: at91: remove partial parameter in bootargs forat91sam9x5ek.dtsi
on all
Quoted 17 lines
arch/arm/boot/dts/at91sam9g15.dtsi | 2 +- arch/arm/boot/dts/at91sam9g15ek.dts | 2 +- arch/arm/boot/dts/at91sam9g25.dtsi | 2 +- arch/arm/boot/dts/at91sam9g25ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9g35.dtsi | 2 +- arch/arm/boot/dts/at91sam9g35ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9x25.dtsi | 2 +- arch/arm/boot/dts/at91sam9x25ek.dts | 14 ++++++++++++++ arch/arm/boot/dts/at91sam9x35.dtsi | 2 +- arch/arm/boot/dts/at91sam9x35ek.dts | 9 +++++++++ arch/arm/boot/dts/at91sam9x5ek.dtsi | 7 +------ 11 files changed, 48 insertions(+), 12 deletions(-)Signature · 1 line
1.8.0