Merge tag 'at91-ab-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/drivers

Pull "soc for 4.15" from Alexandre Belloni:

 - add SoC ids for the sama5d2 SiPs
 - Improve the AT91 maintainers entry

* tag 'at91-ab-4.15-soc' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  MAINTAINERS: Add SoC drivers to AT91 entry
  drivers: soc: atmel: Add basic support for new sama5d2 SiPs

3 files changed, 17 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index d3c6f54f90d1..fb59572f780e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1226,6 +1226,8 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:      http://www.linux4sam.org
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 S:      Supported
+N:      at91
+N:      atmel
 F:      arch/arm/mach-at91/
 F:      include/soc/at91/
 F:      arch/arm/boot/dts/at91*.dts
@@ -1234,6 +1236,9 @@ F:	arch/arm/boot/dts/sama*.dts
 F:      arch/arm/boot/dts/sama*.dtsi
 F:      arch/arm/include/debug/at91.S
 F:      drivers/memory/atmel*
+F:      drivers/watchdog/sama5d4_wdt.c
+X:      drivers/input/touchscreen/atmel_mxt_ts.c
+X:      drivers/net/wireless/atmel/
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:      Rob Herring <robh@kernel.org>
diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c
index c1363c83c352..4dd03b099c89 100644
--- a/drivers/soc/atmel/soc.c
+++ b/drivers/soc/atmel/soc.c
@@ -72,6 +72,8 @@ static const struct at91_soc __initconst socs[] = {
                  "sama5d21", "sama5d2"),
         AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D22CU_EXID_MATCH,
                  "sama5d22", "sama5d2"),
+        AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D225C_D1M_EXID_MATCH,
+                 "sama5d225c 16MiB SiP", "sama5d2"),
         AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D23CU_EXID_MATCH,
                  "sama5d23", "sama5d2"),
         AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D24CX_EXID_MATCH,
@@ -84,10 +86,16 @@ static const struct at91_soc __initconst socs[] = {
                  "sama5d27", "sama5d2"),
         AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27CN_EXID_MATCH,
                  "sama5d27", "sama5d2"),
+        AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_D1G_EXID_MATCH,
+                 "sama5d27c 128MiB SiP", "sama5d2"),
+        AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_D5M_EXID_MATCH,
+                 "sama5d27c 64MiB SiP", "sama5d2"),
         AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CU_EXID_MATCH,
                  "sama5d28", "sama5d2"),
         AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CN_EXID_MATCH,
                  "sama5d28", "sama5d2"),
+        AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_D1G_EXID_MATCH,
+                 "sama5d28c 128MiB SiP", "sama5d2"),
         AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D31_EXID_MATCH,
                  "sama5d31", "sama5d3"),
         AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D33_EXID_MATCH,
diff --git a/drivers/soc/atmel/soc.h b/drivers/soc/atmel/soc.h
index a90bd5b0ef8f..94cd5d1ab502 100644
--- a/drivers/soc/atmel/soc.h
+++ b/drivers/soc/atmel/soc.h
@@ -64,14 +64,18 @@ at91_soc_init(const struct at91_soc *socs);
 
 #define SAMA5D2_CIDR_MATCH              0x0a5c08c0
 #define SAMA5D21CU_EXID_MATCH           0x0000005a
+#define SAMA5D225C_D1M_EXID_MATCH       0x00000053
 #define SAMA5D22CU_EXID_MATCH           0x00000059
 #define SAMA5D22CN_EXID_MATCH           0x00000069
 #define SAMA5D23CU_EXID_MATCH           0x00000058
 #define SAMA5D24CX_EXID_MATCH           0x00000004
 #define SAMA5D24CU_EXID_MATCH           0x00000014
 #define SAMA5D26CU_EXID_MATCH           0x00000012
+#define SAMA5D27C_D1G_EXID_MATCH        0x00000033
+#define SAMA5D27C_D5M_EXID_MATCH        0x00000032
 #define SAMA5D27CU_EXID_MATCH           0x00000011
 #define SAMA5D27CN_EXID_MATCH           0x00000021
+#define SAMA5D28C_D1G_EXID_MATCH        0x00000013
 #define SAMA5D28CU_EXID_MATCH           0x00000010
 #define SAMA5D28CN_EXID_MATCH           0x00000020