From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 12 May 2023 09:21:56 +0000 (+0200)
Subject: linux/generic/hack-5.15: add missing patch header
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eac6fe2d70cacbddb736e814674dfa070faac0a8;p=openwrt%2Fstaging%2Fneocturne.git

linux/generic/hack-5.15: add missing patch header

This patch does not have a valid patch headers and does not apply on
an external git tree with 'git am'. To fix this add the missing header.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---

diff --git a/target/linux/generic/hack-5.15/810-bcma-ssb-fallback-sprom.patch b/target/linux/generic/hack-5.15/810-bcma-ssb-fallback-sprom.patch
index 2c8b418e59..c581a512cb 100644
--- a/target/linux/generic/hack-5.15/810-bcma-ssb-fallback-sprom.patch
+++ b/target/linux/generic/hack-5.15/810-bcma-ssb-fallback-sprom.patch
@@ -1,16 +1,21 @@
---- a/drivers/bcma/bcma_private.h
-+++ b/drivers/bcma/bcma_private.h
-@@ -38,6 +38,10 @@ int bcma_bus_resume(struct bcma_bus *bus
- void bcma_detect_chip(struct bcma_bus *bus);
- int bcma_bus_scan(struct bcma_bus *bus);
- 
-+/* fallback-sprom.c */
-+int __init bcma_fbs_register(void);
-+int bcma_get_fallback_sprom(struct bcma_bus *dev, struct ssb_sprom *out);
-+
- /* sprom.c */
- int bcma_sprom_get(struct bcma_bus *bus);
- 
+From e4d708702e6c98f2111e33201a264d6788564cb2 Mon Sep 17 00:00:00 2001
+From: OpenWrt community <openwrt-devel@lists.openwrt.org>
+Date: Fri, 12 May 2023 11:08:43 +0200
+Subject: [PATCH] ssb_sprom: add generic kernel support for Broadcom  Fallback SPROMs
+
+---
+ drivers/bcma/Kconfig        |  4 ++++
+ drivers/bcma/Makefile       |  1 +
+ drivers/bcma/bcma_private.h |  4 ++++
+ drivers/bcma/main.c         |  8 ++++++++
+ drivers/bcma/sprom.c        | 23 ++++++++++++++---------
+ drivers/ssb/Kconfig         |  5 +++++
+ drivers/ssb/Makefile        |  1 +
+ drivers/ssb/main.c          |  8 ++++++++
+ drivers/ssb/sprom.c         | 12 +++++++++++-
+ drivers/ssb/ssb_private.h   |  4 ++++
+ 10 files changed, 60 insertions(+), 10 deletions(-)
+
 --- a/drivers/bcma/Kconfig
 +++ b/drivers/bcma/Kconfig
 @@ -18,6 +18,10 @@ config BCMA_BLOCKIO
@@ -34,6 +39,36 @@
  bcma-$(CONFIG_BCMA_HOST_PCI)		+= host_pci.o
  bcma-$(CONFIG_BCMA_HOST_SOC)		+= host_soc.o
  obj-$(CONFIG_BCMA)			+= bcma.o
+--- a/drivers/bcma/bcma_private.h
++++ b/drivers/bcma/bcma_private.h
+@@ -38,6 +38,10 @@ int bcma_bus_resume(struct bcma_bus *bus
+ void bcma_detect_chip(struct bcma_bus *bus);
+ int bcma_bus_scan(struct bcma_bus *bus);
+ 
++/* fallback-sprom.c */
++int __init bcma_fbs_register(void);
++int bcma_get_fallback_sprom(struct bcma_bus *dev, struct ssb_sprom *out);
++
+ /* sprom.c */
+ int bcma_sprom_get(struct bcma_bus *bus);
+ 
+--- a/drivers/bcma/main.c
++++ b/drivers/bcma/main.c
+@@ -668,6 +668,14 @@ static int __init bcma_modinit(void)
+ {
+ 	int err;
+ 
++#ifdef CONFIG_BCMA_FALLBACK_SPROM
++	err = bcma_fbs_register();
++	if (err) {
++		pr_err("Fallback SPROM initialization failed\n");
++		err = 0;
++	}
++#endif /* CONFIG_BCMA_FALLBACK_SPROM */
++
+ 	err = bcma_init_bus_register();
+ 	if (err)
+ 		return err;
 --- a/drivers/bcma/sprom.c
 +++ b/drivers/bcma/sprom.c
 @@ -51,21 +51,26 @@ static int bcma_fill_sprom_with_fallback
@@ -96,6 +131,23 @@
  ssb-$(CONFIG_SSB_SPROM)			+= sprom.o
  
  # host support
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -1287,6 +1287,14 @@ static int __init ssb_modinit(void)
+ {
+ 	int err;
+ 
++#ifdef CONFIG_SSB_FALLBACK_SPROM
++	err = ssb_fbs_register();
++	if (err) {
++		pr_err("Fallback SPROM initialization failed\n");
++		err = 0;
++	}
++#endif /* CONFIG_SSB_FALLBACK_SPROM */
++
+ 	/* See the comment at the ssb_is_early_boot definition */
+ 	ssb_is_early_boot = 0;
+ 	err = bus_register(&ssb_bustype);
 --- a/drivers/ssb/sprom.c
 +++ b/drivers/ssb/sprom.c
 @@ -180,10 +180,20 @@ int ssb_arch_register_fallback_sprom(int
@@ -133,37 +185,3 @@
  /* sprom.c */
  extern
  ssize_t ssb_attr_sprom_show(struct ssb_bus *bus, char *buf,
---- a/drivers/bcma/main.c
-+++ b/drivers/bcma/main.c
-@@ -668,6 +668,14 @@ static int __init bcma_modinit(void)
- {
- 	int err;
- 
-+#ifdef CONFIG_BCMA_FALLBACK_SPROM
-+	err = bcma_fbs_register();
-+	if (err) {
-+		pr_err("Fallback SPROM initialization failed\n");
-+		err = 0;
-+	}
-+#endif /* CONFIG_BCMA_FALLBACK_SPROM */
-+
- 	err = bcma_init_bus_register();
- 	if (err)
- 		return err;
---- a/drivers/ssb/main.c
-+++ b/drivers/ssb/main.c
-@@ -1287,6 +1287,14 @@ static int __init ssb_modinit(void)
- {
- 	int err;
- 
-+#ifdef CONFIG_SSB_FALLBACK_SPROM
-+	err = ssb_fbs_register();
-+	if (err) {
-+		pr_err("Fallback SPROM initialization failed\n");
-+		err = 0;
-+	}
-+#endif /* CONFIG_SSB_FALLBACK_SPROM */
-+
- 	/* See the comment at the ssb_is_early_boot definition */
- 	ssb_is_early_boot = 0;
- 	err = bus_register(&ssb_bustype);