Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ad2a24f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 4569f2b7 8cd9bf18

arch/arm/mach-sti/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -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

drivers/reset/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -11,3 +11,5 @@ menuconfig RESET_CONTROLLER 
	  via GPIOs or SoC-internal reset controller modules.



	  If unsure, say no.



source "drivers/reset/sti/Kconfig"

drivers/reset/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_RESET_CONTROLLER) += core.o

obj-$(CONFIG_ARCH_SUNXI) += reset-sunxi.o

obj-$(CONFIG_ARCH_STI) += sti/

drivers/reset/sti/Kconfig

0 → 100644
+15 −0
Original line number Diff line number Diff line 
if ARCH_STI



config STI_RESET_SYSCFG

	bool

	select RESET_CONTROLLER



config STIH415_RESET

	bool

	select STI_RESET_SYSCFG



config STIH416_RESET

	bool

	select STI_RESET_SYSCFG



endif

drivers/reset/sti/Makefile

0 → 100644
+4 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_STI_RESET_SYSCFG) += reset-syscfg.o



obj-$(CONFIG_STIH415_RESET) += reset-stih415.o

obj-$(CONFIG_STIH416_RESET) += reset-stih416.o