Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc5be0d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-defconfig-for-v3.19' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents f114040e ccde0fbd

arch/arm/configs/ape6evm_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/shmobile_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -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