44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From a2eda4ef1e3d617cdd669e256e45e969fab62398 Mon Sep 17 00:00:00 2001
|
|
From: Kai Stuhlemmer <kai.stuhlemmer@ebee.de>
|
|
Date: Thu, 8 Oct 2020 14:50:28 +0200
|
|
Subject: [PATCH 136/247] ARM: at91: sam9x60 SiP types added to soc description
|
|
|
|
Adding SAM9X60 SIP variants to the soc description list.
|
|
|
|
Signed-off-by: Kai Stuhlemmer <kai.stuhlemmer@ebee.de>
|
|
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
|
|
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
|
|
Link: https://lore.kernel.org/r/20201008125028.21071-1-nicolas.ferre@microchip.com
|
|
---
|
|
drivers/soc/atmel/soc.c | 6 ++++++
|
|
drivers/soc/atmel/soc.h | 3 +++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
--- a/drivers/soc/atmel/soc.c
|
|
+++ b/drivers/soc/atmel/soc.c
|
|
@@ -69,6 +69,12 @@ static const struct at91_soc __initconst
|
|
#endif
|
|
#ifdef CONFIG_SOC_SAM9X60
|
|
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"),
|
|
+ AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D5M_EXID_MATCH,
|
|
+ "sam9x60 64MiB DDR2 SiP", "sam9x60"),
|
|
+ AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D1G_EXID_MATCH,
|
|
+ "sam9x60 128MiB DDR2 SiP", "sam9x60"),
|
|
+ AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D6K_EXID_MATCH,
|
|
+ "sam9x60 8MiB SDRAM SiP", "sam9x60"),
|
|
#endif
|
|
#ifdef CONFIG_SOC_SAMA5
|
|
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH,
|
|
--- a/drivers/soc/atmel/soc.h
|
|
+++ b/drivers/soc/atmel/soc.h
|
|
@@ -60,6 +60,9 @@ at91_soc_init(const struct at91_soc *soc
|
|
#define AT91SAM9CN11_EXID_MATCH 0x00000009
|
|
|
|
#define SAM9X60_EXID_MATCH 0x00000000
|
|
+#define SAM9X60_D5M_EXID_MATCH 0x00000001
|
|
+#define SAM9X60_D1G_EXID_MATCH 0x00000010
|
|
+#define SAM9X60_D6K_EXID_MATCH 0x00000011
|
|
|
|
#define AT91SAM9XE128_CIDR_MATCH 0x329973a0
|
|
#define AT91SAM9XE256_CIDR_MATCH 0x329a93a0
|