diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-03-25 17:05:30 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-03-25 17:05:30 +0100 |
| commit | 0cee41d4d0fe781c1acc8db48871f1a759b1f8b9 (patch) | |
| tree | e1f657563425290f183681edfcdb05266a6b871f /arch/arm64 | |
| parent | 274a8ddcbcc412c5b2651d54b1c189dbf38fd9be (diff) | |
| parent | 4823a031f096d6d5fd16fccd8a3dd51b05a6becf (diff) | |
| download | linux-0cee41d4d0fe781c1acc8db48871f1a759b1f8b9.tar.bz2 | |
Merge tag 'arm-soc/for-5.1/soc-fixes' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains Broadcom ARM/ARM64-based SoCs fixes for 5.1,
please pull the following:
- Eric provides fixes for the bcm2835-pm driver: added missing depends
on MFD_CORE for the ARM64 definition of ARCH_BCM2835, fixing error
paths on initialization and fixing the PM_IMAGE_PERI power domain
* tag 'arm-soc/for-5.1/soc-fixes' of https://github.com/Broadcom/stblinux:
arm64: bcm2835: Add missing dependency on MFD_CORE.
soc: bcm: bcm2835-pm: Fix error paths of initialization.
soc: bcm: bcm2835-pm: Fix PM_IMAGE_PERI power domain support.
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 70498a033cf5..b5ca9c50876d 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -27,6 +27,7 @@ config ARCH_BCM2835 bool "Broadcom BCM2835 family" select TIMER_OF select GPIOLIB + select MFD_CORE select PINCTRL select PINCTRL_BCM2835 select ARM_AMBA |