Commit 3888c381 authored Jul 27, 2015 by Olof Johansson

Merge tag 'sti-defconfig-for-v4.3-1' of...

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

STi defconfig for v4.3, round 1

Highlights:
-----------
 - Enable support ST's PWM driver in multi_v7
 - Enable support PWM regulator in multi_v7

* tag 'sti-defconfig-for-v4.3-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti

:
  ARM: multi_v7_defconfig: Enable support for PWM Regulators
  ARM: multi_v7_defconfig: Enable ST's PWM driver

Signed-off-by: Olof Johansson <olof@lixom.net>

parents f1d28f0b 5ecd29ac

arch/arm/configs/multi_v7_defconfig

+2 −0

Original line number	Diff line number	Diff line
		@@ -405,6 +405,7 @@ CONFIG_REGULATOR_MAX8973=y
		CONFIG_REGULATOR_MAX77686=y
		CONFIG_REGULATOR_MAX77693=m
		CONFIG_REGULATOR_PALMAS=y
		CONFIG_REGULATOR_PWM=m
		CONFIG_REGULATOR_S2MPS11=y
		CONFIG_REGULATOR_S5M8767=y
		CONFIG_REGULATOR_TPS51632=y
		@@ -627,6 +628,7 @@ CONFIG_PWM_SAMSUNG=m
		CONFIG_PWM_TEGRA=y
		CONFIG_PWM_VT8500=y
		CONFIG_PHY_HIX5HD2_SATA=y
		CONFIG_PWM_STI=m
		CONFIG_OMAP_USB2=y
		CONFIG_TI_PIPE3=y
		CONFIG_PHY_MIPHY28LP=y