The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 975435132ecfef8de2118668c9f4f95086a0aae5 Mon Sep 17 00:00:00 2001
From: Claudiu Beznea claudiu.beznea@microchip.com Date: Fri, 22 Jan 2021 14:21:34 +0200 Subject: [PATCH] drivers: soc: atmel: add null entry at the end of at91_soc_allowed_list[]
of_match_node() calls __of_match_node() which loops though the entries of matches array. It stops when condition: (matches->name[0] || matches->type[0] || matches->compatible[0]) is false. Thus, add a null entry at the end of at91_soc_allowed_list[] array.
Fixes: caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs") Cc: stable@vger.kernel.org #4.12+ Signed-off-by: Claudiu Beznea claudiu.beznea@microchip.com Signed-off-by: Arnd Bergmann arnd@arndb.de Signed-off-by: Nicolas Ferre nicolas.ferre@microchip.com
diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index 728d461ad6d6..698d21f50516 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -275,7 +275,8 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = { { .compatible = "atmel,at91rm9200", }, { .compatible = "atmel,at91sam9", }, { .compatible = "atmel,sama5", }, - { .compatible = "atmel,samv7", } + { .compatible = "atmel,samv7", }, + { } };
static int __init atmel_soc_device_init(void)
On Mon, Mar 1, 2021 at 11:32 AM gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Fixes: caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs") Cc: stable@vger.kernel.org #4.12+
Hi Greg,
Did you add a backport of the caab13b49604 patch to 5.4 and earlier?
Without that patch, this one will not apply, but if you did apply caab13b49604, we need this one as well, and should do a backport.
Arnd
On Mon, Mar 01, 2021 at 11:52:17AM +0100, Arnd Bergmann wrote:
On Mon, Mar 1, 2021 at 11:32 AM gregkh@linuxfoundation.org wrote:
The patch below does not apply to the 5.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
Fixes: caab13b49604 ("drivers: soc: atmel: Avoid calling at91_soc_init on non AT91 SoCs") Cc: stable@vger.kernel.org #4.12+
Hi Greg,
Did you add a backport of the caab13b49604 patch to 5.4 and earlier?
Yes, it is in the following releases: 4.14.219 4.19.173 5.4.95 5.10.13 5.11
Without that patch, this one will not apply, but if you did apply caab13b49604, we need this one as well, and should do a backport.
Agreed, that's why I asked for one :)
thanks,
greg k-h
linux-stable-mirror@lists.linaro.org