diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 18:57:04 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 18:57:04 -0500 |
| commit | b2e3c4319d40c9055c3c587cdb82ba69b50e919d (patch) | |
| tree | 223bc161e96a5d39752dc056fed8d412c291e72a /drivers/bus | |
| parent | c61c15e08abb4365f100e411604b57a03ee5ae90 (diff) | |
| parent | db27dd05b1da6e658494a2570680f8d0ddbc578c (diff) | |
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver updates from Arnd Bergmann:
"Driver updates for ARM SoCs.
A handful of driver changes this time around. The larger changes are:
- Reset drivers for hi3660 and zx2967
- AHCI driver for Davinci, acked by Tejun and brought in here due to
platform dependencies
- Cleanups of atmel-ebi (External Bus Interface)
- Tweaks for Rockchip GRF (General Register File) usage (kitchensink
misc register range on the SoCs)
- PM domains changes for support of two new ZTE SoCs (zx296718 and
zx2967)"
* tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (53 commits)
soc: samsung: pmu: Add register defines for pad retention control
reset: make zx2967 explicitly non-modular
reset: core: fix reset_control_put
soc: samsung: pm_domains: Read domain name from the new label property
soc: samsung: pm_domains: Remove message about failed memory allocation
soc: samsung: pm_domains: Remove unused name field
soc: samsung: pm_domains: Use full names in subdomains registration log
sata: ahci-da850: un-hardcode the MPY bits
sata: ahci-da850: add a workaround for controller instability
sata: ahci: export ahci_do_hardreset() locally
sata: ahci-da850: implement a workaround for the softreset quirk
sata: ahci-da850: add device tree match table
sata: ahci-da850: get the sata clock using a connection id
soc: samsung: pmu: Remove duplicated define for ARM_L2_OPTION register
memory: atmel-ebi: Enable the SMC clock if specified
soc: samsung: pmu: Remove unused and duplicated defines
memory: atmel-ebi: Properly handle multiple reference to the same CS
memory: atmel-ebi: Fix the test to enable generic SMC logic
soc: samsung: pm_domains: Add new Exynos5433 compatible
soc: samsung: pmu: Add dummy support for Exynos5433 SoC
...
Diffstat (limited to 'drivers/bus')
| -rw-r--r-- | drivers/bus/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index b9e8cfc93c7e..0a52da439abf 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig | |||
| @@ -112,6 +112,7 @@ config QCOM_EBI2 | |||
| 112 | bool "Qualcomm External Bus Interface 2 (EBI2)" | 112 | bool "Qualcomm External Bus Interface 2 (EBI2)" |
| 113 | depends on HAS_IOMEM | 113 | depends on HAS_IOMEM |
| 114 | depends on ARCH_QCOM || COMPILE_TEST | 114 | depends on ARCH_QCOM || COMPILE_TEST |
| 115 | default ARCH_QCOM | ||
| 115 | help | 116 | help |
| 116 | Say y here to enable support for the Qualcomm External Bus | 117 | Say y here to enable support for the Qualcomm External Bus |
| 117 | Interface 2, which can be used to connect things like NAND Flash, | 118 | Interface 2, which can be used to connect things like NAND Flash, |