Merge tag 'at91-4.21-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 21:38:50 +0000 (13:38 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 12 Dec 2018 21:38:50 +0000 (13:38 -0800)
AT91 SoC for 4.21:

 - Add new SoC IDs

* tag 'at91-4.21-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: add support in soc driver for new SAM9X60
  ARM: at91: add support in soc driver for LPDDR2 SiP

Signed-off-by: Olof Johansson <olof@lixom.net>
drivers/soc/atmel/soc.c
drivers/soc/atmel/soc.h

index 4dd03b0..096a83c 100644 (file)
@@ -66,6 +66,8 @@ static const struct at91_soc __initconst socs[] = {
        AT91_SOC(AT91SAM9XE128_CIDR_MATCH, 0, "at91sam9xe128", "at91sam9xe128"),
        AT91_SOC(AT91SAM9XE256_CIDR_MATCH, 0, "at91sam9xe256", "at91sam9xe256"),
        AT91_SOC(AT91SAM9XE512_CIDR_MATCH, 0, "at91sam9xe512", "at91sam9xe512"),
+       AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH,
+                "sam9x60", "sam9x60"),
 #endif
 #ifdef CONFIG_SOC_SAMA5
        AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH,
@@ -90,12 +92,20 @@ static const struct at91_soc __initconst socs[] = {
                 "sama5d27c 128MiB SiP", "sama5d2"),
        AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_D5M_EXID_MATCH,
                 "sama5d27c 64MiB SiP", "sama5d2"),
+       AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_LD1G_EXID_MATCH,
+                "sama5d27c 128MiB LPDDR2 SiP", "sama5d2"),
+       AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_LD2G_EXID_MATCH,
+                "sama5d27c 256MiB LPDDR2 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(SAMA5D2_CIDR_MATCH, SAMA5D28C_LD1G_EXID_MATCH,
+                "sama5d28c 128MiB LPDDR2 SiP", "sama5d2"),
+       AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_LD2G_EXID_MATCH,
+                "sama5d28c 256MiB LPDDR2 SiP", "sama5d2"),
        AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D31_EXID_MATCH,
                 "sama5d31", "sama5d3"),
        AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D33_EXID_MATCH,
index 94cd5d1..ee652e4 100644 (file)
@@ -42,6 +42,7 @@ at91_soc_init(const struct at91_soc *socs);
 #define AT91SAM9G45_CIDR_MATCH         0x019b05a0
 #define AT91SAM9X5_CIDR_MATCH          0x019a05a0
 #define AT91SAM9N12_CIDR_MATCH         0x019a07a0
+#define SAM9X60_CIDR_MATCH             0x019b35a0
 
 #define AT91SAM9M11_EXID_MATCH         0x00000001
 #define AT91SAM9M10_EXID_MATCH         0x00000002
@@ -58,6 +59,8 @@ at91_soc_init(const struct at91_soc *socs);
 #define AT91SAM9N12_EXID_MATCH         0x00000006
 #define AT91SAM9CN11_EXID_MATCH                0x00000009
 
+#define SAM9X60_EXID_MATCH             0x00000000
+
 #define AT91SAM9XE128_CIDR_MATCH       0x329973a0
 #define AT91SAM9XE256_CIDR_MATCH       0x329a93a0
 #define AT91SAM9XE512_CIDR_MATCH       0x329aa3a0
@@ -73,9 +76,13 @@ at91_soc_init(const struct at91_soc *socs);
 #define SAMA5D26CU_EXID_MATCH          0x00000012
 #define SAMA5D27C_D1G_EXID_MATCH       0x00000033
 #define SAMA5D27C_D5M_EXID_MATCH       0x00000032
+#define SAMA5D27C_LD1G_EXID_MATCH      0x00000061
+#define SAMA5D27C_LD2G_EXID_MATCH      0x00000062
 #define SAMA5D27CU_EXID_MATCH          0x00000011
 #define SAMA5D27CN_EXID_MATCH          0x00000021
 #define SAMA5D28C_D1G_EXID_MATCH       0x00000013
+#define SAMA5D28C_LD1G_EXID_MATCH      0x00000071
+#define SAMA5D28C_LD2G_EXID_MATCH      0x00000072
 #define SAMA5D28CU_EXID_MATCH          0x00000010
 #define SAMA5D28CN_EXID_MATCH          0x00000020