From: Rafał Miłecki <rafal@milecki.pl>
Date: Wed, 20 Jan 2021 20:13:08 +0000 (+0100)
Subject: bcm4908: use backported brcmstb soc stubs patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bc3dbd68c4ea8898d9f6b11984b80044a65d919f;p=openwrt%2Fstaging%2Fjow.git

bcm4908: use backported brcmstb soc stubs patch

Final version differs slightly - uses IS_ENABLED()

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---

diff --git a/target/linux/bcm4908/patches-5.4/082-v5.12-0003-soc-bcm-brcmstb-add-stubs-for-getting-platform-IDs.patch b/target/linux/bcm4908/patches-5.4/082-v5.12-0003-soc-bcm-brcmstb-add-stubs-for-getting-platform-IDs.patch
new file mode 100644
index 0000000000..aab65925b4
--- /dev/null
+++ b/target/linux/bcm4908/patches-5.4/082-v5.12-0003-soc-bcm-brcmstb-add-stubs-for-getting-platform-IDs.patch
@@ -0,0 +1,63 @@
+From 149ae80b1d50e7db5ac7df1cdf0820017b70e716 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Thu, 14 Jan 2021 11:53:18 +0100
+Subject: [PATCH] soc: bcm: brcmstb: add stubs for getting platform IDs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some brcmstb drivers may be shared with other SoC families. E.g. the
+same USB PHY block is shared by brcmstb and BCM4908.
+
+To avoid building brcmstb common code on non-brcmstb platforms we need
+stubs for:
+1. brcmstb_get_family_id()
+2. brcmstb_get_product_id()
+(to avoid "undefined reference to" errors).
+
+With this change PHY_BRCM_USB will not have to unconditionally select
+SOC_BRCMSTB anymore.
+
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
+---
+ include/linux/soc/brcmstb/brcmstb.h | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+--- a/include/linux/soc/brcmstb/brcmstb.h
++++ b/include/linux/soc/brcmstb/brcmstb.h
+@@ -2,6 +2,8 @@
+ #ifndef __BRCMSTB_SOC_H
+ #define __BRCMSTB_SOC_H
+ 
++#include <linux/kconfig.h>
++
+ static inline u32 BRCM_ID(u32 reg)
+ {
+ 	return reg >> 28 ? reg >> 16 : reg >> 8;
+@@ -12,6 +14,8 @@ static inline u32 BRCM_REV(u32 reg)
+ 	return reg & 0xff;
+ }
+ 
++#if IS_ENABLED(CONFIG_SOC_BRCMSTB)
++
+ /*
+  * Helper functions for getting family or product id from the
+  * SoC driver.
+@@ -19,4 +23,16 @@ static inline u32 BRCM_REV(u32 reg)
+ u32 brcmstb_get_family_id(void);
+ u32 brcmstb_get_product_id(void);
+ 
++#else
++static inline u32 brcmstb_get_family_id(void)
++{
++	return 0;
++}
++
++static inline u32 brcmstb_get_product_id(void)
++{
++	return 0;
++}
++#endif
++
+ #endif /* __BRCMSTB_SOC_H */
diff --git a/target/linux/bcm4908/patches-5.4/180-soc-brcmstb-add-stubs-for-getting-platform-IDs.patch b/target/linux/bcm4908/patches-5.4/180-soc-brcmstb-add-stubs-for-getting-platform-IDs.patch
deleted file mode 100644
index 366e6089c4..0000000000
--- a/target/linux/bcm4908/patches-5.4/180-soc-brcmstb-add-stubs-for-getting-platform-IDs.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c149974b2ae2e2296c66262a4ee797c06c39982b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
-Date: Thu, 14 Jan 2021 11:33:01 +0100
-Subject: [PATCH] soc: brcmstb: add stubs for getting platform IDs
-
-Some brcmstb drivers may be shared with other SoC families. E.g. the
-same USB PHY block is shared by brcmstb and BCM4908.
-
-To avoid building brcmstb common code on non-brcmstb platforms we need
-stubs for:
-1. brcmstb_get_family_id()
-2. brcmstb_get_product_id()
-(to avoid "undefined reference to" errors).
-
-With this change PHY_BRCM_USB will not have to unconditionally select
-SOC_BRCMSTB anymore.
----
- include/linux/soc/brcmstb/brcmstb.h | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
---- a/include/linux/soc/brcmstb/brcmstb.h
-+++ b/include/linux/soc/brcmstb/brcmstb.h
-@@ -12,6 +12,8 @@ static inline u32 BRCM_REV(u32 reg)
- 	return reg & 0xff;
- }
- 
-+#ifdef CONFIG_SOC_BRCMSTB
-+
- /*
-  * Helper functions for getting family or product id from the
-  * SoC driver.
-@@ -19,4 +21,18 @@ static inline u32 BRCM_REV(u32 reg)
- u32 brcmstb_get_family_id(void);
- u32 brcmstb_get_product_id(void);
- 
-+#else
-+
-+static inline u32 brcmstb_get_family_id(void)
-+{
-+	return 0;
-+}
-+
-+static inline u32 brcmstb_get_product_id(void)
-+{
-+	return 0;
-+}
-+
-+#endif
-+
- #endif /* __BRCMSTB_SOC_H */