2015-06-03 12:32:32

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 00/16] AT91 DT for 4.2

Hi,

A dt series for 4.2:
- Fix at91sam9rl RTC node and use it on at91sam9rlek
- correct stdout-path for the various kizboxes
- add stdout-path to the atme evaluation boards
- add Acme arietta g25 device tree

Changes in v2:
- renamed the ariette device tree
- added an aliases node to the arietta device tree

Alexandre Belloni (16):
ARM: at91/dt: at91sam9rl: fix rtc node
ARM: at91/dt: at91sam9rlek: add RTC
ARM: at91/dt: kizbox: use stdout-path
ARM: at91/dt: at91rm9200ek: use stdout-path
ARM: at91/dt: at91sam9261ek: use stdout-path
ARM: at91/dt: at91sam9263ek: use stdout-path
ARM: at91/dt: at91sam9g20ek: use stdout-path
ARM: at91/dt: at91sam9m10g45ek use stdout-path
ARM: at91/dt: at91sam9n12ek: use stdout-path
ARM: at91/dt: at91sam9rlek: use stdout-path
ARM: at91/dt: at91sam9x5ek: use stdout-path
ARM: at91/dt: sama5d3xek: use stdout-path
ARM: at91/dt: sama5d3 xplained: use stdout-path
ARM: at91/dt: sama5d4ek: use stdout-path
ARM: at91/dt: sama5d4 xplained: use stdout-path
ARM: at91/dt: Add Acme Arietta G25

arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/at91-ariettag25.dts | 79 +++++++++++++++++++++++++++++
arch/arm/boot/dts/at91-kizbox.dts | 2 +-
arch/arm/boot/dts/at91-kizbox2.dts | 2 +-
arch/arm/boot/dts/at91-kizboxmini.dts | 2 +-
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +-
arch/arm/boot/dts/at91-sama5d4_xplained.dts | 3 +-
arch/arm/boot/dts/at91-sama5d4ek.dts | 3 +-
arch/arm/boot/dts/at91rm9200ek.dts | 4 ++
arch/arm/boot/dts/at91sam9261ek.dts | 3 +-
arch/arm/boot/dts/at91sam9263ek.dts | 3 +-
arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 +-
arch/arm/boot/dts/at91sam9m10g45ek.dts | 3 +-
arch/arm/boot/dts/at91sam9n12ek.dts | 3 +-
arch/arm/boot/dts/at91sam9rl.dtsi | 15 +++---
arch/arm/boot/dts/at91sam9rlek.dts | 7 ++-
arch/arm/boot/dts/at91sam9x5ek.dtsi | 3 +-
arch/arm/boot/dts/sama5d3xcm.dtsi | 3 +-
18 files changed, 120 insertions(+), 21 deletions(-)
create mode 100644 arch/arm/boot/dts/at91-ariettag25.dts

--
2.1.4


2015-06-03 12:32:45

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 01/16] ARM: at91/dt: at91sam9rl: fix rtc node

The RTC lives at 0xfffffe00. Also reorder the node properly.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9rl.dtsi | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index ebfd5ce9cb38..c9920c64791c 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -1065,13 +1065,6 @@
};
};

- rtc@fffffeb0 {
- compatible = "atmel,at91rm9200-rtc";
- reg = <0xfffffeb0 0x40>;
- interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
- status = "disabled";
- };
-
rtc@fffffd20 {
compatible = "atmel,at91sam9260-rtt";
reg = <0xfffffd20 0x10>;
@@ -1085,6 +1078,14 @@
reg = <0xfffffd60 0x10>;
status = "disabled";
};
+
+ rtc@fffffe00 {
+ compatible = "atmel,at91rm9200-rtc";
+ reg = <0xfffffe00 0x40>;
+ interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
+ status = "disabled";
+ };
+
};
};

--
2.1.4

2015-06-03 12:32:21

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 02/16] ARM: at91/dt: at91sam9rlek: add RTC

Add RTC support to the at91sam9rlek.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9rlek.dts | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index d9299be3dfe9..724b9f54a60a 100644
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -184,6 +184,10 @@
watchdog@fffffd40 {
status = "okay";
};
+
+ rtc@fffffe00 {
+ status = "okay";
+ };
};
};

--
2.1.4

2015-06-03 12:26:10

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 03/16] ARM: at91/dt: kizbox: use stdout-path

The kizbox dts are using the deprecated linux,stdout-path. Replace those by
stdout-path.

Signed-off-by: Alexandre Belloni <[email protected]>
Acked-by: Gaël PORTAY <[email protected]>
---
arch/arm/boot/dts/at91-kizbox.dts | 2 +-
arch/arm/boot/dts/at91-kizbox2.dts | 2 +-
arch/arm/boot/dts/at91-kizboxmini.dts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/at91-kizbox.dts b/arch/arm/boot/dts/at91-kizbox.dts
index b567b5ff908f..d9b71065916d 100644
--- a/arch/arm/boot/dts/at91-kizbox.dts
+++ b/arch/arm/boot/dts/at91-kizbox.dts
@@ -16,7 +16,7 @@

chosen {
bootargs = "ubi.mtd=ubi";
- linux,stdout-path = &dbgu;
+ stdout-path = &dbgu;
};

memory {
diff --git a/arch/arm/boot/dts/at91-kizbox2.dts b/arch/arm/boot/dts/at91-kizbox2.dts
index a458e3791bb1..f0b1563cb3f1 100644
--- a/arch/arm/boot/dts/at91-kizbox2.dts
+++ b/arch/arm/boot/dts/at91-kizbox2.dts
@@ -15,7 +15,7 @@

chosen {
bootargs = "ubi.mtd=ubi";
- linux,stdout-path = &dbgu;
+ stdout-path = &dbgu;
};

memory {
diff --git a/arch/arm/boot/dts/at91-kizboxmini.dts b/arch/arm/boot/dts/at91-kizboxmini.dts
index 4611f227d8d0..9f72b4932634 100644
--- a/arch/arm/boot/dts/at91-kizboxmini.dts
+++ b/arch/arm/boot/dts/at91-kizboxmini.dts
@@ -15,7 +15,7 @@

chosen {
bootargs = "ubi.mtd=ubi";
- linux,stdout-path = &dbgu;
+ stdout-path = &dbgu;
};

memory {
--
2.1.4

2015-06-03 12:32:09

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 04/16] ARM: at91/dt: at91rm9200ek: use stdout-path

Use stdout-path to specify the console.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91rm9200ek.dts | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
index 2a5d21247d7e..8dab4b75ca97 100644
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/at91rm9200ek.dts
@@ -12,6 +12,10 @@
model = "Atmel AT91RM9200 evaluation kit";
compatible = "atmel,at91rm9200ek", "atmel,at91rm9200";

+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
memory {
reg = <0x20000000 0x4000000>;
};
--
2.1.4

2015-06-03 12:31:48

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 05/16] ARM: at91/dt: at91sam9261ek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9261ek.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91sam9261ek.dts b/arch/arm/boot/dts/at91sam9261ek.dts
index f4a765729c7a..2e92ac020f23 100644
--- a/arch/arm/boot/dts/at91sam9261ek.dts
+++ b/arch/arm/boot/dts/at91sam9261ek.dts
@@ -13,7 +13,8 @@
compatible = "atmel,at91sam9261ek", "atmel,at91sam9261", "atmel,at91sam9";

chosen {
- bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw";
+ bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:31:55

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 06/16] ARM: at91/dt: at91sam9263ek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9263ek.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91sam9263ek.dts b/arch/arm/boot/dts/at91sam9263ek.dts
index 5cf93eecd8f1..23381276ffb8 100644
--- a/arch/arm/boot/dts/at91sam9263ek.dts
+++ b/arch/arm/boot/dts/at91sam9263ek.dts
@@ -13,7 +13,8 @@
compatible = "atmel,at91sam9263ek", "atmel,at91sam9263", "atmel,at91sam9";

chosen {
- bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
+ bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:31:44

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 07/16] ARM: at91/dt: at91sam9g20ek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
index dfaacb113f2e..57548a2c5a1e 100644
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -10,7 +10,8 @@
/ {

chosen {
- bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
+ bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:30:39

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 08/16] ARM: at91/dt: at91sam9m10g45ek use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9m10g45ek.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index 33ce7ca2c404..1375d3362603 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -15,7 +15,8 @@
compatible = "atmel,at91sam9m10g45ek", "atmel,at91sam9g45", "atmel,at91sam9";

chosen {
- bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
+ bootargs = "mem=64M root=/dev/mtdblock1 rw rootfstype=jffs2";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:30:26

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 09/16] ARM: at91/dt: at91sam9n12ek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9n12ek.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 6e067c8a3502..eab17fcace6d 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -14,7 +14,8 @@
compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9";

chosen {
- bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
+ bootargs = "root=/dev/mtdblock1 rw rootfstype=jffs2";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:30:34

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 10/16] ARM: at91/dt: at91sam9rlek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9rlek.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91sam9rlek.dts b/arch/arm/boot/dts/at91sam9rlek.dts
index 724b9f54a60a..558c9f220bed 100644
--- a/arch/arm/boot/dts/at91sam9rlek.dts
+++ b/arch/arm/boot/dts/at91sam9rlek.dts
@@ -13,7 +13,8 @@
compatible = "atmel,at91sam9rlek", "atmel,at91sam9rl", "atmel,at91sam9";

chosen {
- bootargs = "console=ttyS0,115200 rootfstype=ubifs root=ubi0:rootfs ubi.mtd=5 rw";
+ bootargs = "rootfstype=ubifs root=ubi0:rootfs ubi.mtd=5 rw";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:30:17

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 11/16] ARM: at91/dt: at91sam9x5ek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91sam9x5ek.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index cc83a37a7311..d237c462dfc6 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -13,7 +13,8 @@
compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";

chosen {
- bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
+ bootargs = "root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
+ stdout-path = "serial0:115200n8";
};

ahb {
--
2.1.4

2015-06-03 12:30:04

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 12/16] ARM: at91/dt: sama5d3xek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/sama5d3xcm.dtsi | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index ef404e907026..2cf9c3611db6 100644
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -11,7 +11,8 @@
compatible = "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";

chosen {
- bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs";
+ bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:26:22

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 13/16] ARM: at91/dt: sama5d3 xplained: use stdout-path

Use stdout-path to specify the console and remove the bootargs.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91-sama5d3_xplained.dts b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
index 4799e88cdf5e..d81474e0bcd6 100644
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
@@ -14,7 +14,7 @@
compatible = "atmel,sama5d3-xplained", "atmel,sama5d3", "atmel,sama5";

chosen {
- bootargs = "console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:26:16

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 14/16] ARM: at91/dt: sama5d4ek: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91-sama5d4ek.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91-sama5d4ek.dts b/arch/arm/boot/dts/at91-sama5d4ek.dts
index 89ef4a540db5..c8be7f82cf8c 100644
--- a/arch/arm/boot/dts/at91-sama5d4ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d4ek.dts
@@ -50,7 +50,8 @@
compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";

chosen {
- bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk";
+ bootargs = "ignore_loglevel earlyprintk";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:30:11

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 15/16] ARM: at91/dt: sama5d4 xplained: use stdout-path

Use stdout-path to specify the console and remove the console argument from
the kernel command line.

Signed-off-by: Alexandre Belloni <[email protected]>
---
arch/arm/boot/dts/at91-sama5d4_xplained.dts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/at91-sama5d4_xplained.dts b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
index 5dbc0fcfc5a8..22ad7c959103 100644
--- a/arch/arm/boot/dts/at91-sama5d4_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d4_xplained.dts
@@ -50,7 +50,8 @@
compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5";

chosen {
- bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk";
+ bootargs = "ignore_loglevel earlyprintk";
+ stdout-path = "serial0:115200n8";
};

memory {
--
2.1.4

2015-06-03 12:29:50

by Alexandre Belloni

[permalink] [raw]
Subject: [PATCH v2 16/16] ARM: at91/dt: Add Acme Arietta G25

Add a minimum Device Tree for Acme Arietta G25.
http://acme.systems/arietta

Signed-off-by: Alexandre Belloni <[email protected]>
Cc: Sergio Tanzilli <[email protected]>
---
arch/arm/boot/dts/Makefile | 1 +
arch/arm/boot/dts/at91-ariettag25.dts | 79 +++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+)
create mode 100644 arch/arm/boot/dts/at91-ariettag25.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 8c3da289a00b..b224a3a56f09 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -31,6 +31,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
at91sam9n12ek.dtb \
at91sam9rlek.dtb \
at91-ariag25.dtb \
+ at91-ariettag25.dtb \
at91-cosino_mega2560.dtb \
at91-kizboxmini.dtb \
at91sam9g15ek.dtb \
diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts
new file mode 100644
index 000000000000..c514502081d2
--- /dev/null
+++ b/arch/arm/boot/dts/at91-ariettag25.dts
@@ -0,0 +1,79 @@
+/*
+ * Device Tree file for Arietta G25
+ * This device tree is minimal, to activate more peripherals, see:
+ * http://dts.acmesystems.it/arietta/
+ */
+/dts-v1/;
+#include "at91sam9g25.dtsi"
+/ {
+ model = "Acme Systems Arietta G25";
+ compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";
+
+ aliases {
+ serial0 = &dbgu;
+ };
+
+ chosen {
+ stdout-path = "serial0:115200n8";
+ };
+
+ memory {
+ reg = <0x20000000 0x8000000>;
+ };
+
+ clocks {
+ slow_xtal {
+ clock-frequency = <32768>;
+ };
+
+ main_xtal {
+ clock-frequency = <12000000>;
+ };
+ };
+
+ ahb {
+ apb {
+ mmc0: mmc@f0008000 {
+ pinctrl-0 = <
+ &pinctrl_mmc0_slot0_clk_cmd_dat0
+ &pinctrl_mmc0_slot0_dat1_3>;
+ status = "okay";
+
+ slot@0 {
+ reg = <0>;
+ bus-width = <4>;
+ };
+ };
+
+ usb2: gadget@f803c000 {
+ status = "okay";
+ };
+
+ dbgu: serial@fffff200 {
+ status = "okay";
+ };
+
+ rtc@fffffeb0 {
+ status = "okay";
+ };
+ };
+
+ usb0: ohci@00600000 {
+ status = "okay";
+ num-ports = <3>;
+ };
+
+ usb1: ehci@00700000 {
+ status = "okay";
+ };
+ };
+
+ leds {
+ compatible = "gpio-leds";
+ arietta_led {
+ label = "arietta_led";
+ gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
+ linux,default-trigger = "heartbeat";
+ };
+ };
+};
--
2.1.4

2015-06-04 07:59:43

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH v2 00/16] AT91 DT for 4.2

Le 03/06/2015 14:24, Alexandre Belloni a écrit :
> Hi,
>
> A dt series for 4.2:
> - Fix at91sam9rl RTC node and use it on at91sam9rlek
> - correct stdout-path for the various kizboxes
> - add stdout-path to the atme evaluation boards
> - add Acme arietta g25 device tree
>
> Changes in v2:
> - renamed the ariette device tree
> - added an aliases node to the arietta device tree
>
> Alexandre Belloni (16):
> ARM: at91/dt: at91sam9rl: fix rtc node
> ARM: at91/dt: at91sam9rlek: add RTC
> ARM: at91/dt: kizbox: use stdout-path
> ARM: at91/dt: at91rm9200ek: use stdout-path
> ARM: at91/dt: at91sam9261ek: use stdout-path
> ARM: at91/dt: at91sam9263ek: use stdout-path
> ARM: at91/dt: at91sam9g20ek: use stdout-path
> ARM: at91/dt: at91sam9m10g45ek use stdout-path
> ARM: at91/dt: at91sam9n12ek: use stdout-path
> ARM: at91/dt: at91sam9rlek: use stdout-path
> ARM: at91/dt: at91sam9x5ek: use stdout-path
> ARM: at91/dt: sama5d3xek: use stdout-path
> ARM: at91/dt: sama5d3 xplained: use stdout-path
> ARM: at91/dt: sama5d4ek: use stdout-path
> ARM: at91/dt: sama5d4 xplained: use stdout-path
> ARM: at91/dt: Add Acme Arietta G25

All seems good:
Acked-by: Nicolas Ferre <[email protected]>

I stack the series on top of at91-4.2-dt branch and add it to at91-next.

Thanks, bye.

> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/at91-ariettag25.dts | 79 +++++++++++++++++++++++++++++
> arch/arm/boot/dts/at91-kizbox.dts | 2 +-
> arch/arm/boot/dts/at91-kizbox2.dts | 2 +-
> arch/arm/boot/dts/at91-kizboxmini.dts | 2 +-
> arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +-
> arch/arm/boot/dts/at91-sama5d4_xplained.dts | 3 +-
> arch/arm/boot/dts/at91-sama5d4ek.dts | 3 +-
> arch/arm/boot/dts/at91rm9200ek.dts | 4 ++
> arch/arm/boot/dts/at91sam9261ek.dts | 3 +-
> arch/arm/boot/dts/at91sam9263ek.dts | 3 +-
> arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 3 +-
> arch/arm/boot/dts/at91sam9m10g45ek.dts | 3 +-
> arch/arm/boot/dts/at91sam9n12ek.dts | 3 +-
> arch/arm/boot/dts/at91sam9rl.dtsi | 15 +++---
> arch/arm/boot/dts/at91sam9rlek.dts | 7 ++-
> arch/arm/boot/dts/at91sam9x5ek.dtsi | 3 +-
> arch/arm/boot/dts/sama5d3xcm.dtsi | 3 +-
> 18 files changed, 120 insertions(+), 21 deletions(-)
> create mode 100644 arch/arm/boot/dts/at91-ariettag25.dts
>


--
Nicolas Ferre

2015-06-04 08:02:55

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH v2 16/16] ARM: at91/dt: Add Acme Arietta G25

Le 03/06/2015 14:24, Alexandre Belloni a ?crit :
> Add a minimum Device Tree for Acme Arietta G25.
> http://acme.systems/arietta
>
> Signed-off-by: Alexandre Belloni <[email protected]>
> Cc: Sergio Tanzilli <[email protected]>

BTW Sergio, can I add your "Acked-by" tag?

Bye,

> ---
> arch/arm/boot/dts/Makefile | 1 +
> arch/arm/boot/dts/at91-ariettag25.dts | 79 +++++++++++++++++++++++++++++++++++
> 2 files changed, 80 insertions(+)
> create mode 100644 arch/arm/boot/dts/at91-ariettag25.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 8c3da289a00b..b224a3a56f09 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -31,6 +31,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
> at91sam9n12ek.dtb \
> at91sam9rlek.dtb \
> at91-ariag25.dtb \
> + at91-ariettag25.dtb \
> at91-cosino_mega2560.dtb \
> at91-kizboxmini.dtb \
> at91sam9g15ek.dtb \
> diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts
> new file mode 100644
> index 000000000000..c514502081d2
> --- /dev/null
> +++ b/arch/arm/boot/dts/at91-ariettag25.dts
> @@ -0,0 +1,79 @@
> +/*
> + * Device Tree file for Arietta G25
> + * This device tree is minimal, to activate more peripherals, see:
> + * http://dts.acmesystems.it/arietta/
> + */
> +/dts-v1/;
> +#include "at91sam9g25.dtsi"
> +/ {
> + model = "Acme Systems Arietta G25";
> + compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";
> +
> + aliases {
> + serial0 = &dbgu;
> + };
> +
> + chosen {
> + stdout-path = "serial0:115200n8";
> + };
> +
> + memory {
> + reg = <0x20000000 0x8000000>;
> + };
> +
> + clocks {
> + slow_xtal {
> + clock-frequency = <32768>;
> + };
> +
> + main_xtal {
> + clock-frequency = <12000000>;
> + };
> + };
> +
> + ahb {
> + apb {
> + mmc0: mmc@f0008000 {
> + pinctrl-0 = <
> + &pinctrl_mmc0_slot0_clk_cmd_dat0
> + &pinctrl_mmc0_slot0_dat1_3>;
> + status = "okay";
> +
> + slot@0 {
> + reg = <0>;
> + bus-width = <4>;
> + };
> + };
> +
> + usb2: gadget@f803c000 {
> + status = "okay";
> + };
> +
> + dbgu: serial@fffff200 {
> + status = "okay";
> + };
> +
> + rtc@fffffeb0 {
> + status = "okay";
> + };
> + };
> +
> + usb0: ohci@00600000 {
> + status = "okay";
> + num-ports = <3>;
> + };
> +
> + usb1: ehci@00700000 {
> + status = "okay";
> + };
> + };
> +
> + leds {
> + compatible = "gpio-leds";
> + arietta_led {
> + label = "arietta_led";
> + gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
> + linux,default-trigger = "heartbeat";
> + };
> + };
> +};
>


--
Nicolas Ferre

2015-06-04 09:40:51

by Sergio Tanzilli

[permalink] [raw]
Subject: Re: [PATCH v2 16/16] ARM: at91/dt: Add Acme Arietta G25

Sure thanks :-)

Sergio Tanzilli

On 4 June 2015 at 10:01, Nicolas Ferre <[email protected]> wrote:
> Le 03/06/2015 14:24, Alexandre Belloni a écrit :
>> Add a minimum Device Tree for Acme Arietta G25.
>> http://acme.systems/arietta
>>
>> Signed-off-by: Alexandre Belloni <[email protected]>
>> Cc: Sergio Tanzilli <[email protected]>
>
> BTW Sergio, can I add your "Acked-by" tag?
>
> Bye,
>
>> ---
>> arch/arm/boot/dts/Makefile | 1 +
>> arch/arm/boot/dts/at91-ariettag25.dts | 79 +++++++++++++++++++++++++++++++++++
>> 2 files changed, 80 insertions(+)
>> create mode 100644 arch/arm/boot/dts/at91-ariettag25.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 8c3da289a00b..b224a3a56f09 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -31,6 +31,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
>> at91sam9n12ek.dtb \
>> at91sam9rlek.dtb \
>> at91-ariag25.dtb \
>> + at91-ariettag25.dtb \
>> at91-cosino_mega2560.dtb \
>> at91-kizboxmini.dtb \
>> at91sam9g15ek.dtb \
>> diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts
>> new file mode 100644
>> index 000000000000..c514502081d2
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/at91-ariettag25.dts
>> @@ -0,0 +1,79 @@
>> +/*
>> + * Device Tree file for Arietta G25
>> + * This device tree is minimal, to activate more peripherals, see:
>> + * http://dts.acmesystems.it/arietta/
>> + */
>> +/dts-v1/;
>> +#include "at91sam9g25.dtsi"
>> +/ {
>> + model = "Acme Systems Arietta G25";
>> + compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";
>> +
>> + aliases {
>> + serial0 = &dbgu;
>> + };
>> +
>> + chosen {
>> + stdout-path = "serial0:115200n8";
>> + };
>> +
>> + memory {
>> + reg = <0x20000000 0x8000000>;
>> + };
>> +
>> + clocks {
>> + slow_xtal {
>> + clock-frequency = <32768>;
>> + };
>> +
>> + main_xtal {
>> + clock-frequency = <12000000>;
>> + };
>> + };
>> +
>> + ahb {
>> + apb {
>> + mmc0: mmc@f0008000 {
>> + pinctrl-0 = <
>> + &pinctrl_mmc0_slot0_clk_cmd_dat0
>> + &pinctrl_mmc0_slot0_dat1_3>;
>> + status = "okay";
>> +
>> + slot@0 {
>> + reg = <0>;
>> + bus-width = <4>;
>> + };
>> + };
>> +
>> + usb2: gadget@f803c000 {
>> + status = "okay";
>> + };
>> +
>> + dbgu: serial@fffff200 {
>> + status = "okay";
>> + };
>> +
>> + rtc@fffffeb0 {
>> + status = "okay";
>> + };
>> + };
>> +
>> + usb0: ohci@00600000 {
>> + status = "okay";
>> + num-ports = <3>;
>> + };
>> +
>> + usb1: ehci@00700000 {
>> + status = "okay";
>> + };
>> + };
>> +
>> + leds {
>> + compatible = "gpio-leds";
>> + arietta_led {
>> + label = "arietta_led";
>> + gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
>> + linux,default-trigger = "heartbeat";
>> + };
>> + };
>> +};
>>
>
>
> --
> Nicolas Ferre



--
Sergio Tanzilli
[email protected]
Acme Systems srl
http://www.acmesystems.it