summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-11-19 22:22:25 +0100
committerArnd Bergmann <arnd@arndb.de>2014-11-19 22:22:25 +0100
commitbdc5be0d00f1c6c1f43b65849e2152a9a39410c5 (patch)
treee46bdbd99eb95f7dca194e1dc3d2e388b2df0a93 /arch/arm/configs
parentf114040e3ea6e07372334ade75d1ee0775c355e1 (diff)
parentccde0fbd4fe88151c8d3a93a3e3a939a0a1753b2 (diff)
downloadlinux-bdc5be0d00f1c6c1f43b65849e2152a9a39410c5.tar.gz
linux-bdc5be0d00f1c6c1f43b65849e2152a9a39410c5.tar.bz2
linux-bdc5be0d00f1c6c1f43b65849e2152a9a39410c5.zip
Merge tag 'renesas-defconfig-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/defconfig
Pull "Renesas ARM Based SoC Defconfig Updates for v3.19" from Simon Horman: * Enable AK4642, Audo DMAC peri peri and R-Car DMAC in shmobile defconrig * Enable PM Runtime in ape6evm defconfig * tag 'renesas-defconfig-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: multiplatform: add AK4642 support on defconfig ARM: shmobile: multiplatform: add Audo DMAC peri peri support on defconfig ARM: shmobile: multiplatform: add R-Car DMAC support on defconfig ARM: shmobile: ape6evm: Enable PM Runtime in defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/ape6evm_defconfig1
-rw-r--r--arch/arm/configs/shmobile_defconfig3
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
index b54b28fc5a70..db81d8ce4c03 100644
--- a/arch/arm/configs/ape6evm_defconfig
+++ b/arch/arm/configs/ape6evm_defconfig
@@ -33,6 +33,7 @@ CONFIG_ARM_APPENDED_DTB=y
CONFIG_VFP=y
CONFIG_NEON=y
CONFIG_BINFMT_MISC=y
+CONFIG_PM_RUNTIME=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index d7346ad51043..cc67508a439a 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -126,6 +126,7 @@ CONFIG_SND=y
CONFIG_SND_SOC=y
CONFIG_SND_SOC_SH4_FSI=y
CONFIG_SND_SOC_RCAR=y
+CONFIG_SND_SOC_AK4642=y
CONFIG_SND_SOC_WM8978=y
CONFIG_USB=y
CONFIG_USB_EHCI_HCD=y
@@ -146,6 +147,8 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S35390A=y
CONFIG_DMADEVICES=y
CONFIG_SH_DMAE=y
+CONFIG_RCAR_AUDMAC_PP=y
+CONFIG_RCAR_DMAC=y
# CONFIG_IOMMU_SUPPORT is not set
CONFIG_PWM=y
CONFIG_PWM_RENESAS_TPU=y