Skip to contentSkip to conversation

ARM: at91: sama5d3: add sama5d36ek support

PATCH Superseded Josh Wu 4 participants 8 messages Nov 6, 2013

Subsystems (5)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Josh Wu

author
#0 lore raw

v2 cover ARM: at91: sama5d3: add sama5d36ek support

This patch series add support for sama5d36 in sama5d3x family. It also adds the dts & dtsi file for sama5d36ek board.

v1 --> v2:
base on the at91-3.13-cleanup tree.
add a new sama5d36.dtsi to include the splitted peripherals.

Josh Wu (2):
ARM: at91: sama5d3: add support for sama5d36 chip
ARM: at91: sama5d3/dt: add sama5d36ek dts files

 arch/arm/boot/dts/Makefile            |    1 +
 arch/arm/boot/dts/sama5d3.dtsi        |    2 +-
 arch/arm/boot/dts/sama5d36.dtsi       |   19 +++++++++++++
 arch/arm/boot/dts/sama5d36ek.dts      |   53 +++++++++++++++++++++++++++++++++
 arch/arm/mach-at91/Kconfig            |    2 +-
 arch/arm/mach-at91/include/mach/cpu.h |    3 +-
 arch/arm/mach-at91/sama5d3.c          |    7 ++---
 arch/arm/mach-at91/setup.c            |    4 +++
 8 files changed, 84 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/boot/dts/sama5d36.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d36ek.dts
Signature · 1 line
1.7.10
author
#1 lore raw

PATCH v2 1/2 ARM: at91: sama5d3: add support for sama5d36 chip

The SAMA5D36 chip is the superset product of SAMA5D3x family.

For detail information please refer to:
http://www.atmel.com/Microsite/sama5d3/default.aspx

---
v1 --> v2:
none.

 arch/arm/mach-at91/Kconfig            |    2 +-
 arch/arm/mach-at91/include/mach/cpu.h |    3 ++-
 arch/arm/mach-at91/sama5d3.c          |    7 +++----
 arch/arm/mach-at91/setup.c            |    4 ++++
 4 files changed, 10 insertions(+), 6 deletions(-)
arch/arm/mach-at91/Kconfig +1 -1
index 699b71e..44eacdd 100644
@@ -67,7 +67,7 @@ config SOC_SAMA5D3
 	select HAVE_AT91_DBGU1
 	help
 	  Select this if you are using one of Atmel's SAMA5D3 family SoC.
-	  This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35.
+	  This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
 endif
 
 if SOC_SAM_V4_V5
arch/arm/mach-at91/include/mach/cpu.h +2 -1
index d3d7b99..86c71de 100644
@@ -53,6 +53,7 @@
 #define ARCH_EXID_SAMA5D33	0x00414300
 #define ARCH_EXID_SAMA5D34	0x00414301
 #define ARCH_EXID_SAMA5D35	0x00584300
+#define ARCH_EXID_SAMA5D36	0x00004301
 
 #define ARCH_FAMILY_AT91X92	0x09200000
 #define ARCH_FAMILY_AT91SAM9	0x01900000
@@ -105,7 +106,7 @@ enum at91_soc_subtype {
 
 	/* SAMA5D3 */
 	AT91_SOC_SAMA5D31, AT91_SOC_SAMA5D33, AT91_SOC_SAMA5D34,
-	AT91_SOC_SAMA5D35,
+	AT91_SOC_SAMA5D35, AT91_SOC_SAMA5D36,
 
 	/* No subtype for this SoC */
 	AT91_SOC_SUBTYPE_NONE,
arch/arm/mach-at91/sama5d3.c +3 -4
index 4012797..f853c97 100644
@@ -177,25 +177,24 @@ static struct clk udphs_clk = {
 	.pid		= SAMA5D3_ID_UDPHS,
 	.type		= CLK_TYPE_PERIPHERAL,
 };
-/* gmac only for sama5d33, sama5d34, sama5d35 */
+/* gmac only for sama5d33, sama5d34, sama5d35, sama5d36 */
 static struct clk macb0_clk = {
 	.name		= "macb0_clk",
 	.pid		= SAMA5D3_ID_GMAC,
 	.type		= CLK_TYPE_PERIPHERAL,
 };
-/* emac only for sama5d31, sama5d35 */
+/* emac only for sama5d31, sama5d35, sama5d36 */
 static struct clk macb1_clk = {
 	.name		= "macb1_clk",
 	.pid		= SAMA5D3_ID_EMAC,
 	.type		= CLK_TYPE_PERIPHERAL,
 };
-/* lcd only for sama5d31, sama5d33, sama5d34 */
+/* lcd only for sama5d31, sama5d33, sama5d34, sama5d36 */
 static struct clk lcdc_clk = {
 	.name		= "lcdc_clk",
 	.pid		= SAMA5D3_ID_LCDC,
 	.type		= CLK_TYPE_PERIPHERAL,
 };
-/* isi only for sama5d33, sama5d35 */
 static struct clk isi_clk = {
 	.name		= "isi_clk",
 	.pid		= SAMA5D3_ID_ISI,
arch/arm/mach-at91/setup.c +4 -0
index b17fbcf..157b687 100644
@@ -232,6 +232,9 @@ static void __init soc_detect(u32 dbgu_base)
 		case ARCH_EXID_SAMA5D35:
 			at91_soc_initdata.subtype = AT91_SOC_SAMA5D35;
 			break;
+		case ARCH_EXID_SAMA5D36:
+			at91_soc_initdata.subtype = AT91_SOC_SAMA5D36;
+			break;
 		}
 	}
 }
@@ -274,6 +277,7 @@ static const char *soc_subtype_name[] = {
 	[AT91_SOC_SAMA5D33]	= "sama5d33",
 	[AT91_SOC_SAMA5D34]	= "sama5d34",
 	[AT91_SOC_SAMA5D35]	= "sama5d35",
+	[AT91_SOC_SAMA5D36]	= "sama5d36",
 	[AT91_SOC_SUBTYPE_NONE]	= "None",
 	[AT91_SOC_SUBTYPE_UNKNOWN] = "Unknown",
 };
Signature · 1 line
1.7.10
author
#2 lore raw

PATCH v2 2/2 ARM: at91: sama5d3/dt: add sama5d36ek dts files

In reply to Josh Wu

Add .dts and .dtsi file to support sama5d36ek board. Also update the the comments for sama5d36 in sama5d3.dtsi.

---
v1 --> v2:
add a new sama5d36.dtsi file to include the peripheral dtsi file.

 arch/arm/boot/dts/Makefile       |    1 +
 arch/arm/boot/dts/sama5d3.dtsi   |    2 +-
 arch/arm/boot/dts/sama5d36.dtsi  |   19 ++++++++++++++
 arch/arm/boot/dts/sama5d36ek.dts |   53 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/sama5d36.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d36ek.dts
arch/arm/boot/dts/Makefile +1 -0
index e95af3f..ddbb049 100644
@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
+dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb
 
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 5cdaba4..23b7669 100644
@@ -1,6 +1,6 @@
 /*
  * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC
- *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35 SoC
+ *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36 SoC
  *
  *  Copyright (C) 2013 Atmel,
  *                2013 Ludovic Desroches <[email protected]>
arch/arm/boot/dts/sama5d36.dtsi new file +19 -0
new file mode 100644
index 0000000..ec61c08
@@ -0,0 +1,19 @@
+/*
+ * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
+ *
+ *  Copyright (C) 2013 Boris BREZILLON <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include "sama5d3.dtsi"
+#include "sama5d3_can.dtsi"
+#include "sama5d3_emac.dtsi"
+#include "sama5d3_gmac.dtsi"
+#include "sama5d3_lcd.dtsi"
+#include "sama5d3_mci2.dtsi"
+#include "sama5d3_tcb1.dtsi"
+#include "sama5d3_uart.dtsi"
+
+/ {
+	compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5";
+};
arch/arm/boot/dts/sama5d36ek.dts new file +53 -0

53 lines not on this page · raw message

Signature · 1 line
1.7.10
#3 lore raw

PATCH v2 2/2 ARM: at91: sama5d3/dt: add sama5d36ek dts files

Quoted 21 lines · Josh Wu

Add .dts and .dtsi file to support sama5d36ek board. Also update the the comments for sama5d36 in sama5d3.dtsi.

---
v1 --> v2:
add a new sama5d36.dtsi file to include the peripheral dtsi file.

 arch/arm/boot/dts/Makefile       |    1 +
 arch/arm/boot/dts/sama5d3.dtsi   |    2 +-
 arch/arm/boot/dts/sama5d36.dtsi  |   19 ++++++++++++++
 arch/arm/boot/dts/sama5d36ek.dts |   53 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/sama5d36.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d36ek.dts
arch/arm/boot/dts/Makefile +0 -0
index e95af3f..ddbb049 100644

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb · line 43

Quoted 4 lines
arch/arm/boot/dts/Makefile +1 -0
@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
 dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
+dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb

Just curious...but just wondering why there are a separate CONFIG_ARCH_AT91 for each board?
Why can't there be just a single CONFIG_ARCH_AT91 for all the boards?

Dinh

Quoted 99 lines
arch/arm/boot/dts/Makefile +0 -0
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
 dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 5cdaba4..23b7669 100644
@@ -1,6 +1,6 @@
 /*
  * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC
- *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35 SoC
+ *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36 SoC
  *
  *  Copyright (C) 2013 Atmel,
  *                2013 Ludovic Desroches <[email protected]>
arch/arm/boot/dts/sama5d36.dtsi new file +19 -0
new file mode 100644
index 0000000..ec61c08
@@ -0,0 +1,19 @@
+/*
+ * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
+ *
+ *  Copyright (C) 2013 Boris BREZILLON <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include "sama5d3.dtsi"
+#include "sama5d3_can.dtsi"
+#include "sama5d3_emac.dtsi"
+#include "sama5d3_gmac.dtsi"
+#include "sama5d3_lcd.dtsi"
+#include "sama5d3_mci2.dtsi"
+#include "sama5d3_tcb1.dtsi"
+#include "sama5d3_uart.dtsi"
+
+/ {
+	compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5";
+};
arch/arm/boot/dts/sama5d36ek.dts new file +53 -0
new file mode 100644
index 0000000..59576c6
@@ -0,0 +1,53 @@
+/*
+ * sama5d36ek.dts - Device Tree file for SAMA5D36-EK board
+ *
+ *  Copyright (C) 2013 Atmel,
+ *                2013 Josh Wu <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+/dts-v1/;
+#include "sama5d36.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
+
+/ {
+	model = "Atmel SAMA5D36-EK";
+	compatible = "atmel,sama5d36ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";
+
+	ahb {
+		apb {
+			spi0: spi at f0004000 {
+				status = "okay";
+			};
+
+			ssc0: ssc at f0008000 {
+				status = "okay";
+			};
+
+			can0: can at f000c000 {
+				status = "okay";
+			};
+
+			i2c0: i2c at f0014000 {
+				status = "okay";
+			};
+
+			i2c1: i2c at f0018000 {
+				status = "okay";
+			};
+
+			macb0: ethernet at f0028000 {
+				status = "okay";
+			};
+
+			macb1: ethernet at f802c000 {
+				status = "okay";
+			};
+		};
+	};
+
+	sound {
+		status = "okay";
+	};
+};
author
#4 lore raw

PATCH v2 2/2 ARM: at91: sama5d3/dt: add sama5d36ek dts files

Hi, Dinh

Quoted 17 lines · Dinh Nguyen
Quoted 16 lines · Josh Wu

Add .dts and .dtsi file to support sama5d36ek board. Also update the the comments for sama5d36 in sama5d3.dtsi.

---
v1 --> v2:
add a new sama5d36.dtsi file to include the peripheral dtsi file.

  arch/arm/boot/dts/Makefile       |    1 +
  arch/arm/boot/dts/sama5d3.dtsi   |    2 +-
  arch/arm/boot/dts/sama5d36.dtsi  |   19 ++++++++++++++
  arch/arm/boot/dts/sama5d36ek.dts |   53 ++++++++++++++++++++++++++++++++++++++
  4 files changed, 75 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/sama5d36.dtsi create mode 100644 arch/arm/boot/dts/sama5d36ek.dts

Quoted 12 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb · line 43

Quoted 9 lines
arch/arm/boot/dts/Makefile +1 -0
index e95af3f..ddbb049 100644
@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
+dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb

Just curious...but just wondering why there are a separate CONFIG_ARCH_AT91 for each board?
Why can't there be just a single CONFIG_ARCH_AT91 for all the boards?

right. that seems consistent with other boards. So in v3 I will add one more patch to do this. Thanks.

Best Regards,
Josh Wu

Quoted 101 lines

Dinh

Quoted 99 lines
arch/arm/boot/dts/Makefile +0 -0
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
  dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 5cdaba4..23b7669 100644
@@ -1,6 +1,6 @@
  /*
   * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC
- *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35 SoC
+ *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36 SoC
   *
   *  Copyright (C) 2013 Atmel,
   *                2013 Ludovic Desroches <[email protected]>
arch/arm/boot/dts/sama5d36.dtsi new file +19 -0
new file mode 100644
index 0000000..ec61c08
@@ -0,0 +1,19 @@
+/*
+ * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
+ *
+ *  Copyright (C) 2013 Boris BREZILLON <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include "sama5d3.dtsi"
+#include "sama5d3_can.dtsi"
+#include "sama5d3_emac.dtsi"
+#include "sama5d3_gmac.dtsi"
+#include "sama5d3_lcd.dtsi"
+#include "sama5d3_mci2.dtsi"
+#include "sama5d3_tcb1.dtsi"
+#include "sama5d3_uart.dtsi"
+
+/ {
+	compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5";
+};
arch/arm/boot/dts/sama5d36ek.dts new file +53 -0
new file mode 100644
index 0000000..59576c6
@@ -0,0 +1,53 @@
+/*
+ * sama5d36ek.dts - Device Tree file for SAMA5D36-EK board
+ *
+ *  Copyright (C) 2013 Atmel,
+ *                2013 Josh Wu <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+/dts-v1/;
+#include "sama5d36.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
+
+/ {
+	model = "Atmel SAMA5D36-EK";
+	compatible = "atmel,sama5d36ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";
+
+	ahb {
+		apb {
+			spi0: spi at f0004000 {
+				status = "okay";
+			};
+
+			ssc0: ssc at f0008000 {
+				status = "okay";
+			};
+
+			can0: can at f000c000 {
+				status = "okay";
+			};
+
+			i2c0: i2c at f0014000 {
+				status = "okay";
+			};
+
+			i2c1: i2c at f0018000 {
+				status = "okay";
+			};
+
+			macb0: ethernet at f0028000 {
+				status = "okay";
+			};
+
+			macb1: ethernet at f802c000 {
+				status = "okay";
+			};
+		};
+	};
+
+	sound {
+		status = "okay";
+	};
+};
#5 lore raw

PATCH v2 2/2 ARM: at91: sama5d3/dt: add sama5d36ek dts files

On 06/11/2013 07:06, Josh Wu :

Quoted 33 lines

Hi, Dinh

Quoted 17 lines · Dinh Nguyen
Quoted 16 lines · Josh Wu

Add .dts and .dtsi file to support sama5d36ek board. Also update the the comments for sama5d36 in sama5d3.dtsi.

---
v1 --> v2:
add a new sama5d36.dtsi file to include the peripheral dtsi file.

   arch/arm/boot/dts/Makefile       |    1 +
   arch/arm/boot/dts/sama5d3.dtsi   |    2 +-
   arch/arm/boot/dts/sama5d36.dtsi  |   19 ++++++++++++++
   arch/arm/boot/dts/sama5d36ek.dts |   53 ++++++++++++++++++++++++++++++++++++++
   4 files changed, 75 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/sama5d36.dtsi create mode 100644 arch/arm/boot/dts/sama5d36ek.dts

Quoted 12 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb · line 43

Quoted 9 lines
arch/arm/boot/dts/Makefile +1 -0
index e95af3f..ddbb049 100644
@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
   dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
   dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
   dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
+dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb

Just curious...but just wondering why there are a separate CONFIG_ARCH_AT91 for each board?
Why can't there be just a single CONFIG_ARCH_AT91 for all the boards?

Quoted 2 lines

right. that seems consistent with other boards. So in v3 I will add one more patch to do this. Thanks.

No. Please do not change this.
It was modified in commit ec6754a7b9e90a1eba7f3b2812003bb51d3dcf30
So if we have to come back to the former layout, we have to discuss it further.

Moreover this layout is easily readable, clear and easily expandable. So unless there is a consensus on moving to the other form, I would keep it like this.

Best regards,

Quoted 102 lines
Quoted 100 lines

Dinh

Quoted 99 lines
arch/arm/boot/dts/Makefile +0 -0
   dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
   dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 5cdaba4..23b7669 100644
@@ -1,6 +1,6 @@
   /*
    * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC
- *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35 SoC
+ *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36 SoC
    *
    *  Copyright (C) 2013 Atmel,
    *                2013 Ludovic Desroches <[email protected]>
arch/arm/boot/dts/sama5d36.dtsi new file +19 -0
new file mode 100644
index 0000000..ec61c08
@@ -0,0 +1,19 @@
+/*
+ * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
+ *
+ *  Copyright (C) 2013 Boris BREZILLON <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include "sama5d3.dtsi"
+#include "sama5d3_can.dtsi"
+#include "sama5d3_emac.dtsi"
+#include "sama5d3_gmac.dtsi"
+#include "sama5d3_lcd.dtsi"
+#include "sama5d3_mci2.dtsi"
+#include "sama5d3_tcb1.dtsi"
+#include "sama5d3_uart.dtsi"
+
+/ {
+	compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5";
+};
arch/arm/boot/dts/sama5d36ek.dts new file +53 -0
new file mode 100644
index 0000000..59576c6
@@ -0,0 +1,53 @@
+/*
+ * sama5d36ek.dts - Device Tree file for SAMA5D36-EK board
+ *
+ *  Copyright (C) 2013 Atmel,
+ *                2013 Josh Wu <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+/dts-v1/;
+#include "sama5d36.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
+
+/ {
+	model = "Atmel SAMA5D36-EK";
+	compatible = "atmel,sama5d36ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";
+
+	ahb {
+		apb {
+			spi0: spi at f0004000 {
+				status = "okay";
+			};
+
+			ssc0: ssc at f0008000 {
+				status = "okay";
+			};
+
+			can0: can at f000c000 {
+				status = "okay";
+			};
+
+			i2c0: i2c at f0014000 {
+				status = "okay";
+			};
+
+			i2c1: i2c at f0018000 {
+				status = "okay";
+			};
+
+			macb0: ethernet at f0028000 {
+				status = "okay";
+			};
+
+			macb1: ethernet at f802c000 {
+				status = "okay";
+			};
+		};
+	};
+
+	sound {
+		status = "okay";
+	};
+};
Signature · 1 line
Nicolas Ferre
author
#6 lore raw

PATCH v2 2/2 ARM: at91: sama5d3/dt: add sama5d36ek dts files

Quoted 44 lines · Nicolas Ferre

On 06/11/2013 07:06, Josh Wu :

Quoted 34 lines

Hi, Dinh

Quoted 18 lines · Dinh Nguyen
Quoted 17 lines · Josh Wu

Add .dts and .dtsi file to support sama5d36ek board. Also update the the comments for sama5d36 in sama5d3.dtsi.

---
v1 --> v2:
add a new sama5d36.dtsi file to include the peripheral dtsi file.

   arch/arm/boot/dts/Makefile       |    1 +
   arch/arm/boot/dts/sama5d3.dtsi   |    2 +-
   arch/arm/boot/dts/sama5d36.dtsi  |   19 ++++++++++++++
   arch/arm/boot/dts/sama5d36ek.dts |   53 
++++++++++++++++++++++++++++++++++++++
   4 files changed, 75 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/sama5d36.dtsi create mode 100644 arch/arm/boot/dts/sama5d36ek.dts

Quoted 12 lines

arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb · line 43

Quoted 9 lines
arch/arm/boot/dts/Makefile +1 -0
index e95af3f..ddbb049 100644
@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_AT91)    += sama5d31ek.dtb
   dtb-$(CONFIG_ARCH_AT91)    += sama5d33ek.dtb
   dtb-$(CONFIG_ARCH_AT91)    += sama5d34ek.dtb
   dtb-$(CONFIG_ARCH_AT91)    += sama5d35ek.dtb
+dtb-$(CONFIG_ARCH_AT91)    += sama5d36ek.dtb

Just curious...but just wondering why there are a separate CONFIG_ARCH_AT91 for each board?
Why can't there be just a single CONFIG_ARCH_AT91 for all the boards?

Quoted 2 lines

right. that seems consistent with other boards. So in v3 I will add one more patch to do this. Thanks.

No. Please do not change this.
It was modified in commit ec6754a7b9e90a1eba7f3b2812003bb51d3dcf30
So if we have to come back to the former layout, we have to discuss it further.

Quoted 3 lines

Moreover this layout is easily readable, clear and easily expandable. So unless there is a consensus on moving to the other form, I would keep it like this.

Ok. I will keep it. In v3, I will only change copyright line.

Best Regards,
Josh Wu

Quoted 115 lines

Best regards,

Quoted 109 lines
Quoted 107 lines

Dinh

Quoted 106 lines
arch/arm/boot/dts/Makefile +0 -0
   dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
   dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
arch/arm/boot/dts/sama5d3.dtsi +0 -1
index 5cdaba4..23b7669 100644
@@ -1,6 +1,6 @@
   /*
    * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC
- *                applies to SAMA5D31, SAMA5D33, SAMA5D34, 

SAMA5D35 SoC
+ * applies to SAMA5D31, SAMA5D33, SAMA5D34,
SAMA5D35, SAMA5D36 SoC
*
* Copyright (C) 2013 Atmel,
* 2013 Ludovic Desroches
<[email protected]>

arch/arm/boot/dts/sama5d36.dtsi new file +19 -0
new file mode 100644
index 0000000..ec61c08
@@ -0,0 +1,19 @@
+/*
+ * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
+ *
+ *  Copyright (C) 2013 Boris BREZILLON <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include "sama5d3.dtsi"
+#include "sama5d3_can.dtsi"
+#include "sama5d3_emac.dtsi"
+#include "sama5d3_gmac.dtsi"
+#include "sama5d3_lcd.dtsi"
+#include "sama5d3_mci2.dtsi"
+#include "sama5d3_tcb1.dtsi"
+#include "sama5d3_uart.dtsi"
+
+/ {
+    compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5";
+};
arch/arm/boot/dts/sama5d36ek.dts new file +16 -0
new file mode 100644
index 0000000..59576c6
@@ -0,0 +1,53 @@
+/*
+ * sama5d36ek.dts - Device Tree file for SAMA5D36-EK board
+ *
+ *  Copyright (C) 2013 Atmel,
+ *                2013 Josh Wu <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+/dts-v1/;
+#include "sama5d36.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
+
+/ {
+    model = "Atmel SAMA5D36-EK";
+    compatible = "atmel,sama5d36ek", "atmel,sama5d3xmb", 

"atmel,sama5d3xcm", "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";

arch/arm/boot/dts/sama5d36ek.dts new file +37 -0
+
+    ahb {
+        apb {
+            spi0: spi at f0004000 {
+                status = "okay";
+            };
+
+            ssc0: ssc at f0008000 {
+                status = "okay";
+            };
+
+            can0: can at f000c000 {
+                status = "okay";
+            };
+
+            i2c0: i2c at f0014000 {
+                status = "okay";
+            };
+
+            i2c1: i2c at f0018000 {
+                status = "okay";
+            };
+
+            macb0: ethernet at f0028000 {
+                status = "okay";
+            };
+
+            macb1: ethernet at f802c000 {
+                status = "okay";
+            };
+        };
+    };
+
+    sound {
+        status = "okay";
+    };
+};
#7 lore raw

PATCH v2 2/2 ARM: at91: sama5d3/dt: add sama5d36ek dts files

In reply to Josh Wu

Hello Josh,

Quoted 2 lines · Josh Wu

Add .dts and .dtsi file to support sama5d36ek board. Also update the the comments for sama5d36 in sama5d3.dtsi.

Could you change the Copyright line in sama5d36.dtsi (I'm not sure I can get credits for something I haven't done :)) ?

Anyway,

Quoted 122 lines

---
v1 --> v2:
add a new sama5d36.dtsi file to include the peripheral dtsi file.

  arch/arm/boot/dts/Makefile       |    1 +
  arch/arm/boot/dts/sama5d3.dtsi   |    2 +-
  arch/arm/boot/dts/sama5d36.dtsi  |   19 ++++++++++++++
  arch/arm/boot/dts/sama5d36ek.dts |   53 ++++++++++++++++++++++++++++++++++++++
  4 files changed, 75 insertions(+), 1 deletion(-)

create mode 100644 arch/arm/boot/dts/sama5d36.dtsi create mode 100644 arch/arm/boot/dts/sama5d36ek.dts

arch/arm/boot/dts/Makefile +1 -0
index e95af3f..ddbb049 100644
@@ -40,6 +40,7 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
  dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
+dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb
 
  dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
  dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
arch/arm/boot/dts/sama5d3.dtsi +1 -1
index 5cdaba4..23b7669 100644
@@ -1,6 +1,6 @@
  /*
   * sama5d3.dtsi - Device Tree Include file for SAMA5D3 family SoC
- *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35 SoC
+ *                applies to SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36 SoC
   *
   *  Copyright (C) 2013 Atmel,
   *                2013 Ludovic Desroches <[email protected]>
arch/arm/boot/dts/sama5d36.dtsi new file +19 -0
new file mode 100644
index 0000000..ec61c08
@@ -0,0 +1,19 @@
+/*
+ * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
+ *
+ *  Copyright (C) 2013 Boris BREZILLON <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+#include "sama5d3.dtsi"
+#include "sama5d3_can.dtsi"
+#include "sama5d3_emac.dtsi"
+#include "sama5d3_gmac.dtsi"
+#include "sama5d3_lcd.dtsi"
+#include "sama5d3_mci2.dtsi"
+#include "sama5d3_tcb1.dtsi"
+#include "sama5d3_uart.dtsi"
+
+/ {
+	compatible = "atmel,samad36", "atmel,sama5d3", "atmel,sama5";
+};
arch/arm/boot/dts/sama5d36ek.dts new file +53 -0
new file mode 100644
index 0000000..59576c6
@@ -0,0 +1,53 @@
+/*
+ * sama5d36ek.dts - Device Tree file for SAMA5D36-EK board
+ *
+ *  Copyright (C) 2013 Atmel,
+ *                2013 Josh Wu <[email protected]>
+ *
+ * Licensed under GPLv2 or later.
+ */
+/dts-v1/;
+#include "sama5d36.dtsi"
+#include "sama5d3xmb.dtsi"
+#include "sama5d3xdm.dtsi"
+
+/ {
+	model = "Atmel SAMA5D36-EK";
+	compatible = "atmel,sama5d36ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d36", "atmel,sama5d3", "atmel,sama5";
+
+	ahb {
+		apb {
+			spi0: spi at f0004000 {
+				status = "okay";
+			};
+
+			ssc0: ssc at f0008000 {
+				status = "okay";
+			};
+
+			can0: can at f000c000 {
+				status = "okay";
+			};
+
+			i2c0: i2c at f0014000 {
+				status = "okay";
+			};
+
+			i2c1: i2c at f0018000 {
+				status = "okay";
+			};
+
+			macb0: ethernet at f0028000 {
+				status = "okay";
+			};
+
+			macb1: ethernet at f802c000 {
+				status = "okay";
+			};
+		};
+	};
+
+	sound {
+		status = "okay";
+	};
+};