| From 61e6d754f609affaa934e69be6a43230c4dd576b Mon Sep 17 00:00:00 2001 |
| From: Simon Horman <horms@verge.net.au> |
| Date: Fri, 16 May 2014 09:04:13 +0900 |
| Subject: ARM: shmobile: marzen: Add to shmobile defconfig |
| |
| Add marzen to shmobile defconfig now that it supports multiplatform |
| Also enable SH_HSPI which is used by marzen. |
| |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit b2bfcdc2f28b045cf01f63d0949f7eb9bd597405) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/configs/shmobile_defconfig | 7 ++++++- |
| 1 file changed, 6 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig |
| index 6d6437cbbc52..8cde033b08a7 100644 |
| --- a/arch/arm/configs/shmobile_defconfig |
| +++ b/arch/arm/configs/shmobile_defconfig |
| @@ -10,10 +10,12 @@ CONFIG_PERF_EVENTS=y |
| CONFIG_SLAB=y |
| CONFIG_ARCH_SHMOBILE_MULTI=y |
| CONFIG_ARCH_EMEV2=y |
| +CONFIG_ARCH_R8A7779=y |
| CONFIG_ARCH_R8A7790=y |
| CONFIG_ARCH_R8A7791=y |
| CONFIG_MACH_KOELSCH=y |
| CONFIG_MACH_LAGER=y |
| +CONFIG_MACH_MARZEN=y |
| # CONFIG_SWP_EMULATE is not set |
| CONFIG_CPU_BPREDICT_DISABLE=y |
| CONFIG_PL310_ERRATA_588369=y |
| @@ -82,6 +84,7 @@ CONFIG_I2C_RCAR=y |
| CONFIG_SPI=y |
| CONFIG_SPI_RSPI=y |
| CONFIG_SPI_SH_MSIOF=y |
| +CONFIG_SPI_SH_HSPI=y |
| CONFIG_GPIO_EM=y |
| CONFIG_GPIO_RCAR=y |
| # CONFIG_HWMON is not set |
| @@ -109,12 +112,14 @@ CONFIG_SND=y |
| CONFIG_SND_SOC=y |
| CONFIG_SND_SOC_RCAR=y |
| CONFIG_USB=y |
| -CONFIG_USB_RCAR_GEN2_PHY=y |
| CONFIG_USB_EHCI_HCD=y |
| CONFIG_USB_OHCI_HCD=y |
| CONFIG_USB_RENESAS_USBHS=y |
| +CONFIG_USB_RCAR_PHY=y |
| +CONFIG_USB_RCAR_GEN2_PHY=y |
| CONFIG_USB_GADGET=y |
| CONFIG_USB_RENESAS_USBHS_UDC=y |
| +CONFIG_USB_ETH=y |
| CONFIG_MMC=y |
| CONFIG_MMC_SDHI=y |
| CONFIG_MMC_SH_MMCIF=y |
| -- |
| 2.1.2 |
| |
