aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/at91/patches-5.10/139-drivers-soc-atmel-add-per-soc-id-and-version-match-m.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/at91/patches-5.10/139-drivers-soc-atmel-add-per-soc-id-and-version-match-m.patch')
-rw-r--r--target/linux/at91/patches-5.10/139-drivers-soc-atmel-add-per-soc-id-and-version-match-m.patch348
1 files changed, 0 insertions, 348 deletions
diff --git a/target/linux/at91/patches-5.10/139-drivers-soc-atmel-add-per-soc-id-and-version-match-m.patch b/target/linux/at91/patches-5.10/139-drivers-soc-atmel-add-per-soc-id-and-version-match-m.patch
deleted file mode 100644
index 72cdb46f11..0000000000
--- a/target/linux/at91/patches-5.10/139-drivers-soc-atmel-add-per-soc-id-and-version-match-m.patch
+++ /dev/null
@@ -1,348 +0,0 @@
-From 8f6f7ef363268f417f1729bb0b234326dd1e8e2a Mon Sep 17 00:00:00 2001
-From: Claudiu Beznea <claudiu.beznea@microchip.com>
-Date: Fri, 22 Jan 2021 14:21:35 +0200
-Subject: [PATCH 139/247] drivers: soc: atmel: add per soc id and version match
- masks
-
-SAMA7G5 has different masks for chip ID and chip version on CIDR
-register compared to previous AT91 SoCs. For this the commit adapts
-the code for SAMA7G5 addition by introducing 2 new members in
-struct at91_soc and fill them properly and also preparing the
-parsing of proper DT binding.
-
-Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
-Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
-Link: https://lore.kernel.org/r/1611318097-8970-6-git-send-email-claudiu.beznea@microchip.com
----
- drivers/soc/atmel/soc.c | 199 +++++++++++++++++++++++++++-------------
- drivers/soc/atmel/soc.h | 7 +-
- 2 files changed, 140 insertions(+), 66 deletions(-)
-
---- a/drivers/soc/atmel/soc.c
-+++ b/drivers/soc/atmel/soc.c
-@@ -25,135 +25,200 @@
- #define AT91_DBGU_EXID 0x44
- #define AT91_CHIPID_CIDR 0x00
- #define AT91_CHIPID_EXID 0x04
--#define AT91_CIDR_VERSION(x) ((x) & 0x1f)
-+#define AT91_CIDR_VERSION(x, m) ((x) & (m))
-+#define AT91_CIDR_VERSION_MASK GENMASK(4, 0)
- #define AT91_CIDR_EXT BIT(31)
- #define AT91_CIDR_MATCH_MASK GENMASK(30, 5)
-
- static const struct at91_soc socs[] __initconst = {
- #ifdef CONFIG_SOC_AT91RM9200
-- AT91_SOC(AT91RM9200_CIDR_MATCH, 0, "at91rm9200 BGA", "at91rm9200"),
-+ AT91_SOC(AT91RM9200_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91rm9200 BGA", "at91rm9200"),
- #endif
- #ifdef CONFIG_SOC_AT91SAM9
-- AT91_SOC(AT91SAM9260_CIDR_MATCH, 0, "at91sam9260", NULL),
-- AT91_SOC(AT91SAM9261_CIDR_MATCH, 0, "at91sam9261", NULL),
-- AT91_SOC(AT91SAM9263_CIDR_MATCH, 0, "at91sam9263", NULL),
-- AT91_SOC(AT91SAM9G20_CIDR_MATCH, 0, "at91sam9g20", NULL),
-- AT91_SOC(AT91SAM9RL64_CIDR_MATCH, 0, "at91sam9rl64", NULL),
-- AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M11_EXID_MATCH,
-+ AT91_SOC(AT91SAM9260_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9260", NULL),
-+ AT91_SOC(AT91SAM9261_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9261", NULL),
-+ AT91_SOC(AT91SAM9263_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9263", NULL),
-+ AT91_SOC(AT91SAM9G20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9g20", NULL),
-+ AT91_SOC(AT91SAM9RL64_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9rl64", NULL),
-+ AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9M11_EXID_MATCH,
- "at91sam9m11", "at91sam9g45"),
-- AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9M10_EXID_MATCH,
-+ AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9M10_EXID_MATCH,
- "at91sam9m10", "at91sam9g45"),
-- AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G46_EXID_MATCH,
-+ AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9G46_EXID_MATCH,
- "at91sam9g46", "at91sam9g45"),
-- AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91SAM9G45_EXID_MATCH,
-+ AT91_SOC(AT91SAM9G45_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9G45_EXID_MATCH,
- "at91sam9g45", "at91sam9g45"),
-- AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G15_EXID_MATCH,
-+ AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9G15_EXID_MATCH,
- "at91sam9g15", "at91sam9x5"),
-- AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G35_EXID_MATCH,
-+ AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9G35_EXID_MATCH,
- "at91sam9g35", "at91sam9x5"),
-- AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X35_EXID_MATCH,
-+ AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9X35_EXID_MATCH,
- "at91sam9x35", "at91sam9x5"),
-- AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9G25_EXID_MATCH,
-+ AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9G25_EXID_MATCH,
- "at91sam9g25", "at91sam9x5"),
-- AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91SAM9X25_EXID_MATCH,
-+ AT91_SOC(AT91SAM9X5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9X25_EXID_MATCH,
- "at91sam9x25", "at91sam9x5"),
-- AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN12_EXID_MATCH,
-+ AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9CN12_EXID_MATCH,
- "at91sam9cn12", "at91sam9n12"),
-- AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9N12_EXID_MATCH,
-+ AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9N12_EXID_MATCH,
- "at91sam9n12", "at91sam9n12"),
-- AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91SAM9CN11_EXID_MATCH,
-+ AT91_SOC(AT91SAM9N12_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, AT91SAM9CN11_EXID_MATCH,
- "at91sam9cn11", "at91sam9n12"),
-- 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(AT91SAM9XE128_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9xe128", "at91sam9xe128"),
-+ AT91_SOC(AT91SAM9XE256_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9xe256", "at91sam9xe256"),
-+ AT91_SOC(AT91SAM9XE512_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, 0, "at91sam9xe512", "at91sam9xe512"),
- #endif
- #ifdef CONFIG_SOC_SAM9X60
-- AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"),
-+ AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
-+ "sam9x60", "sam9x60"),
- AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D5M_EXID_MATCH,
-+ AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
- "sam9x60 64MiB DDR2 SiP", "sam9x60"),
- AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D1G_EXID_MATCH,
-+ AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
- "sam9x60 128MiB DDR2 SiP", "sam9x60"),
- AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D6K_EXID_MATCH,
-+ AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
- "sam9x60 8MiB SDRAM SiP", "sam9x60"),
- #endif
- #ifdef CONFIG_SOC_SAMA5
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D21CU_EXID_MATCH,
- "sama5d21", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D22CU_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D22CU_EXID_MATCH,
- "sama5d22", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D225C_D1M_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D225C_D1M_EXID_MATCH,
- "sama5d225c 16MiB SiP", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D23CU_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D23CU_EXID_MATCH,
- "sama5d23", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D24CX_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D24CX_EXID_MATCH,
- "sama5d24", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D24CU_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D24CU_EXID_MATCH,
- "sama5d24", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D26CU_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D26CU_EXID_MATCH,
- "sama5d26", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27CU_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D27CU_EXID_MATCH,
- "sama5d27", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27CN_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D27CN_EXID_MATCH,
- "sama5d27", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_D1G_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D27C_D1G_EXID_MATCH,
- "sama5d27c 128MiB SiP", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_D5M_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D27C_D5M_EXID_MATCH,
- "sama5d27c 64MiB SiP", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_LD1G_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D27C_LD1G_EXID_MATCH,
- "sama5d27c 128MiB LPDDR2 SiP", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_LD2G_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D27C_LD2G_EXID_MATCH,
- "sama5d27c 256MiB LPDDR2 SiP", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CU_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D28CU_EXID_MATCH,
- "sama5d28", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CN_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D28CN_EXID_MATCH,
- "sama5d28", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_D1G_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D28C_D1G_EXID_MATCH,
- "sama5d28c 128MiB SiP", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_LD1G_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D28C_LD1G_EXID_MATCH,
- "sama5d28c 128MiB LPDDR2 SiP", "sama5d2"),
-- AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_LD2G_EXID_MATCH,
-+ AT91_SOC(SAMA5D2_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D28C_LD2G_EXID_MATCH,
- "sama5d28c 256MiB LPDDR2 SiP", "sama5d2"),
-- AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D31_EXID_MATCH,
-+ AT91_SOC(SAMA5D3_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D31_EXID_MATCH,
- "sama5d31", "sama5d3"),
-- AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D33_EXID_MATCH,
-+ AT91_SOC(SAMA5D3_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D33_EXID_MATCH,
- "sama5d33", "sama5d3"),
-- AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D34_EXID_MATCH,
-+ AT91_SOC(SAMA5D3_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D34_EXID_MATCH,
- "sama5d34", "sama5d3"),
-- AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D35_EXID_MATCH,
-+ AT91_SOC(SAMA5D3_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D35_EXID_MATCH,
- "sama5d35", "sama5d3"),
-- AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D36_EXID_MATCH,
-+ AT91_SOC(SAMA5D3_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D36_EXID_MATCH,
- "sama5d36", "sama5d3"),
-- AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D41_EXID_MATCH,
-+ AT91_SOC(SAMA5D4_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D41_EXID_MATCH,
- "sama5d41", "sama5d4"),
-- AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D42_EXID_MATCH,
-+ AT91_SOC(SAMA5D4_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D42_EXID_MATCH,
- "sama5d42", "sama5d4"),
-- AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D43_EXID_MATCH,
-+ AT91_SOC(SAMA5D4_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D43_EXID_MATCH,
- "sama5d43", "sama5d4"),
-- AT91_SOC(SAMA5D4_CIDR_MATCH, SAMA5D44_EXID_MATCH,
-+ AT91_SOC(SAMA5D4_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMA5D44_EXID_MATCH,
- "sama5d44", "sama5d4"),
- #endif
- #ifdef CONFIG_SOC_SAMV7
-- AT91_SOC(SAME70Q21_CIDR_MATCH, SAME70Q21_EXID_MATCH,
-+ AT91_SOC(SAME70Q21_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAME70Q21_EXID_MATCH,
- "same70q21", "same7"),
-- AT91_SOC(SAME70Q20_CIDR_MATCH, SAME70Q20_EXID_MATCH,
-+ AT91_SOC(SAME70Q20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAME70Q20_EXID_MATCH,
- "same70q20", "same7"),
-- AT91_SOC(SAME70Q19_CIDR_MATCH, SAME70Q19_EXID_MATCH,
-+ AT91_SOC(SAME70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK
-+ AT91_CIDR_VERSION_MASK, SAME70Q19_EXID_MATCH,
- "same70q19", "same7"),
-- AT91_SOC(SAMS70Q21_CIDR_MATCH, SAMS70Q21_EXID_MATCH,
-+ AT91_SOC(SAMS70Q21_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMS70Q21_EXID_MATCH,
- "sams70q21", "sams7"),
-- AT91_SOC(SAMS70Q20_CIDR_MATCH, SAMS70Q20_EXID_MATCH,
-+ AT91_SOC(SAMS70Q20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMS70Q20_EXID_MATCH,
- "sams70q20", "sams7"),
-- AT91_SOC(SAMS70Q19_CIDR_MATCH, SAMS70Q19_EXID_MATCH,
-+ AT91_SOC(SAMS70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMS70Q19_EXID_MATCH,
- "sams70q19", "sams7"),
-- AT91_SOC(SAMV71Q21_CIDR_MATCH, SAMV71Q21_EXID_MATCH,
-+ AT91_SOC(SAMV71Q21_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMV71Q21_EXID_MATCH,
- "samv71q21", "samv7"),
-- AT91_SOC(SAMV71Q20_CIDR_MATCH, SAMV71Q20_EXID_MATCH,
-+ AT91_SOC(SAMV71Q20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMV71Q20_EXID_MATCH,
- "samv71q20", "samv7"),
-- AT91_SOC(SAMV71Q19_CIDR_MATCH, SAMV71Q19_EXID_MATCH,
-+ AT91_SOC(SAMV71Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMV71Q19_EXID_MATCH,
- "samv71q19", "samv7"),
-- AT91_SOC(SAMV70Q20_CIDR_MATCH, SAMV70Q20_EXID_MATCH,
-+ AT91_SOC(SAMV70Q20_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMV70Q20_EXID_MATCH,
- "samv70q20", "samv7"),
-- AT91_SOC(SAMV70Q19_CIDR_MATCH, SAMV70Q19_EXID_MATCH,
-+ AT91_SOC(SAMV70Q19_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
-+ AT91_CIDR_VERSION_MASK, SAMV70Q19_EXID_MATCH,
- "samv70q19", "samv7"),
- #endif
- { /* sentinel */ },
-@@ -191,8 +256,12 @@ static int __init at91_get_cidr_exid_fro
- {
- struct device_node *np;
- void __iomem *regs;
-+ static const struct of_device_id chipids[] = {
-+ { .compatible = "atmel,sama5d2-chipid" },
-+ { },
-+ };
-
-- np = of_find_compatible_node(NULL, NULL, "atmel,sama5d2-chipid");
-+ np = of_find_matching_node(NULL, chipids);
- if (!np)
- return -ENODEV;
-
-@@ -235,7 +304,7 @@ struct soc_device * __init at91_soc_init
- }
-
- for (soc = socs; soc->name; soc++) {
-- if (soc->cidr_match != (cidr & AT91_CIDR_MATCH_MASK))
-+ if (soc->cidr_match != (cidr & soc->cidr_mask))
- continue;
-
- if (!(cidr & AT91_CIDR_EXT) || soc->exid_match == exid)
-@@ -254,7 +323,7 @@ struct soc_device * __init at91_soc_init
- soc_dev_attr->family = soc->family;
- soc_dev_attr->soc_id = soc->name;
- soc_dev_attr->revision = kasprintf(GFP_KERNEL, "%X",
-- AT91_CIDR_VERSION(cidr));
-+ AT91_CIDR_VERSION(cidr, soc->version_mask));
- soc_dev = soc_device_register(soc_dev_attr);
- if (IS_ERR(soc_dev)) {
- kfree(soc_dev_attr->revision);
-@@ -266,7 +335,7 @@ struct soc_device * __init at91_soc_init
- if (soc->family)
- pr_info("Detected SoC family: %s\n", soc->family);
- pr_info("Detected SoC: %s, revision %X\n", soc->name,
-- AT91_CIDR_VERSION(cidr));
-+ AT91_CIDR_VERSION(cidr, soc->version_mask));
-
- return soc_dev;
- }
---- a/drivers/soc/atmel/soc.h
-+++ b/drivers/soc/atmel/soc.h
-@@ -16,14 +16,19 @@
-
- struct at91_soc {
- u32 cidr_match;
-+ u32 cidr_mask;
-+ u32 version_mask;
- u32 exid_match;
- const char *name;
- const char *family;
- };
-
--#define AT91_SOC(__cidr, __exid, __name, __family) \
-+#define AT91_SOC(__cidr, __cidr_mask, __version_mask, __exid, \
-+ __name, __family) \
- { \
- .cidr_match = (__cidr), \
-+ .cidr_mask = (__cidr_mask), \
-+ .version_mask = (__version_mask), \
- .exid_match = (__exid), \
- .name = (__name), \
- .family = (__family), \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 05:55:25 +0000