diff options
| author | Olof Johansson <olof@lixom.net> | 2014-02-20 01:27:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-02-20 01:27:43 -0800 |
| commit | b392b489fe218337904beff00a776fb2bc77a0d6 (patch) | |
| tree | b7cf6b8757f8be566d94d13fbec8443ba022a3a9 /arch/arm/configs | |
| parent | ff280bceb554633429e28a80b70ba83d79c96071 (diff) | |
| parent | 8f33d31ee270f2a6bcc661815a520f76565674c3 (diff) | |
| download | op-kernel-dev-b392b489fe218337904beff00a776fb2bc77a0d6.zip op-kernel-dev-b392b489fe218337904beff00a776fb2bc77a0d6.tar.gz | |
Merge tag 'renesas-defconfig2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Second Round of Renesas ARM Based SoC Defconfig Updates for v3.15" from
Simon Horman:
* r7s72100 SoC (RZ/A1H) based Genmai board
- Enable RSPI
* r8a7790 (R-Car H2) based Koelsch board
- Enable I2C, RSPI and MTD_M25P80
* r8a7779 (R-Car H1) based Lager board
- Enable sound
* tag 'renesas-defconfig2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: genmai defconfig: Enable RSPI
ARM: shmobile: koelsch defconfig: Enable RSPI and MTD_M25P80
ARM: shmobile: lager: add sound support on defconfig
ARM: shmobile: koelsch: Enable I2C in defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/genmai_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/koelsch_defconfig | 6 | ||||
| -rw-r--r-- | arch/arm/configs/lager_defconfig | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/configs/genmai_defconfig b/arch/arm/configs/genmai_defconfig index c56a7ff..5ee6ac0 100644 --- a/arch/arm/configs/genmai_defconfig +++ b/arch/arm/configs/genmai_defconfig @@ -81,6 +81,8 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=10 CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C_SH_MOBILE=y +CONFIG_SPI=y +CONFIG_SPI_RSPI=y # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_RCAR_THERMAL=y diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig index 3015797..9561139 100644 --- a/arch/arm/configs/koelsch_defconfig +++ b/arch/arm/configs/koelsch_defconfig @@ -40,6 +40,8 @@ CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_BLK_DEV_SD=y CONFIG_ATA=y CONFIG_SATA_RCAR=y +CONFIG_MTD=y +CONFIG_MTD_M25P80=y CONFIG_NETDEVICES=y # CONFIG_NET_VENDOR_ARC is not set # CONFIG_NET_CADENCE is not set @@ -62,6 +64,10 @@ CONFIG_SH_ETH=y CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=20 CONFIG_SERIAL_SH_SCI_CONSOLE=y +CONFIG_I2C=y +CONFIG_I2C_RCAR=y +CONFIG_SPI=y +CONFIG_SPI_RSPI=y # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_RCAR_THERMAL=y diff --git a/arch/arm/configs/lager_defconfig b/arch/arm/configs/lager_defconfig index 3e7e0ae..b17f487 100644 --- a/arch/arm/configs/lager_defconfig +++ b/arch/arm/configs/lager_defconfig @@ -105,6 +105,10 @@ CONFIG_VIDEO_RCAR_VIN=y CONFIG_VIDEO_ADV7180=y CONFIG_DRM=y CONFIG_DRM_RCAR_DU=y +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_RCAR=y # CONFIG_USB_SUPPORT is not set CONFIG_MMC=y CONFIG_MMC_SDHI=y |
