diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:20:12 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 16:20:12 +0100 |
| commit | 9ad2a24f370159c350e9ec5dd3b91a1f3d76234e (patch) | |
| tree | b9dbbb5d9044a15357bccd614ff1268c4d6a12d1 /arch/arm | |
| parent | 4569f2b7be6f30f0edd2319d91ba718b8f26e232 (diff) | |
| parent | 8cd9bf18d7ffa4ffa2b8c0a5f095320026ae5d41 (diff) | |
| download | blackbird-op-linux-9ad2a24f370159c350e9ec5dd3b91a1f3d76234e.tar.gz blackbird-op-linux-9ad2a24f370159c350e9ec5dd3b91a1f3d76234e.zip | |
Merge tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti into next/drivers
Merge "STi Reset controller support" from Srinivas Kandagatla:
* tag 'sti-reset-for-v3.15' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: STi: Add reset controller support to mach-sti Kconfig
drivers: reset: stih416: add softreset controller
drivers: reset: stih415: add softreset controller
drivers: reset: Reset controller driver for STiH416
drivers: reset: Reset controller driver for STiH415
drivers: reset: STi SoC system configuration reset controller support
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-sti/Kconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig index d71654bc8d54..25506209e97a 100644 --- a/arch/arm/mach-sti/Kconfig +++ b/arch/arm/mach-sti/Kconfig @@ -7,6 +7,7 @@ menuconfig ARCH_STI select PINCTRL select PINCTRL_ST select MFD_SYSCON + select ARCH_HAS_RESET_CONTROLLER select MIGHT_HAVE_CACHE_L2X0 select HAVE_SMP select HAVE_ARM_SCU if SMP @@ -28,6 +29,7 @@ if ARCH_STI config SOC_STIH415 bool "STiH415 STMicroelectronics Consumer Electronics family" default y + select STIH415_RESET help This enables support for STMicroelectronics Digital Consumer Electronics family StiH415 parts, primarily targeted at set-top-box @@ -37,6 +39,7 @@ config SOC_STIH415 config SOC_STIH416 bool "STiH416 STMicroelectronics Consumer Electronics family" default y + select STIH416_RESET help This enables support for STMicroelectronics Digital Consumer Electronics family StiH416 parts, primarily targeted at set-top-box |
