aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sti
diff options
context:
space:
mode:
authorStephen Gallimore <stephen.gallimore@st.com>2013-11-18 05:34:32 -0500
committerSrinivas Kandagatla <srinivas.kandagatla@st.com>2014-03-11 06:53:32 -0400
commit8cd9bf18d7ffa4ffa2b8c0a5f095320026ae5d41 (patch)
tree57a62cec0896f2b86e10acfd739df5c5c224c62f /arch/arm/mach-sti
parente9de663517f50523bca5347d463546b27c242c1c (diff)
ARM: STi: Add reset controller support to mach-sti Kconfig
This patch selects reset controller support for ARCH_STI and selects the reset controllers for STiH415 and STiH416 SoCs. Signed-off-by: Stephen Gallimore <stephen.gallimore@st.com> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-sti')
-rw-r--r--arch/arm/mach-sti/Kconfig3
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
7 select PINCTRL 7 select PINCTRL
8 select PINCTRL_ST 8 select PINCTRL_ST
9 select MFD_SYSCON 9 select MFD_SYSCON
10 select ARCH_HAS_RESET_CONTROLLER
10 select MIGHT_HAVE_CACHE_L2X0 11 select MIGHT_HAVE_CACHE_L2X0
11 select HAVE_SMP 12 select HAVE_SMP
12 select HAVE_ARM_SCU if SMP 13 select HAVE_ARM_SCU if SMP
@@ -28,6 +29,7 @@ if ARCH_STI
28config SOC_STIH415 29config SOC_STIH415
29 bool "STiH415 STMicroelectronics Consumer Electronics family" 30 bool "STiH415 STMicroelectronics Consumer Electronics family"
30 default y 31 default y
32 select STIH415_RESET
31 help 33 help
32 This enables support for STMicroelectronics Digital Consumer 34 This enables support for STMicroelectronics Digital Consumer
33 Electronics family StiH415 parts, primarily targeted at set-top-box 35 Electronics family StiH415 parts, primarily targeted at set-top-box
@@ -37,6 +39,7 @@ config SOC_STIH415
37config SOC_STIH416 39config SOC_STIH416
38 bool "STiH416 STMicroelectronics Consumer Electronics family" 40 bool "STiH416 STMicroelectronics Consumer Electronics family"
39 default y 41 default y
42 select STIH416_RESET
40 help 43 help
41 This enables support for STMicroelectronics Digital Consumer 44 This enables support for STMicroelectronics Digital Consumer
42 Electronics family StiH416 parts, primarily targeted at set-top-box 45 Electronics family StiH416 parts, primarily targeted at set-top-box