diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-11-30 19:20:57 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-11-30 19:20:58 +0300 |
| commit | e9ab9c337beecd41f4cc98d536cd6299264d818f (patch) | |
| tree | db6ae66885960f31d2473de70228f7158dd2d1a9 /drivers/soc | |
| parent | c6241fd5de13f561ad147173f93f70a5f7058690 (diff) | |
| parent | b96c0546b5908268716ed9b1d39fc604413c630b (diff) | |
| download | linux-e9ab9c337beecd41f4cc98d536cd6299264d818f.tar.xz | |
Merge tag 'arm-soc/for-5.11/drivers' of https://github.com/Broadcom/stblinux into arm/drivers
This pull request contains Broadcom SoCs driver changes for 5.11, please
pull the following:
- Lee provides a missing function declaration spotted with W=1 builds
* tag 'arm-soc/for-5.11/drivers' of https://github.com/Broadcom/stblinux:
soc: bcm: brcmstb: pm: pm-arm: Provide prototype for brcmstb_pm_s3_finish()
Link: https://lore.kernel.org/r/20201128163410.1691529-5-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/bcm/brcmstb/pm/pm-arm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/soc/bcm/brcmstb/pm/pm-arm.c b/drivers/soc/bcm/brcmstb/pm/pm-arm.c index b1062334e608..a673fdffe216 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-arm.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-arm.c @@ -111,6 +111,8 @@ enum bsp_initiate_command { static struct brcmstb_pm_control ctrl; +noinline int brcmstb_pm_s3_finish(void); + static int (*brcmstb_pm_do_s2_sram)(void __iomem *aon_ctrl_base, void __iomem *ddr_phy_pll_status); |