ARM: at91: add armv7m SoC detection

Add SAME70/V71/S70/V70 chip-ids to SoC detection.

Signed-off-by: Szemző András <sza@esh.hu>
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
index 4790094b498e07ed5095c6afe76625f46472974e..c1363c83c352a269a0c604816fcf18a34cbd9cc7 100644 (file)
--- a/drivers/soc/atmel/soc.c
+++ b/drivers/soc/atmel/soc.c
@@ -106,6 +106,30 @@ static const struct at91_soc __initconst socs[] = {
                 "sama5d43", "sama5d4"),
        AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D44_EXID_MATCH,
                 "sama5d44", "sama5d4"),
+#endif
+#ifdef CONFIG_SOC_SAMV7
+       AT91_SOC(SAME70Q21_CIDR_MATCH, SAME70Q21_EXID_MATCH,
+                "same70q21", "same7"),
+       AT91_SOC(SAME70Q20_CIDR_MATCH, SAME70Q20_EXID_MATCH,
+                "same70q20", "same7"),
+       AT91_SOC(SAME70Q19_CIDR_MATCH, SAME70Q19_EXID_MATCH,
+                "same70q19", "same7"),
+       AT91_SOC(SAMS70Q21_CIDR_MATCH, SAMS70Q21_EXID_MATCH,
+                "sams70q21", "sams7"),
+       AT91_SOC(SAMS70Q20_CIDR_MATCH, SAMS70Q20_EXID_MATCH,
+                "sams70q20", "sams7"),
+       AT91_SOC(SAMS70Q19_CIDR_MATCH, SAMS70Q19_EXID_MATCH,
+                "sams70q19", "sams7"),
+       AT91_SOC(SAMV71Q21_CIDR_MATCH, SAMV71Q21_EXID_MATCH,
+                "samv71q21", "samv7"),
+       AT91_SOC(SAMV71Q20_CIDR_MATCH, SAMV71Q20_EXID_MATCH,
+                "samv71q20", "samv7"),
+       AT91_SOC(SAMV71Q19_CIDR_MATCH, SAMV71Q19_EXID_MATCH,
+                "samv71q19", "samv7"),
+       AT91_SOC(SAMV70Q20_CIDR_MATCH, SAMV70Q20_EXID_MATCH,
+                "samv70q20", "samv7"),
+       AT91_SOC(SAMV70Q19_CIDR_MATCH, SAMV70Q19_EXID_MATCH,
+                "samv70q19", "samv7"),
 #endif
        { /* sentinel */ },
 };

diff --git a/drivers/soc/atmel/soc.h b/drivers/soc/atmel/soc.h
index 228efded5085da6f93947788164daa67f7f03195..a90bd5b0ef8f52aab099270183ddc8b280d7d932 100644 (file)
--- a/drivers/soc/atmel/soc.h
+++ b/drivers/soc/atmel/soc.h
@@ -88,4 +88,30 @@ at91_soc_init(const struct at91_soc *socs);
 #define SAMA5D43_EXID_MATCH            0x00000003
 #define SAMA5D44_EXID_MATCH            0x00000004
 
+#define SAME70Q21_CIDR_MATCH           0x21020e00
+#define SAME70Q21_EXID_MATCH           0x00000002
+#define SAME70Q20_CIDR_MATCH           0x21020c00
+#define SAME70Q20_EXID_MATCH           0x00000002
+#define SAME70Q19_CIDR_MATCH           0x210d0a00
+#define SAME70Q19_EXID_MATCH           0x00000002
+
+#define SAMS70Q21_CIDR_MATCH           0x21120e00
+#define SAMS70Q21_EXID_MATCH           0x00000002
+#define SAMS70Q20_CIDR_MATCH           0x21120c00
+#define SAMS70Q20_EXID_MATCH           0x00000002
+#define SAMS70Q19_CIDR_MATCH           0x211d0a00
+#define SAMS70Q19_EXID_MATCH           0x00000002
+
+#define SAMV71Q21_CIDR_MATCH           0x21220e00
+#define SAMV71Q21_EXID_MATCH           0x00000002
+#define SAMV71Q20_CIDR_MATCH           0x21220c00
+#define SAMV71Q20_EXID_MATCH           0x00000002
+#define SAMV71Q19_CIDR_MATCH           0x212d0a00
+#define SAMV71Q19_EXID_MATCH           0x00000002
+
+#define SAMV70Q20_CIDR_MATCH           0x21320c00
+#define SAMV70Q20_EXID_MATCH           0x00000002
+#define SAMV70Q19_CIDR_MATCH           0x213d0a00
+#define SAMV70Q19_EXID_MATCH           0x00000002
+
 #endif /* __AT91_SOC_H */