lantiq: replace patches with upstream version

Patches 12 and 13 have been superseded by patch 12. Other patches have no significant changes. Signed-off-by: Aleksander Jan Bajkowski <olek2@wp.pl> Link: https://github.com/openwrt/openwrt/pull/19675 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2025-08-07 13:36:49 +02:00
parent 03542312f7
commit a0e3998b48
19 changed files with 137 additions and 192 deletions
@@ -1,7 +1,7 @@
-From ada0c7fd1b2e6daaf64bf8649cc58afaceed1a3d Mon Sep 17 00:00:00 2001
+From cff836f0bb0c53fcf43c12e32ee499cdf7e4a584 Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 18:11:41 +0800
-Subject: [PATCH 02/16] MIPS: lantiq: xway: mark dma_init() as static
+Date: Wed, 18 Jun 2025 22:53:15 +0800
+Subject: [PATCH 01/11] MIPS: lantiq: xway: mark dma_init() as static

 Fix the following missing-prototypes build warning:

@@ -10,6 +10,7 @@ arch/mips/lantiq/xway/dma.c:293:1: error: no previous prototype for 'dma_init' [
      | ^~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/xway/dma.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,7 +1,7 @@
-From 156977363d9ed39d80062044704932d8c11d1611 Mon Sep 17 00:00:00 2001
+From 50162a0c6e014c4954ee4443109b7a4251b377fc Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 20:31:33 +0800
-Subject: [PATCH 06/16] MIPS: pci: lantiq: marks pcibios_init() as static
+Date: Wed, 18 Jun 2025 22:53:19 +0800
+Subject: [PATCH 02/11] MIPS: pci: lantiq: marks pcibios_init() as static

 Fix the following missing-prototypes build warning:

@@ -10,6 +10,7 @@ arch/mips/pci/pci-lantiq.c:239:12: error: no previous prototype for 'pcibios_ini
      |            ^~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/pci/pci-lantiq.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,7 +1,7 @@
-From d27f9ab0f53886152b717e44eeca0217519ad323 Mon Sep 17 00:00:00 2001
+From c714186debb45fc88098b666d46cb29ff728e06d Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 18:18:26 +0800
-Subject: [PATCH 03/16] MIPS: lantiq: xway: mark dcdc_init() as static
+Date: Wed, 18 Jun 2025 22:53:16 +0800
+Subject: [PATCH 03/11] MIPS: lantiq: xway: mark dcdc_init() as static

 Fix the following missing-prototypes build warning:

@@ -10,6 +10,7 @@ arch/mips/lantiq/xway/dcdc.c:49:12: error: no previous prototype for 'dcdc_init'
      |            ^~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/xway/dcdc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,7 +1,7 @@
-From 9729233d2ef318cdb6954c8b5cb032d7d0f03473 Mon Sep 17 00:00:00 2001
+From d97394bf381eda85d04bec68b72dbc397744fcc3 Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 19:53:12 +0800
-Subject: [PATCH 04/16] MIPS: lantiq: irq: fix misc missing-prototypes warnings
+Date: Wed, 18 Jun 2025 22:53:17 +0800
+Subject: [PATCH 04/11] MIPS: lantiq: irq: fix misc missing-prototypes warnings

 Fix the following build warnings:

@@ -16,6 +16,7 @@ arch/mips/lantiq/irq.c:424:14: error: no previous prototype for 'get_c0_compare_
      |              ^~~~~~~~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/irq.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
@@ -1,7 +1,7 @@
-From 3004522ddba0a23941222d2044badd4436ce776f Mon Sep 17 00:00:00 2001
+From de521c6d99d755bbdfa0f1f35299a3e2b02b0dfe Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 18:08:35 +0800
-Subject: [PATCH 01/16] MIPS: lantiq: xway: mark ltq_ar9_sys_hz() as static
+Date: Wed, 18 Jun 2025 22:53:14 +0800
+Subject: [PATCH 05/11] MIPS: lantiq: xway: mark ltq_ar9_sys_hz() as static

 Fix the following missing-prototypes warning:

@@ -10,6 +10,7 @@ arch/mips/lantiq/xway/clk.c:77:15: error: no previous prototype for 'ltq_ar9_sys
      |               ^~~~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/xway/clk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,7 +1,7 @@
-From 2caf57c67c6c3228b7a2ff1510e7671539ad31d3 Mon Sep 17 00:00:00 2001
+From e23bd7f95a86c4fc5da5499a3bdc95aa7518f7eb Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Fri, 9 May 2025 22:29:34 +0800
-Subject: [PATCH 11/16] MIPS: lantiq: xway: gptu: mark gptu_init() as static
+Date: Wed, 18 Jun 2025 22:53:24 +0800
+Subject: [PATCH 06/11] MIPS: lantiq: xway: gptu: mark gptu_init() as static

 Fix the following missing-prototypes warning:

@@ -10,6 +10,7 @@ arch/mips/lantiq/xway/gptu.c:197:12: error: no previous prototype for 'gptu_init
      |            ^~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/xway/gptu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,7 +1,7 @@
-From 5759385fb2b1fafcb0073add3cf4dc7a918ac7f2 Mon Sep 17 00:00:00 2001
+From 3f8565be1e848de86c1cc98285ac27a4a9bcb161 Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 20:19:15 +0800
-Subject: [PATCH 05/16] MIPS: lantiq: xway: add prototype for
+Date: Wed, 18 Jun 2025 22:53:18 +0800
+Subject: [PATCH 07/11] MIPS: lantiq: xway: add prototype for
 ltq_get_cp1_base()

 ltq_get_cp1_base() is an exported function, we must define
@@ -12,6 +12,7 @@ arch/mips/lantiq/xway/vmmc.c:22:15: error: no previous prototype for 'ltq_get_cp
      |               ^~~~~~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 +++
 1 file changed, 3 insertions(+)
@@ -1,7 +1,7 @@
-From 6900665e987f7c76dff709d63be4df4171c02ab2 Mon Sep 17 00:00:00 2001
+From d97930fbf2d2aa00e7da9be7f128754920486953 Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Fri, 9 May 2025 20:15:36 +0800
-Subject: [PATCH 07/16] MIPS: lantiq: falcon: fix misc missing-prototypes
+Date: Wed, 18 Jun 2025 22:53:20 +0800
+Subject: [PATCH 08/11] MIPS: lantiq: falcon: fix misc missing-prototypes
 warnings

 Fix the following build warnings:
@@ -14,6 +14,7 @@ arch/mips/lantiq/falcon/prom.c:46:13: error: no previous prototype for 'ltq_soc_
      |             ^~~~~~~~~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/falcon/prom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -1,7 +1,7 @@
-From b145074ce653a895201bf8a2ba70719a107ad580 Mon Sep 17 00:00:00 2001
+From 01432b513638b0ffb080aa211b5b7f7ecf316f24 Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Fri, 9 May 2025 20:15:36 +0800
-Subject: [PATCH 08/16] MIPS: lantiq: falcon: sysctrl: remove unused
+Date: Wed, 18 Jun 2025 22:53:21 +0800
+Subject: [PATCH 09/11] MIPS: lantiq: falcon: sysctrl: remove unused
 falcon_trigger_hrst()

 This is a defined but unused function. Fix warning:
@@ -11,6 +11,7 @@ arch/mips/lantiq/falcon/sysctrl.c:75:6: error: no previous prototype for 'falcon
      |      ^~~~~~~~~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/falcon/sysctrl.c | 5 -----
 1 file changed, 5 deletions(-)
@@ -1,7 +1,7 @@
-From cc7803436c2419009aaf702d96fc1d717ca52279 Mon Sep 17 00:00:00 2001
+From 8a6156bd26240177e710fd8623bc2eb0ef0092cf Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Fri, 9 May 2025 20:15:36 +0800
-Subject: [PATCH 09/16] MIPS: lantiq: falcon: sysctrl: add missing header
+Date: Wed, 18 Jun 2025 22:53:22 +0800
+Subject: [PATCH 10/11] MIPS: lantiq: falcon: sysctrl: add missing header
 prom.h

 "prom.h" includes the prototype of ltq_soc_init(). Fix warning:
@@ -11,6 +11,7 @@ arch/mips/lantiq/falcon/sysctrl.c:185:13: error: no previous prototype for 'ltq_
      |             ^~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/falcon/sysctrl.c | 1 +
 1 file changed, 1 insertion(+)
@@ -1,7 +1,7 @@
-From ccdf5d58c4f3330a83393641d4e4334994fc91af Mon Sep 17 00:00:00 2001
+From 9c9a7ff9882fc6ba7d2f4050697e8bb80383e8dc Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Fri, 9 May 2025 20:53:58 +0800
-Subject: [PATCH 10/16] MIPS: lantiq: falcon: sysctrl: fix request memory check
+Date: Wed, 18 Jun 2025 22:53:23 +0800
+Subject: [PATCH 11/11] MIPS: lantiq: falcon: sysctrl: fix request memory check
 logic

 request_mem_region() will return NULL instead of error code
@@ -26,6 +26,7 @@ arch/mips/lantiq/falcon/sysctrl.c:225:50: error: ordered comparison of pointer w
      |

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
 ---
 arch/mips/lantiq/falcon/sysctrl.c | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
@@ -1,52 +0,0 @@
-From 6faade177216b41a8112e33c6e73377e78dd1f92 Mon Sep 17 00:00:00 2001
-From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 18:32:11 +0800
-Subject: [PATCH 12/16] MIPS: vpe-mt: mark vpe_free() and vpe_stop() as static
-
-These functions are only used in the current source file "vpe-mt.c".
-Do not export them and mark them as static to silence the missing
-prototypes warnings:
-
-arch/mips/kernel/vpe-mt.c:208:5: error: no previous prototype for 'vpe_stop' [-Werror=missing-prototypes]
-  208 | int vpe_stop(void *vpe)
-      |     ^~~~~~~~
-arch/mips/kernel/vpe-mt.c:229:5: error: no previous prototype for 'vpe_free' [-Werror=missing-prototypes]
-  229 | int vpe_free(void *vpe)
-      |     ^~~~~~~~
-
-Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
---
- arch/mips/kernel/vpe-mt.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
--- a/arch/mips/kernel/vpe-mt.c
-+++ b/arch/mips/kernel/vpe-mt.c
-@@ -202,7 +202,7 @@ int vpe_start(void *vpe, unsigned long s
- EXPORT_SYMBOL(vpe_start);
- 
- /* halt it for now */
-int vpe_stop(void *vpe)
-+static int vpe_stop(void *vpe)
- {
- 	struct vpe *v = vpe;
- 	struct tc *t;
-@@ -220,10 +220,9 @@ int vpe_stop(void *vpe)
- 
- 	return 0;
- }
-EXPORT_SYMBOL(vpe_stop);
- 
- /* I've done with it thank you */
-int vpe_free(void *vpe)
-+static int vpe_free(void *vpe)
- {
- 	struct vpe *v = vpe;
- 	struct tc *t;
-@@ -255,7 +254,6 @@ int vpe_free(void *vpe)
- 
- 	return 0;
- }
-EXPORT_SYMBOL(vpe_free);
- 
- static ssize_t store_kill(struct device *dev, struct device_attribute *attr,
- 			  const char *buf, size_t len)
@@ -0,0 +1,44 @@
+From 844615dd0f2d95c018ec66b943e08af22b62aff3 Mon Sep 17 00:00:00 2001
+From: Shiji Yang <yangshiji66@outlook.com>
+Date: Thu, 3 Jul 2025 21:06:32 +0800
+Subject: [PATCH] MIPS: vpe-mt: add missing prototypes for
+ vpe_{alloc,start,stop,free}
+
+These functions are exported but their prototypes are not defined.
+This patch adds the missing function prototypes to fix the following
+compilation warnings:
+
+arch/mips/kernel/vpe-mt.c:180:7: error: no previous prototype for 'vpe_alloc' [-Werror=missing-prototypes]
+  180 | void *vpe_alloc(void)
+      |       ^~~~~~~~~
+arch/mips/kernel/vpe-mt.c:198:5: error: no previous prototype for 'vpe_start' [-Werror=missing-prototypes]
+  198 | int vpe_start(void *vpe, unsigned long start)
+      |     ^~~~~~~~~
+arch/mips/kernel/vpe-mt.c:208:5: error: no previous prototype for 'vpe_stop' [-Werror=missing-prototypes]
+  208 | int vpe_stop(void *vpe)
+      |     ^~~~~~~~
+arch/mips/kernel/vpe-mt.c:229:5: error: no previous prototype for 'vpe_free' [-Werror=missing-prototypes]
+  229 | int vpe_free(void *vpe)
+      |     ^~~~~~~~
+
+Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+---
+ arch/mips/include/asm/vpe.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/arch/mips/include/asm/vpe.h
+++ b/arch/mips/include/asm/vpe.h
+@@ -119,4 +119,12 @@ void cleanup_tc(struct tc *tc);
+ 
+ int __init vpe_module_init(void);
+ void __exit vpe_module_exit(void);
+
+#ifdef CONFIG_MIPS_VPE_LOADER_MT
+void *vpe_alloc(void);
+int vpe_start(void *vpe, unsigned long start);
+int vpe_stop(void *vpe);
+int vpe_free(void *vpe);
+#endif /* CONFIG_MIPS_VPE_LOADER_MT */
+
+ #endif /* _ASM_VPE_H */
@@ -1,59 +0,0 @@
-From e6fab4c05f655b834587bc06f0274f69cdc43171 Mon Sep 17 00:00:00 2001
-From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 18:32:11 +0800
-Subject: [PATCH 13/16] MIPS: vpe-mt: drop unused functions vpe_alloc() and
- vpe_start()
-
-These two functions are defined but unused. Removing them to silence
-the missing prototypes warnings:
-
-arch/mips/kernel/vpe-mt.c:180:7: error: no previous prototype for 'vpe_alloc' [-Werror=missing-prototypes]
-  180 | void *vpe_alloc(void)
-      |       ^~~~~~~~~
-arch/mips/kernel/vpe-mt.c:198:5: error: no previous prototype for 'vpe_start' [-Werror=missing-prototypes]
-  198 | int vpe_start(void *vpe, unsigned long start)
-      |     ^~~~~~~~~
-
-Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
---
- arch/mips/kernel/vpe-mt.c | 29 -----------------------------
- 1 file changed, 29 deletions(-)
-
--- a/arch/mips/kernel/vpe-mt.c
-+++ b/arch/mips/kernel/vpe-mt.c
-@@ -172,35 +172,6 @@ void cleanup_tc(struct tc *tc)
- 	local_irq_restore(flags);
- }
- 
-/* module wrapper entry points */
-/* give me a vpe */
-void *vpe_alloc(void)
-{
-	int i;
-	struct vpe *v;
-
-	/* find a vpe */
-	for (i = 1; i < MAX_VPES; i++) {
-		v = get_vpe(i);
-		if (v != NULL) {
-			v->state = VPE_STATE_INUSE;
-			return v;
-		}
-	}
-	return NULL;
-}
-EXPORT_SYMBOL(vpe_alloc);
-
-/* start running from here */
-int vpe_start(void *vpe, unsigned long start)
-{
-	struct vpe *v = vpe;
-
-	v->__start = start;
-	return vpe_run(v);
-}
-EXPORT_SYMBOL(vpe_start);
-
- /* halt it for now */
- static int vpe_stop(void *vpe)
- {
@@ -1,34 +0,0 @@
-From 7d8878668dfe011f33b92a0f9aa3e0d46c1b77ca Mon Sep 17 00:00:00 2001
-From: Shiji Yang <yangshiji66@outlook.com>
-Date: Thu, 8 May 2025 20:36:56 +0800
-Subject: [PATCH 14/16] pinctrl: xway: mark xway_pinconf_group_set() as static
-
-Fix the following missing-prototypes build warning:
-
-drivers/pinctrl/pinctrl-xway.c:1231:5: error: no previous prototype for 'xway_pinconf_group_set' [-Werror=missing-prototypes]
- 1231 | int xway_pinconf_group_set(struct pinctrl_dev *pctldev,
-      |     ^~~~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
---
- drivers/pinctrl/pinctrl-xway.c | 9 +++++----
- 1 file changed, 5 insertions(+), 4 deletions(-)
-
--- a/drivers/pinctrl/pinctrl-xway.c
-+++ b/drivers/pinctrl/pinctrl-xway.c
-@@ -1228,10 +1228,11 @@ static int xway_pinconf_set(struct pinct
- 	return 0;
- }
- 
-int xway_pinconf_group_set(struct pinctrl_dev *pctldev,
-			unsigned selector,
-			unsigned long *configs,
-			unsigned num_configs)
-+static int
-+xway_pinconf_group_set(struct pinctrl_dev *pctldev,
-+		       unsigned selector,
-+		       unsigned long *configs,
-+		       unsigned num_configs)
- {
- 	struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctldev);
- 	int i, ret = 0;
@@ -0,0 +1,31 @@
+From e62acaef5d3b67648a7161b329ae8a5afce8c682 Mon Sep 17 00:00:00 2001
+From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+Date: Thu, 12 Jun 2025 15:15:16 +0200
+Subject: [PATCH] pinctrl: xway: statify xway_pinconf_group_set()
+
+This function is not exported and is only used locally. Make it static.
+
+Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
+Link: https://lore.kernel.org/20250612-gpiochip-set-rv-pinctrl-remaining-v1-7-556b0a530cd4@linaro.org
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+---
+ drivers/pinctrl/pinctrl-xway.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
+@@ -1228,10 +1228,10 @@ static int xway_pinconf_set(struct pinct
+ 	return 0;
+ }
+ 
+-int xway_pinconf_group_set(struct pinctrl_dev *pctldev,
+-			unsigned selector,
+-			unsigned long *configs,
+-			unsigned num_configs)
+static int xway_pinconf_group_set(struct pinctrl_dev *pctldev,
+				  unsigned int selector,
+				  unsigned long *configs,
+				  unsigned int num_configs)
+ {
+ 	struct ltq_pinmux_info *info = pinctrl_dev_get_drvdata(pctldev);
+ 	int i, ret = 0;
@@ -1,7 +1,7 @@
-From 9dec40b4f01a2aa92311b077ef45ecaa335d45a2 Mon Sep 17 00:00:00 2001
+From 4b443bbcd113cad6ec041a4f9f09179e2342ad60 Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Fri, 9 May 2025 20:16:49 +0800
-Subject: [PATCH 15/16] pinctrl: falcon: mark pinctrl_falcon_init() as static
+Date: Wed, 18 Jun 2025 22:53:28 +0800
+Subject: [PATCH] pinctrl: falcon: mark pinctrl_falcon_init() as static

 Fix the following missing-prototypes build warning:

@@ -10,6 +10,8 @@ drivers/pinctrl/pinctrl-falcon.c:508:12: error: no previous prototype for 'pinct
      |            ^~~~~~~~~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Link: https://lore.kernel.org/OSBPR01MB167014AF54EF9818CB98C83BBC72A@OSBPR01MB1670.jpnprd01.prod.outlook.com
+Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 ---
 drivers/pinctrl/pinctrl-falcon.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1,7 +1,7 @@
-From 28b20e002412bcadd4de74235faff275efb9e2cd Mon Sep 17 00:00:00 2001
+From 5fc2c383125c2b4b6037e02ad8796b776b25e6d0 Mon Sep 17 00:00:00 2001
 From: Shiji Yang <yangshiji66@outlook.com>
-Date: Fri, 9 May 2025 20:21:02 +0800
-Subject: [PATCH 16/16] spi: falcon: mark falcon_sflash_xfer() as static
+Date: Wed, 18 Jun 2025 22:53:29 +0800
+Subject: [PATCH] spi: falcon: mark falcon_sflash_xfer() as static

 Fix the following missing-prototypes build warning:

@@ -10,6 +10,8 @@ drivers/spi/spi-falcon.c:97:5: error: no previous prototype for 'falcon_sflash_x
      |     ^~~~~~~~~~~~~~~~~~

 Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
+Link: https://patch.msgid.link/OSBPR01MB16705BE87E549B6210CD6BCABC72A@OSBPR01MB1670.jpnprd01.prod.outlook.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
 ---
 drivers/spi/spi-falcon.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
@@ -51,11 +51,11 @@ Signed-off-by: Stefan Koch <stefan.koch10@gmail.com>
 #define read_vpe_c0_status()		mftc0($12, 0)
 --- a/arch/mips/include/asm/vpe.h
 +++ b/arch/mips/include/asm/vpe.h
-@@ -119,4 +119,13 @@ void cleanup_tc(struct tc *tc);
- 
- int __init vpe_module_init(void);
- void __exit vpe_module_exit(void);
-+
+@@ -126,5 +126,13 @@ int vpe_start(void *vpe, unsigned long s
+ int vpe_stop(void *vpe);
+ int vpe_free(void *vpe);
+ #endif /* CONFIG_MIPS_VPE_LOADER_MT */
+ 
 +/* For the explanation of the APIs please refer the section "MT APRP Kernel
 + * Programming" in AR9 SW Architecture Specification
 + */
@@ -63,11 +63,11 @@ Signed-off-by: Stefan Koch <stefan.koch10@gmail.com>
 +int32_t vpe1_sw_stop(uint32_t flags);
 +uint32_t vpe1_get_load_addr(uint32_t flags);
 +uint32_t vpe1_get_max_mem(uint32_t flags);
-+
+ 
 #endif /* _ASM_VPE_H */
 --- a/arch/mips/kernel/vpe-mt.c
 +++ b/arch/mips/kernel/vpe-mt.c
-@@ -383,6 +383,8 @@ int __init vpe_module_init(void)
+@@ -414,6 +414,8 @@ int __init vpe_module_init(void)
 			}
 
 			v->ntcs = hw_tcs - aprp_cpu_index();
@@ -76,7 +76,7 @@ Signed-off-by: Stefan Koch <stefan.koch10@gmail.com>
 
 			/* add the tc to the list of this vpe's tc's. */
 			list_add(&t->tc, &v->tc);
-@@ -486,3 +488,47 @@ void __exit vpe_module_exit(void)
+@@ -517,3 +519,47 @@ void __exit vpe_module_exit(void)
 			release_vpe(v);
 	}
 }