3 files changed, 7 insertions, 2 deletions

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 699b71e7f7ec..44eacdd7468b 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 d3d7b993846b..86c71debab5b 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/setup.c b/arch/arm/mach-at91/setup.c
index 094b3459c288..eb6468dc60d5 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -233,6 +233,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;
                 }
         }
 }
@@ -275,6 +278,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",
 };