Skip to content

Commit

Permalink
drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs
Browse files Browse the repository at this point in the history
commit caab13b4960416b9fee83169a758eb0f31e65109 upstream.

Since at91_soc_init is called unconditionally from atmel_soc_device_init,
we get the following warning on all non AT91 SoCs:
	" AT91: Could not find identification node"

Fix the same by filtering with allowed AT91 SoC list.

Cc: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: stable@vger.kernel.org #4.12+
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20201211135846.1334322-1-sudeep.holla@arm.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
sudeep-holla authored and Jimbo77 committed Feb 11, 2021
1 parent c755386 commit b507ad3
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions drivers/soc/atmel/soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,20 @@ struct soc_device * __init at91_soc_init(const struct at91_soc *socs)
return soc_dev;
}

static const struct of_device_id at91_soc_allowed_list[] __initconst = {
{ .compatible = "atmel,at91rm9200", },
{ .compatible = "atmel,at91sam9", },
{ .compatible = "atmel,sama5", },
{ .compatible = "atmel,samv7", }
};

static int __init atmel_soc_device_init(void)
{
struct device_node *np = of_find_node_by_path("/");

if (!of_match_node(at91_soc_allowed_list, np))
return 0;

at91_soc_init(socs);

return 0;
Expand Down

0 comments on commit b507ad3

Please sign in to comment.