Skip to content

Commit 35074df

Browse files
Mihai Sainclaudiubeznea
authored andcommitted
ARM: at91: fix soc detection for SAM9X60 SiPs
Fix SoC detection for SAM9X60 SiPs: SAM9X60D5M SAM9X60D1G SAM9X60D6K Fixes: af3a105 ("drivers: soc: atmel: add per soc id and version match masks") Signed-off-by: Mihai Sain <[email protected]> Signed-off-by: Claudiu Beznea <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 416ce19 commit 35074df

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/soc/atmel/soc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ static const struct at91_soc socs[] __initconst = {
9191
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
9292
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
9393
"sam9x60", "sam9x60"),
94-
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D5M_EXID_MATCH,
95-
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
94+
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
95+
AT91_CIDR_VERSION_MASK, SAM9X60_D5M_EXID_MATCH,
9696
"sam9x60 64MiB DDR2 SiP", "sam9x60"),
97-
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D1G_EXID_MATCH,
98-
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
97+
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
98+
AT91_CIDR_VERSION_MASK, SAM9X60_D1G_EXID_MATCH,
9999
"sam9x60 128MiB DDR2 SiP", "sam9x60"),
100-
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D6K_EXID_MATCH,
101-
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
100+
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
101+
AT91_CIDR_VERSION_MASK, SAM9X60_D6K_EXID_MATCH,
102102
"sam9x60 8MiB SDRAM SiP", "sam9x60"),
103103
#endif
104104
#ifdef CONFIG_SOC_SAMA5

0 commit comments

Comments
 (0)