Commit c323061e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sti-soc-for-v4.7-1' of... 

Merge tag 'sti-soc-for-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/soc

Highlights:
-----------
 - Add CPUFreq and RProc drivers to STI maintainers file list
 - Improve STi's menuconfig help entry

* tag 'sti-soc-for-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti

:
  ARM: STi: Update platform level menuconfig 'help'
  MAINTAINERS: Add ST's Remote Processor Driver to ARM/STI ARCHITECTURE
  MAINTAINERS: Add ST's CPUFreq driver to the STI file list

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 49ad80df 33406c80

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1638,6 +1638,7 @@ F: arch/arm/boot/dts/sti* 
F:	drivers/char/hw_random/st-rng.c

F:	drivers/clocksource/arm_global_timer.c

F:	drivers/clocksource/clksrc_st_lpc.c

F:	drivers/cpufreq/sti-cpufreq.c

F:	drivers/i2c/busses/i2c-st.c

F:	drivers/media/rc/st_rc.c

F:	drivers/media/platform/sti/c8sectpfe/
@@ -1647,6 +1648,7 @@ F: drivers/phy/phy-miphy365x.c 
F:	drivers/phy/phy-stih407-usb.c

F:	drivers/phy/phy-stih41x-usb.c

F:	drivers/pinctrl/pinctrl-st.c

F:	drivers/remoteproc/st_remoteproc.c

F:	drivers/reset/sti/

F:	drivers/rtc/rtc-st-lpc.c

F:	drivers/tty/serial/st-asc.c

arch/arm/mach-sti/Kconfig

+4 −5
Original line number Diff line number Diff line
@@ -18,11 +18,10 @@ menuconfig ARCH_STI 
	select PL310_ERRATA_769419 if CACHE_L2X0

	select RESET_CONTROLLER

	help

	  Include support for STiH41x SOCs like STiH415/416 using the device tree

	  for discovery

	  More information at Documentation/arm/STiH41x and

	  at Documentation/devicetree



	  Include support for STMicroelectronics' STiH415/416, STiH407/10 and

	  STiH418 family SoCs using the Device Tree for discovery.  More

	  information can be found in Documentation/arm/sti/ and

	  Documentation/devicetree.



if ARCH_STI

CRA Git | Maintained and supported by SUSTech CRA and CCSE