* [PATCH 1/4] ARM: at91/dt: fix macb node declaration
2013-03-22 14:23 [PATCH 0/4] ARM: at91: little DT fixes Nicolas Ferre
@ 2013-03-22 14:23 ` Nicolas Ferre
2013-03-22 14:23 ` [PATCH 2/4] ARM: at91/trivial: typos in compatible property Nicolas Ferre
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2013-03-22 14:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches, linux-kernel,
Nicolas Ferre
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.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
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(-)
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index c5ab16f..a1c511f 100644
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -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";
+ };
+ };
+ };
};
diff --git a/arch/arm/boot/dts/at91sam9g35ek.dts b/arch/arm/boot/dts/at91sam9g35ek.dts
index 95944bd..6f58ab8 100644
--- a/arch/arm/boot/dts/at91sam9g35ek.dts
+++ b/arch/arm/boot/dts/at91sam9g35ek.dts
@@ -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";
+ };
+ };
+ };
};
diff --git a/arch/arm/boot/dts/at91sam9x25ek.dts b/arch/arm/boot/dts/at91sam9x25ek.dts
index af907ea..3b40d11 100644
--- a/arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/arch/arm/boot/dts/at91sam9x25ek.dts
@@ -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";
+ };
+ };
+ };
};
diff --git a/arch/arm/boot/dts/at91sam9x35ek.dts b/arch/arm/boot/dts/at91sam9x35ek.dts
index 5ccb607..6ad19a0 100644
--- a/arch/arm/boot/dts/at91sam9x35ek.dts
+++ b/arch/arm/boot/dts/at91sam9x35ek.dts
@@ -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";
+ };
+ };
+ };
};
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 8a7cf1d..f7841f6 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -52,11 +52,6 @@
status = "okay";
};
- macb0: ethernet@f802c000 {
- phy-mode = "rmii";
- status = "okay";
- };
-
i2c0: i2c@f8010000 {
status = "okay";
};
--
1.8.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: at91/trivial: typos in compatible property
2013-03-22 14:23 [PATCH 0/4] ARM: at91: little DT fixes Nicolas Ferre
2013-03-22 14:23 ` [PATCH 1/4] ARM: at91/dt: fix macb node declaration Nicolas Ferre
@ 2013-03-22 14:23 ` Nicolas Ferre
2013-03-22 14:23 ` [PATCH 3/4] ARM: at91/trivial: fix model name for SAM9G15-EK Nicolas Ferre
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2013-03-22 14:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches, linux-kernel,
Nicolas Ferre
- unneeded whitespace
- missing double quote
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org> # 3.8+
---
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(-)
diff --git a/arch/arm/boot/dts/at91sam9g15.dtsi b/arch/arm/boot/dts/at91sam9g15.dtsi
index fbe7a70..28467fd 100644
--- a/arch/arm/boot/dts/at91sam9g15.dtsi
+++ b/arch/arm/boot/dts/at91sam9g15.dtsi
@@ -10,7 +10,7 @@
/ {
model = "Atmel AT91SAM9G15 SoC";
- compatible = "atmel, at91sam9g15, atmel,at91sam9x5";
+ compatible = "atmel,at91sam9g15", "atmel,at91sam9x5";
ahb {
apb {
diff --git a/arch/arm/boot/dts/at91sam9g25.dtsi b/arch/arm/boot/dts/at91sam9g25.dtsi
index 05a718f..5fd32df 100644
--- a/arch/arm/boot/dts/at91sam9g25.dtsi
+++ b/arch/arm/boot/dts/at91sam9g25.dtsi
@@ -10,7 +10,7 @@
/ {
model = "Atmel AT91SAM9G25 SoC";
- compatible = "atmel, at91sam9g25, atmel,at91sam9x5";
+ compatible = "atmel,at91sam9g25", "atmel,at91sam9x5";
ahb {
apb {
diff --git a/arch/arm/boot/dts/at91sam9g35.dtsi b/arch/arm/boot/dts/at91sam9g35.dtsi
index f9d14a7..d6fa8af 100644
--- a/arch/arm/boot/dts/at91sam9g35.dtsi
+++ b/arch/arm/boot/dts/at91sam9g35.dtsi
@@ -10,7 +10,7 @@
/ {
model = "Atmel AT91SAM9G35 SoC";
- compatible = "atmel, at91sam9g35, atmel,at91sam9x5";
+ compatible = "atmel,at91sam9g35", "atmel,at91sam9x5";
ahb {
apb {
diff --git a/arch/arm/boot/dts/at91sam9x25.dtsi b/arch/arm/boot/dts/at91sam9x25.dtsi
index 54eb33b..9ac2bc2 100644
--- a/arch/arm/boot/dts/at91sam9x25.dtsi
+++ b/arch/arm/boot/dts/at91sam9x25.dtsi
@@ -10,7 +10,7 @@
/ {
model = "Atmel AT91SAM9X25 SoC";
- compatible = "atmel, at91sam9x25, atmel,at91sam9x5";
+ compatible = "atmel,at91sam9x25", "atmel,at91sam9x5";
ahb {
apb {
diff --git a/arch/arm/boot/dts/at91sam9x35.dtsi b/arch/arm/boot/dts/at91sam9x35.dtsi
index fb102d6..ba67d83 100644
--- a/arch/arm/boot/dts/at91sam9x35.dtsi
+++ b/arch/arm/boot/dts/at91sam9x35.dtsi
@@ -10,7 +10,7 @@
/ {
model = "Atmel AT91SAM9X35 SoC";
- compatible = "atmel, at91sam9x35, atmel,at91sam9x5";
+ compatible = "atmel,at91sam9x35", "atmel,at91sam9x5";
ahb {
apb {
--
1.8.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: at91/trivial: fix model name for SAM9G15-EK
2013-03-22 14:23 [PATCH 0/4] ARM: at91: little DT fixes Nicolas Ferre
2013-03-22 14:23 ` [PATCH 1/4] ARM: at91/dt: fix macb node declaration Nicolas Ferre
2013-03-22 14:23 ` [PATCH 2/4] ARM: at91/trivial: typos in compatible property Nicolas Ferre
@ 2013-03-22 14:23 ` Nicolas Ferre
2013-03-22 14:23 ` [PATCH 4/4] ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi Nicolas Ferre
2013-03-25 14:37 ` [PATCH 0/4] ARM: at91: little DT fixes Jean-Christophe PLAGNIOL-VILLARD
4 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2013-03-22 14:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches, linux-kernel,
Nicolas Ferre
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org> # 3.8+
---
arch/arm/boot/dts/at91sam9g15ek.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/at91sam9g15ek.dts b/arch/arm/boot/dts/at91sam9g15ek.dts
index 86dd3f6..5427b2d 100644
--- a/arch/arm/boot/dts/at91sam9g15ek.dts
+++ b/arch/arm/boot/dts/at91sam9g15ek.dts
@@ -11,6 +11,6 @@
/include/ "at91sam9x5ek.dtsi"
/ {
- model = "Atmel AT91SAM9G25-EK";
+ model = "Atmel AT91SAM9G15-EK";
compatible = "atmel,at91sam9g15ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
};
--
1.8.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi
2013-03-22 14:23 [PATCH 0/4] ARM: at91: little DT fixes Nicolas Ferre
` (2 preceding siblings ...)
2013-03-22 14:23 ` [PATCH 3/4] ARM: at91/trivial: fix model name for SAM9G15-EK Nicolas Ferre
@ 2013-03-22 14:23 ` Nicolas Ferre
2013-03-25 14:37 ` [PATCH 0/4] ARM: at91: little DT fixes Jean-Christophe PLAGNIOL-VILLARD
4 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2013-03-22 14:23 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches, linux-kernel,
Nicolas Ferre
Remove the malformed "mem=" bootargs parameter in at91sam9x5ek.dtsi
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: stable <stable@vger.kernel.org> # 3.8+
---
arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index f7841f6..a0b4ff9 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -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 {
--
1.8.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/4] ARM: at91: little DT fixes
2013-03-22 14:23 [PATCH 0/4] ARM: at91: little DT fixes Nicolas Ferre
` (3 preceding siblings ...)
2013-03-22 14:23 ` [PATCH 4/4] ARM: at91: remove partial parameter in bootargs for at91sam9x5ek.dtsi Nicolas Ferre
@ 2013-03-25 14:37 ` Jean-Christophe PLAGNIOL-VILLARD
4 siblings, 0 replies; 6+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-03-25 14:37 UTC (permalink / raw)
To: Nicolas Ferre; +Cc: linux-arm-kernel, Ludovic Desroches, linux-kernel
On 15:23 Fri 22 Mar , Nicolas Ferre wrote:
> 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
on all
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>
> 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(-)
>
> --
> 1.8.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread