Skip to contentSkip to conversation

ARM: at91/soc: add basic support for new sama5d2 SoC

PATCH Applied Nicolas Ferre 2 participants 2 messages Jul 30, 2015 – Aug 5, 2015

Subsystems (5)
Device tree bindings Documentation Arm (32-bit) Arm sub-architectures +1 more subsystems
lore
Share & tools
lore

Nicolas Ferre

author
#0 lore raw

PATCH v3 1/1 ARM: at91/soc: add basic support for new sama5d2 SoC

Add Kconfig entries, header file changes and addition to the documentation. The early debug infrastructure is also added for easy development.

Signed-off-by Ludovic Desroches <[email protected]>
Signed-off-by Nicolas Ferre <[email protected]>
Acked-by Alexandre Belloni <[email protected]>

---
Arnd, Olof, Kevin,

I'm re-sending this patch as a single one targeted to you as I don't have more material for the "soc" of AT91 yet. So I would like you to take it out of a Pull-request.
Alexandre may build one in the coming weeks though.

Thanks, bye.
Nicolas.

 Documentation/arm/Atmel/README                       |  5 +++++
 Documentation/devicetree/bindings/arm/atmel-at91.txt |  2 ++
 arch/arm/Kconfig.debug                               |  6 ++++++
 arch/arm/include/debug/at91.S                        |  5 ++++-
 arch/arm/mach-at91/Kconfig                           | 12 ++++++++++++
 arch/arm/mach-at91/sama5.c                           |  3 +++
 arch/arm/mach-at91/soc.h                             |  3 +++
 7 files changed, 35 insertions(+), 1 deletion(-)
Documentation/arm/Atmel/README +5 -0
index c53a19b4aab2..0931cf7e2e56 100644
@@ -90,6 +90,11 @@ the Atmel website: http://www.atmel.com.
         + Datasheet
           http://www.atmel.com/Images/Atmel-11238-32-bit-Cortex-A5-Microcontroller-SAMA5D4_Datasheet.pdf
 
+      - sama5d2 family
+        - sama5d27
+        + Datasheet
+          Coming soon
+
 
 Linux kernel information
 ------------------------
Documentation/devicetree/bindings/arm/atmel-at91.txt +2 -0
index 424ac8cbfa08..7f04b8ae4ca9 100644
@@ -27,6 +27,8 @@ compatible: must be one of:
     o "atmel,at91sam9xe"
  * "atmel,sama5" for SoCs using a Cortex-A5, shall be extended with the specific
    SoC family:
+    o "atmel,sama5d2" shall be extended with the specific SoC compatible:
+       - "atmel,sama5d27"
     o "atmel,sama5d3" shall be extended with the specific SoC compatible:
        - "atmel,sama5d31"
        - "atmel,sama5d33"
arch/arm/Kconfig.debug +6 -0
index a2e16f940394..946c8c0fa1fb 100644
@@ -141,6 +141,12 @@ choice
 		depends on ARCH_AT91
 		depends on SOC_SAMA5
 
+	config AT91_DEBUG_LL_DBGU3
+		bool "Kernel low-level debugging on sama5d2"
+		select DEBUG_AT91_UART
+		depends on ARCH_AT91
+		depends on SOC_SAMA5
+
 	config DEBUG_BCM2835
 		bool "Kernel low-level debugging on BCM2835 PL011 UART"
 		depends on ARCH_BCM2835
arch/arm/include/debug/at91.S +4 -1
index c3c45e628e33..2556a8801c8c 100644
@@ -13,9 +13,12 @@
 #define AT91_DBGU 0xfffff200 /* AT91_BASE_DBGU0 */
 #elif defined(CONFIG_AT91_DEBUG_LL_DBGU1)
 #define AT91_DBGU 0xffffee00 /* AT91_BASE_DBGU1 */
-#else
+#elif defined(CONFIG_AT91_DEBUG_LL_DBGU2)
 /* On sama5d4, use USART3 as low level serial console */
 #define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */
+#else
+/* On sama5d2, use UART1 as low level serial console */
+#define AT91_DBGU 0xf8020000
 #endif
 
 #ifdef CONFIG_MMU
arch/arm/mach-at91/Kconfig +12 -0
index fd95f34945f4..89a755b90db2 100644
@@ -8,6 +8,18 @@ menuconfig ARCH_AT91
 	select SOC_BUS
 
 if ARCH_AT91
+config SOC_SAMA5D2
+	bool "SAMA5D2 family" if ARCH_MULTI_V7
+	select SOC_SAMA5
+	select CACHE_L2X0
+	select HAVE_FB_ATMEL
+	select HAVE_AT91_UTMI
+	select HAVE_AT91_USB_CLK
+	select HAVE_AT91_H32MX
+	select HAVE_AT91_GENERATED_CLK
+	help
+	  Select this if ou are using one of Atmel's SAMA5D2 family SoC.
+
 config SOC_SAMA5D3
 	bool "SAMA5D3 family" if ARCH_MULTI_V7
 	select SOC_SAMA5
arch/arm/mach-at91/sama5.c +3 -0
index 41d829d8e7d5..90c3c3051ae7 100644
@@ -18,6 +18,8 @@
 #include "soc.h"
 
 static const struct at91_soc sama5_socs[] = {
+	AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27_EXID_MATCH,
+		 "sama5d27", "sama5d2"),
 	AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D31_EXID_MATCH,
 		 "sama5d31", "sama5d3"),
 	AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D33_EXID_MATCH,

@@ -64,6 +66,7 @@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
 MACHINE_END
 
 static const char *sama5_alt_dt_board_compat[] __initconst = {
+	"atmel,sama5d2",
 	"atmel,sama5d4",
 	NULL
 };
arch/arm/mach-at91/soc.h +3 -0
index be23c400596b..8ede0ef86172 100644
@@ -62,6 +62,9 @@ at91_soc_init(const struct at91_soc *socs);
 #define AT91SAM9XE256_CIDR_MATCH	0x329a93a0
 #define AT91SAM9XE512_CIDR_MATCH	0x329aa3a0
 
+#define SAMA5D2_CIDR_MATCH		0x0a5c08c0
+#define SAMA5D27_EXID_MATCH		0x00000021
+
 #define SAMA5D3_CIDR_MATCH		0x0a5c07c0
 #define SAMA5D31_EXID_MATCH		0x00444300
 #define SAMA5D33_EXID_MATCH		0x00414300
Signature · 1 line
2.1.3
Applied
#1 lore raw
Quoted 6 lines · Nicolas Ferre

Add Kconfig entries, header file changes and addition to the documentation. The early debug infrastructure is also added for easy development.

Signed-off-by Ludovic Desroches <[email protected]>
Signed-off-by Nicolas Ferre <[email protected]>
Acked-by Alexandre Belloni <[email protected]>
Quoted 7 lines

---
Arnd, Olof, Kevin,

I'm re-sending this patch as a single one targeted to you as I don't have more material for the "soc" of AT91 yet. So I would like you to take it out of a Pull-request.
Alexandre may build one in the coming weeks though.

Applied, thanks.

-Olof