diff options
| author | Claudiu Beznea <claudiu.beznea@microchip.com> | 2019-11-29 14:51:40 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2019-12-10 00:44:53 +0100 |
| commit | dccf722913945dd065ceb04cdd102c74ffe5dfec (patch) | |
| tree | 28d62400f1bd434d29c4a6c6b32c4f438b7e8921 /drivers/soc/atmel | |
| parent | ARM: at91: pm: move SAM9X60's PM under its own SoC config flag (diff) | |
| download | linux-dccf722913945dd065ceb04cdd102c74ffe5dfec.tar.xz linux-dccf722913945dd065ceb04cdd102c74ffe5dfec.zip | |
drivers: soc: atmel: move sam9x60 under its own config flag
Move SAM9X60 under its own config flag.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/1575035505-6310-5-git-send-email-claudiu.beznea@microchip.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'drivers/soc/atmel')
| -rw-r--r-- | drivers/soc/atmel/soc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index 096a83cf0caf..55a1f57a4d8c 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -66,8 +66,9 @@ 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_SAM9X60 + AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"), #endif #ifdef CONFIG_SOC_SAMA5 AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH, |