diff options
| author | Olof Johansson <olof@lixom.net> | 2016-04-13 22:43:50 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-04-13 22:43:50 (GMT) |
| commit | 7d7bca889f99c4401931e536adb0da1b6c6f48c5 (patch) | |
| tree | 8d77f0088a56969453362f2f1184b781f6cbe390 /arch/arm | |
| parent | b6ac00bb9fa4f979f40030e8218a3dd03f9260b7 (diff) | |
| parent | 6d54fb8a08a7b9ac06bbf4d7c41e6818d22e392f (diff) | |
| download | linux-7d7bca889f99c4401931e536adb0da1b6c6f48c5.tar.xz | |
Merge tag 'sti-defconfig-for-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti into next/defconfig
Highlights:
-----------
- Enable ST's HW Random number generator in multi_v7 defconfig
- Enable PWM regulator support in multi_v7 defconfig
- Enable ST's Power and Reset driver in multi_v7 defconfig
- Enable ST's PWM in multi_v7 defconfig
* tag 'sti-defconfig-for-v4.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/sti:
ARM: multi_v7_defconfig: Enable ST's HW Random Number Generator
ARM: multi_v7_defconfig: Enable support for PWM Regulators
ARM: multi_v7_defconfig: Enable ST's Power Reset driver
ARM: multi_v7_defconfig: Enable ST's PWM driver
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 0c43f42..5f71b6c 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -412,6 +412,7 @@ CONFIG_POWER_RESET_GPIO=y CONFIG_POWER_RESET_GPIO_RESTART=y CONFIG_POWER_RESET_KEYSTONE=y CONFIG_POWER_RESET_RMOBILE=y +CONFIG_POWER_RESET_ST=y CONFIG_POWER_AVS=y CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_SENSORS_IIO_HWMON=y @@ -490,7 +491,7 @@ CONFIG_REGULATOR_MAX77693=m CONFIG_REGULATOR_MAX77802=m CONFIG_REGULATOR_PALMAS=y CONFIG_REGULATOR_PBIAS=y -CONFIG_REGULATOR_PWM=m +CONFIG_REGULATOR_PWM=y CONFIG_REGULATOR_QCOM_RPM=y CONFIG_REGULATOR_QCOM_SMD_RPM=y CONFIG_REGULATOR_S2MPS11=y @@ -789,7 +790,7 @@ CONFIG_PWM_SUN4I=y CONFIG_PWM_TEGRA=y CONFIG_PWM_VT8500=y CONFIG_PHY_HIX5HD2_SATA=y -CONFIG_PWM_STI=m +CONFIG_PWM_STI=y CONFIG_PWM_BCM2835=y CONFIG_OMAP_USB2=y CONFIG_TI_PIPE3=y @@ -835,6 +836,8 @@ CONFIG_LOCKUP_DETECTOR=y CONFIG_CRYPTO_DEV_TEGRA_AES=y CONFIG_CPUFREQ_DT=y CONFIG_KEYSTONE_IRQ=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_ST=y CONFIG_CRYPTO_DEV_SUN4I_SS=m CONFIG_CRYPTO_DEV_ROCKCHIP=m CONFIG_ARM_CRYPTO=y |