diff options
| author | Olof Johansson <olof@lixom.net> | 2018-01-04 22:39:30 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-04 22:39:30 -0800 |
| commit | 33f0624c6a4d808d3a04beac40638375d789ed2e (patch) | |
| tree | c6fef707b19ad33c221c273e19dc1343d692163a /arch/arm/configs | |
| parent | 68198dca45691be91c171a119f78e4933472053b (diff) | |
| parent | 1943cbd3b39ee3310494d5b531a906e836bb9f7f (diff) | |
Merge tag 'renesas-defconfig-for-v4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Renesas ARM Based SoC Defconfig Updates for v4.16
shmobile_defconfig:
* Enable PWM timers, which are present on R-Car and RZ/G1 platforms,
as a built-in
* Enable SGTL5000 audio codec, which is present on the he iWave RZ/G1M Q7
carrier board, as a built-in
multi_v7_defconfig:
* Enable PWM timers, which are present on R-Car and RZ/G1 platforms,
as a module
* tag 'renesas-defconfig-for-v4.16' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: defconfig: Enable PWM
ARM: multi_v7_defconfig: Select PWM_RCAR as module
ARM: shmobile: defconfig: Enable SGTL5000 audio codec
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 833892568d31..1c948679a4ab 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -884,6 +884,7 @@ CONFIG_PWM_ATMEL=m CONFIG_PWM_ATMEL_HLCDC_PWM=m CONFIG_PWM_ATMEL_TCB=m CONFIG_PWM_FSL_FTM=m +CONFIG_PWM_RCAR=m CONFIG_PWM_RENESAS_TPU=y CONFIG_PWM_ROCKCHIP=m CONFIG_PWM_SAMSUNG=m diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 7b4fc0143148..578434cfd1a0 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -173,6 +173,7 @@ CONFIG_SND_SOC=y CONFIG_SND_SOC_SH4_FSI=y CONFIG_SND_SOC_RCAR=y CONFIG_SND_SOC_AK4642=y +CONFIG_SND_SOC_SGTL5000=y CONFIG_SND_SOC_WM8978=y CONFIG_SND_SIMPLE_SCU_CARD=y CONFIG_USB=y @@ -207,6 +208,7 @@ CONFIG_STAGING_BOARD=y CONFIG_IIO=y CONFIG_AK8975=y CONFIG_PWM=y +CONFIG_PWM_RCAR=y CONFIG_PWM_RENESAS_TPU=y CONFIG_GENERIC_PHY=y CONFIG_PHY_RCAR_GEN2=y |