Skip to contentSkip to conversation

soc: brcmstb: add stubs for getting platform IDs

PATCH Applied Rafał Miłecki 3 participants 4 messages Jan 14, 2021 – Jan 20, 2021 Broadcom BCM7XXX Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 soc: brcmstb: add stubs for getting platform IDs

From: Rafał Miłecki <[email protected]>

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(+)
include/linux/soc/brcmstb/brcmstb.h +16 -0
index 8e884e0dda0a..9433f5c8fd94 100644
@@ -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 */
Signature · 1 line
2.26.2
#1 lore raw
Quoted 11 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

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).

Quoted 5 lines

With this change PHY_BRCM_USB will not have to unconditionally select SOC_BRCMSTB anymore.

---

Applied to drivers/next, thanks!
--
Florian

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#2 lore raw
Quoted 12 lines · Florian Fainelli
Quoted 11 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

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).

Quoted 7 lines
Quoted 5 lines

With this change PHY_BRCM_USB will not have to unconditionally select SOC_BRCMSTB anymore.

---

Applied to drivers/next, thanks!

Made some tweaks to the patch:

- subject is prefixed with: soc: bcm: brcmstb to match previous patches
- used IS_ENABLED() instead of #ifdef because this may have to be a loadable module in the future (because of GKI)

Thanks!

Signature · 1 line
Florian
#3 lore raw
Quoted 21 lines · Florian Fainelli
Quoted 12 lines · Florian Fainelli
Quoted 11 lines · Rafał Miłecki

From: Rafał Miłecki <[email protected]>

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).

Quoted 7 lines
Quoted 5 lines

With this change PHY_BRCM_USB will not have to unconditionally select SOC_BRCMSTB anymore.

---

Applied to drivers/next, thanks!

Quoted 7 lines

Made some tweaks to the patch:

- subject is prefixed with: soc: bcm: brcmstb to match previous patches
- used IS_ENABLED() instead of #ifdef because this may have to be a loadable module in the future (because of GKI)

Thanks!

Thank you!

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel