Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch b/queue-4.14/fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch
new file mode 100644 (file)
index 0000000..3526b4e
--- /dev/null
+++ b/queue-4.14/fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch
@@ -0,0 +1,38 @@
+From 649b75a76bf28b5d3f541fb8cf1d38a6103a3ab8 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 8 Nov 2023 13:58:42 +0100
+Subject: fbdev: fsl-diu-fb: mark wr_reg_wa() static
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+[ Upstream commit a5035c81847430dfa3482807b07325f29e9e8c09 ]
+
+wr_reg_wa() is not an appropriate name for a global function, and doesn't need
+to be global anyway, so mark it static and avoid the warning:
+
+drivers/video/fbdev/fsl-diu-fb.c:493:6: error: no previous prototype for 'wr_reg_wa' [-Werror=missing-prototypes]
+
+Fixes: 0d9dab39fbbe ("powerpc/5121: fsl-diu-fb: fix issue with re-enabling DIU area descriptor")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Helge Deller <deller@gmx.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/video/fbdev/fsl-diu-fb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/video/fbdev/fsl-diu-fb.c b/drivers/video/fbdev/fsl-diu-fb.c
+index 25abbcf389134..8bdd82f760565 100644
+--- a/drivers/video/fbdev/fsl-diu-fb.c
++++ b/drivers/video/fbdev/fsl-diu-fb.c
+@@ -489,7 +489,7 @@ static enum fsl_diu_monitor_port fsl_diu_name_to_port(const char *s)
+  * Workaround for failed writing desc register of planes.
+  * Needed with MPC5121 DIU rev 2.0 silicon.
+  */
+-void wr_reg_wa(u32 *reg, u32 val)
++static void wr_reg_wa(u32 *reg, u32 val)
+ {
+       do {
+               out_be32(reg, val);
+-- 
+2.42.0
+

diff --git a/queue-4.14/fbdev-omapfb-drop-unused-remove-function.patch b/queue-4.14/fbdev-omapfb-drop-unused-remove-function.patch
new file mode 100644 (file)
index 0000000..1d782c4
--- /dev/null
+++ b/queue-4.14/fbdev-omapfb-drop-unused-remove-function.patch
@@ -0,0 +1,54 @@
+From 3b7c977db2640cfc210b274253f850267a5f920c Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 3 Nov 2023 18:35:58 +0100
+Subject: fbdev: omapfb: Drop unused remove function
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+
+[ Upstream commit fc6699d62f5f4facc3e934efd25892fc36050b70 ]
+
+OMAP2_VRFB is a bool, so the vrfb driver can never be compiled as a
+module. With that __exit_p(vrfb_remove) always evaluates to NULL and
+vrfb_remove() is unused.
+
+If the driver was compilable as a module, it would fail to build because
+the type of vrfb_remove() isn't compatible with struct
+platform_driver::remove(). (The former returns void, the latter int.)
+
+Fixes: aa1e49a3752f ("OMAPDSS: VRFB: add omap_vrfb_supported()")
+Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
+Signed-off-by: Helge Deller <deller@gmx.de>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/drivers/video/fbdev/omap2/omapfb/vrfb.c b/drivers/video/fbdev/omap2/omapfb/vrfb.c
+index f346b02eee1d8..91d626e140098 100644
+--- a/drivers/video/fbdev/omap2/omapfb/vrfb.c
++++ b/drivers/video/fbdev/omap2/omapfb/vrfb.c
+@@ -382,17 +382,10 @@ static int __init vrfb_probe(struct platform_device *pdev)
+       return 0;
+ }
+ 
+-static void __exit vrfb_remove(struct platform_device *pdev)
+-{
+-      vrfb_loaded = false;
+-}
+-
+ static struct platform_driver vrfb_driver = {
+       .driver.name    = "omapvrfb",
+-      .remove         = __exit_p(vrfb_remove),
+ };
+-
+-module_platform_driver_probe(vrfb_driver, vrfb_probe);
++builtin_platform_driver_probe(vrfb_driver, vrfb_probe);
+ 
+ MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
+ MODULE_DESCRIPTION("OMAP VRFB");
+-- 
+2.42.0
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 5131d096e5df483fc9776de9ae946fdfc294c21d..1ac9669d2d83f7484b19c1bb51c36a019a1bf609 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -40,3 +40,5 @@ dccp-call-security_inet_conn_request-after-setting-i.patch
 dccp-tcp-call-security_inet_conn_request-after-setti.patch
 tg3-power-down-device-only-on-system_power_off.patch
 netfilter-xt_recent-fix-increase-ipv6-literal-buffer.patch
+fbdev-omapfb-drop-unused-remove-function.patch
+fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch