diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:15:31 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-12 01:15:31 +0100 |
| commit | ba7ce91e1a869b7fe9bef777a72270a19e97e7dc (patch) | |
| tree | 0d1617f636cf650f7ee73940889dfc5aad5f4d45 /arch/arm64 | |
| parent | 37c0fe6568dce9db064634ef3fb3d212507d9cba (diff) | |
| parent | 05a64b3b8b41bf3c3ca9b7f9f8a0e81ffadb20e3 (diff) | |
| download | op-kernel-dev-ba7ce91e1a869b7fe9bef777a72270a19e97e7dc.zip op-kernel-dev-ba7ce91e1a869b7fe9bef777a72270a19e97e7dc.tar.gz | |
Merge tag 'renesas-arm64-defconfig2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/config64
Merge "Second Round of Renesas ARM64 Based SoC Defconfig Updates for v4.5" from Simon Horman:
* Enable Renesas Sound, DMAC, I2C, EthernetAVB and GPIO for
R-Car Gen3 r8a7795/salvator-x
* tag 'renesas-arm64-defconfig2-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
arm64: defconfig: add Renesas sound and AK4613 support
arm64: defconfig: add Renesas R-Car DMAC driver support
arm64: defconfig: Enable Renesas R-Car I2C Controller
arm64: defconfig: enable EthernetAVB
arm64: defconfig: Enable GPIO of Renesas R-Car Gen3 SoC
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/configs/defconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index a260e3a..2b0a9dc 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -100,8 +100,10 @@ CONFIG_TUN=y CONFIG_VIRTIO_NET=y CONFIG_NET_XGENE=y CONFIG_SKY2=y +CONFIG_RAVB=y CONFIG_SMC91X=y CONFIG_SMSC911X=y +CONFIG_MICREL_PHY=y # CONFIG_WLAN is not set CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y @@ -130,11 +132,13 @@ CONFIG_VIRTIO_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_QUP=y +CONFIG_I2C_RCAR=y CONFIG_SPI=y CONFIG_SPI_PL022=y CONFIG_SPI_QUP=y CONFIG_PINCTRL_MSM8916=y CONFIG_GPIO_PL061=y +CONFIG_GPIO_RCAR=y CONFIG_GPIO_XGENE=y CONFIG_POWER_RESET_XGENE=y CONFIG_POWER_RESET_SYSCON=y @@ -148,6 +152,11 @@ CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_RCAR=y +CONFIG_SND_SOC_AK4613=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y @@ -175,6 +184,7 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_EFI=y CONFIG_RTC_DRV_XGENE=y CONFIG_DMADEVICES=y +CONFIG_RCAR_DMAC=y CONFIG_QCOM_BAM_DMA=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y |
