* [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency
@ 2021-10-13 0:55 Sasha Levin
2021-10-13 0:55 ` [PATCH AUTOSEL 5.4 2/6] ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Sasha Levin
2021-10-13 8:39 ` [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency Arnd Bergmann
0 siblings, 2 replies; 3+ messages in thread
From: Sasha Levin @ 2021-10-13 0:55 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Joel Stanley, Arnd Bergmann, Sasha Levin, linux,
krzysztof.kozlowski, alexandre.torgue, treding, digetx,
m.szyprowski, olivier.moysan, mani, grygorii.strashko, f.fainelli,
stefan.wahren, alexandre.belloni, linux-arm-kernel
From: Joel Stanley <joel@jms.id.au>
[ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ]
DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM
was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for
CONFIG_FB") the select was replaced with a depends on FB, disabling the
drivers that depended on it.
Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and
VIDEO_VIVID.
It must be set to y and not a module as the test driver VIDEO_VIVID
requires it to be built in.
Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com
Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/configs/multi_v7_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index e4c8def9a0a5..32dfc736a4b1 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -677,6 +677,7 @@ CONFIG_DRM_PL111=m
CONFIG_DRM_LIMA=m
CONFIG_DRM_PANFROST=m
CONFIG_DRM_ASPEED_GFX=m
+CONFIG_FB=y
CONFIG_FB_EFI=y
CONFIG_FB_WM8505=y
CONFIG_FB_SH_MOBILE_LCDC=y
--
2.33.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH AUTOSEL 5.4 2/6] ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default
2021-10-13 0:55 [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency Sasha Levin
@ 2021-10-13 0:55 ` Sasha Levin
2021-10-13 8:39 ` [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency Arnd Bergmann
1 sibling, 0 replies; 3+ messages in thread
From: Sasha Levin @ 2021-10-13 0:55 UTC (permalink / raw)
To: linux-kernel, stable
Cc: Sasha Levin, devicetree, alexandre.belloni, ludovic.desroches,
robh+dt, Eugen Hristev, linux-arm-kernel
From: Eugen Hristev <eugen.hristev@microchip.com>
[ Upstream commit 4348cc10da6377a86940beb20ad357933b8f91bb ]
Without a sensor node, the ISC will simply fail to probe, as the
corresponding port node is missing.
It is then logical to disable the node in the devicetree.
If we add a port with a connection to a sensor endpoint, ISC can be enabled.
Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20210902121358.503589-1-eugen.hristev@microchip.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
index 89f0c9979b89..4f63158d6b9b 100644
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -69,7 +69,6 @@ apb {
isc: isc@f0008000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;
- status = "okay";
};
qspi1: spi@f0024000 {
--
2.33.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency
2021-10-13 0:55 [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency Sasha Levin
2021-10-13 0:55 ` [PATCH AUTOSEL 5.4 2/6] ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Sasha Levin
@ 2021-10-13 8:39 ` Arnd Bergmann
1 sibling, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-10-13 8:39 UTC (permalink / raw)
To: Sasha Levin
Cc: Linux Kernel Mailing List, # 3.4.x, Joel Stanley, Arnd Bergmann,
Russell King - ARM Linux, Krzysztof Kozlowski, Alexandre TORGUE,
Thierry Reding, Dmitry Osipenko, Marek Szyprowski, Olivier Moysan,
Manivannan Sadhasivam, Grygorii Strashko, Florian Fainelli,
Stefan Wahren, Alexandre Belloni, Linux ARM
On Wed, Oct 13, 2021 at 2:55 AM Sasha Levin <sashal@kernel.org> wrote:
>
> From: Joel Stanley <joel@jms.id.au>
>
> [ Upstream commit 8c1768967e2733d55abf449d8abd6f1915ba3539 ]
>
> DRM_FBDEV_EMULATION previously selected FB and was default y as long as DRM
> was enabled. In commit f611b1e7624c ("drm: Avoid circular dependencies for
> CONFIG_FB") the select was replaced with a depends on FB, disabling the
> drivers that depended on it.
>
> Renable FB so we get back FB_EFI, FB_WM8505, FB_SH_MOBILE_LCDC, FB_SIMPLE and
> VIDEO_VIVID.
>
> It must be set to y and not a module as the test driver VIDEO_VIVID
> requires it to be built in.
>
> Link: https://lore.kernel.org/r/CAK8P3a18EdBKQdGDOZc9cPKsf=hY8==v2cO0DBE_tyd82Uq-Ng@mail.gmail.com
> Signed-off-by: Joel Stanley <joel@jms.id.au>
> Reviewed-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
This is only needed to fix regressions from f611b1e7624c, which made it into
v5.14. I don't think that patch should be backported, so neither
should this one.
Arnd
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-10-13 10:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-13 0:55 [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency Sasha Levin
2021-10-13 0:55 ` [PATCH AUTOSEL 5.4 2/6] ARM: dts: at91: sama5d2_som1_ek: disable ISC node by default Sasha Levin
2021-10-13 8:39 ` [PATCH AUTOSEL 5.4 1/6] ARM: config: mutli v7: Reenable FB dependency Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).