diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-27 14:22:59 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-27 14:22:59 +0200 |
| commit | 3888c381d88fc8d92c6d46b5a91ae77a5cb1c4cc (patch) | |
| tree | 3d356317809136a89d0b9df59c760da285752a02 /arch/arm/configs | |
| parent | f1d28f0b392628fbd263ad833469caeb052cb084 (diff) | |
| parent | 5ecd29ac5eaafbadaf80fc30c3b1a1ead8072294 (diff) | |
| download | op-kernel-dev-3888c381d88fc8d92c6d46b5a91ae77a5cb1c4cc.zip op-kernel-dev-3888c381d88fc8d92c6d46b5a91ae77a5cb1c4cc.tar.gz | |
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>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6d7b366..cc74ef8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 |
