* [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support
@ 2013-11-06 10:01 Josh Wu
2013-11-06 10:01 ` [PATCH v3 1/2] ARM: at91: sama5d3: add support for sama5d36 chip Josh Wu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Josh Wu @ 2013-11-06 10:01 UTC (permalink / raw)
To: linux-arm-kernel
This patch series add support for sama5d36 in sama5d3x family.
It also adds the dts & dtsi file for sama5d36ek board.
v2 --> v3:
change the copyright.
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 | 20 +++++++++++++
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, 85 insertions(+), 7 deletions(-)
create mode 100644 arch/arm/boot/dts/sama5d36.dtsi
create mode 100644 arch/arm/boot/dts/sama5d36ek.dts
--
1.7.10
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 1/2] ARM: at91: sama5d3: add support for sama5d36 chip
2013-11-06 10:01 [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support Josh Wu
@ 2013-11-06 10:01 ` Josh Wu
2013-11-06 10:01 ` [PATCH v3 2/2] ARM: at91: sama5d3/dt: add sama5d36ek dts files Josh Wu
2013-11-13 17:49 ` [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support Nicolas Ferre
2 siblings, 0 replies; 4+ messages in thread
From: Josh Wu @ 2013-11-06 10:01 UTC (permalink / raw)
To: linux-arm-kernel
The SAMA5D36 chip is the superset product of SAMA5D3x family.
For detail information please refer to:
http://www.atmel.com/Microsite/sama5d3/default.aspx
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
v1, v2 --> v3:
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(-)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 699b71e..44eacdd 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -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
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h
index d3d7b99..86c71de 100644
--- a/arch/arm/mach-at91/include/mach/cpu.h
+++ b/arch/arm/mach-at91/include/mach/cpu.h
@@ -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,
diff --git a/arch/arm/mach-at91/sama5d3.c b/arch/arm/mach-at91/sama5d3.c
index 4012797..f853c97 100644
--- a/arch/arm/mach-at91/sama5d3.c
+++ b/arch/arm/mach-at91/sama5d3.c
@@ -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,
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index b17fbcf..157b687 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -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",
};
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] ARM: at91: sama5d3/dt: add sama5d36ek dts files
2013-11-06 10:01 [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support Josh Wu
2013-11-06 10:01 ` [PATCH v3 1/2] ARM: at91: sama5d3: add support for sama5d36 chip Josh Wu
@ 2013-11-06 10:01 ` Josh Wu
2013-11-13 17:49 ` [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support Nicolas Ferre
2 siblings, 0 replies; 4+ messages in thread
From: Josh Wu @ 2013-11-06 10:01 UTC (permalink / raw)
To: linux-arm-kernel
Add .dts and .dtsi file to support sama5d36ek board.
Also update the the comments for sama5d36 in sama5d3.dtsi.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
v2 --> v3:
change the copyright of sama5d36.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 | 20 ++++++++++++++
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e95af3f..ddbb049 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 5cdaba4..23b7669 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -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 <ludovic.desroches@atmel.com>
diff --git a/arch/arm/boot/dts/sama5d36.dtsi b/arch/arm/boot/dts/sama5d36.dtsi
new file mode 100644
index 0000000..6c31c26
--- /dev/null
+++ b/arch/arm/boot/dts/sama5d36.dtsi
@@ -0,0 +1,20 @@
+/*
+ * sama5d36.dtsi - Device Tree Include file for SAMA5D36 SoC
+ *
+ * Copyright (C) 2013 Atmel,
+ * 2013 Josh Wu <josh.wu@atmel.com>
+ *
+ * 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";
+};
diff --git a/arch/arm/boot/dts/sama5d36ek.dts b/arch/arm/boot/dts/sama5d36ek.dts
new file mode 100644
index 0000000..59576c6
--- /dev/null
+++ b/arch/arm/boot/dts/sama5d36ek.dts
@@ -0,0 +1,53 @@
+/*
+ * sama5d36ek.dts - Device Tree file for SAMA5D36-EK board
+ *
+ * Copyright (C) 2013 Atmel,
+ * 2013 Josh Wu <josh.wu@atmel.com>
+ *
+ * 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";
+ };
+};
--
1.7.10
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support
2013-11-06 10:01 [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support Josh Wu
2013-11-06 10:01 ` [PATCH v3 1/2] ARM: at91: sama5d3: add support for sama5d36 chip Josh Wu
2013-11-06 10:01 ` [PATCH v3 2/2] ARM: at91: sama5d3/dt: add sama5d36ek dts files Josh Wu
@ 2013-11-13 17:49 ` Nicolas Ferre
2 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2013-11-13 17:49 UTC (permalink / raw)
To: linux-arm-kernel
On 06/11/2013 11:01, Josh Wu :
> This patch series add support for sama5d36 in sama5d3x family.
> It also adds the dts & dtsi file for sama5d36ek board.
>
> v2 --> v3:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
I'll integrate them in at91-3.14-dt branch.
Thank, best regards,
> change the copyright.
>
> 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 | 20 +++++++++++++
> 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, 85 insertions(+), 7 deletions(-)
> create mode 100644 arch/arm/boot/dts/sama5d36.dtsi
> create mode 100644 arch/arm/boot/dts/sama5d36ek.dts
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-11-13 17:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-06 10:01 [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support Josh Wu
2013-11-06 10:01 ` [PATCH v3 1/2] ARM: at91: sama5d3: add support for sama5d36 chip Josh Wu
2013-11-06 10:01 ` [PATCH v3 2/2] ARM: at91: sama5d3/dt: add sama5d36ek dts files Josh Wu
2013-11-13 17:49 ` [PATCH v3 0/2] ARM: at91: sama5d3: add sama5d36ek support Nicolas Ferre
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.