Message ID | 20210114105318.14970-1-zajec5@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [Broadcom/stblinux] soc: brcmstb: add stubs for getting platform IDs | expand |
On Thu, 14 Jan 2021 11:53:18 +0100, Rafał Miłecki <zajec5@gmail.com> wrote: > From: Rafał Miłecki <rafal@milecki.pl> > > 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> > --- Applied to drivers/next, thanks! -- Florian
On 1/20/2021 11:48 AM, Florian Fainelli wrote: > On Thu, 14 Jan 2021 11:53:18 +0100, Rafał Miłecki <zajec5@gmail.com> wrote: >> From: Rafał Miłecki <rafal@milecki.pl> >> >> 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> >> --- > > 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!
On 20.01.2021 20:58, Florian Fainelli wrote: > On 1/20/2021 11:48 AM, Florian Fainelli wrote: >> On Thu, 14 Jan 2021 11:53:18 +0100, Rafał Miłecki <zajec5@gmail.com> wrote: >>> From: Rafał Miłecki <rafal@milecki.pl> >>> >>> 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> >>> --- >> >> 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! Thank you!
diff --git a/include/linux/soc/brcmstb/brcmstb.h b/include/linux/soc/brcmstb/brcmstb.h index 8e884e0dda0a..9433f5c8fd94 100644 --- 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 */