From bc3dbd68c4ea8898d9f6b11984b80044a65d919f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Wed, 20 Jan 2021 21:13:08 +0100 Subject: [PATCH] bcm4908: use backported brcmstb soc stubs patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Final version differs slightly - uses IS_ENABLED() Signed-off-by: Rafał Miłecki --- ...-add-stubs-for-getting-platform-IDs.patch} | 29 ++++++++++++++----- 1 file changed, 21 insertions(+), 8 deletions(-) rename target/linux/bcm4908/patches-5.4/{180-soc-brcmstb-add-stubs-for-getting-platform-IDs.patch => 082-v5.12-0003-soc-bcm-brcmstb-add-stubs-for-getting-platform-IDs.patch} (59%) 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/082-v5.12-0003-soc-bcm-brcmstb-add-stubs-for-getting-platform-IDs.patch similarity index 59% rename from target/linux/bcm4908/patches-5.4/180-soc-brcmstb-add-stubs-for-getting-platform-IDs.patch rename to target/linux/bcm4908/patches-5.4/082-v5.12-0003-soc-bcm-brcmstb-add-stubs-for-getting-platform-IDs.patch index 366e6089c4..aab65925b4 100644 --- a/target/linux/bcm4908/patches-5.4/180-soc-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 @@ -1,7 +1,10 @@ -From c149974b2ae2e2296c66262a4ee797c06c39982b Mon Sep 17 00:00:00 2001 +From 149ae80b1d50e7db5ac7df1cdf0820017b70e716 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= -Date: Thu, 14 Jan 2021 11:33:01 +0100 -Subject: [PATCH] soc: brcmstb: add stubs for getting platform IDs +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. @@ -14,27 +17,38 @@ stubs for: With this change PHY_BRCM_USB will not have to unconditionally select SOC_BRCMSTB anymore. + +Signed-off-by: Rafał Miłecki +Signed-off-by: Florian Fainelli --- 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) +@@ -2,6 +2,8 @@ + #ifndef __BRCMSTB_SOC_H + #define __BRCMSTB_SOC_H + ++#include ++ + 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; } -+#ifdef CONFIG_SOC_BRCMSTB ++#if IS_ENABLED(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) +@@ -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; @@ -44,7 +58,6 @@ SOC_BRCMSTB anymore. +{ + return 0; +} -+ +#endif + #endif /* __BRCMSTB_SOC_H */ -- 2.30.2