From d477a4a2fcbf59feb617de9502ae8b862e1578ed Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 25 Feb 2014 11:30:19 +0100 Subject: [PATCH 1/7] ARM: shmobile: multiplatform: Enable MSIOF in defconfig Signed-off-by: Geert Uytterhoeven Acked-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 83b07258a385..2a27d4622cc9 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -78,6 +78,7 @@ CONFIG_I2C_GPIO=y CONFIG_I2C_RCAR=y CONFIG_SPI=y CONFIG_SPI_RSPI=y +CONFIG_SPI_SH_MSIOF=y CONFIG_GPIO_EM=y CONFIG_GPIO_RCAR=y # CONFIG_HWMON is not set From c2e90c4b7c15fbb2215b47a23b446ba53e6dbf59 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 26 Mar 2014 14:16:19 +0900 Subject: [PATCH 2/7] ARM: shmobile: Include i2c-shmobile.c in shmobile_defconfig Many SoCs include I2C controller instances compatible with the i2c-shmobile.c driver. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Signed-off-by: Magnus Damm Acked-by: Wolfram Sang Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 2a27d4622cc9..d96133a686e5 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -75,6 +75,7 @@ CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=20 CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_I2C_GPIO=y +CONFIG_I2C_SH_MOBILE=y CONFIG_I2C_RCAR=y CONFIG_SPI=y CONFIG_SPI_RSPI=y From f5e1367f8f94293f098cab3e906934e535df1a94 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 26 Mar 2014 14:19:11 +0900 Subject: [PATCH 3/7] ARM: shmobile: Include at24.c in shmobile_defconfig The Koelsch board includes an at24-compatible EEPROM hooked up via I2C. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Signed-off-by: Magnus Damm Acked-by: Wolfram Sang Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index d96133a686e5..146ee70dd459 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -43,6 +43,7 @@ CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_MTD=y CONFIG_MTD_M25P80=y +CONFIG_EEPROM_AT24=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y CONFIG_SATA_RCAR=y From 41551f3d7d9a37b55a6f84d77200bfe29d42c466 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Fri, 28 Mar 2014 17:54:01 +0100 Subject: [PATCH 4/7] ARM: shmobile: Enable USBHS gadget support in shmobile_defconfig The renesas_usbhs driver provides USB gadget support for most Renesas platforms. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Signed-off-by: Ulrich Hecht Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 146ee70dd459..c10e626e8510 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -103,7 +103,11 @@ CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y CONFIG_SND_SOC_RCAR=y +CONFIG_USB=y CONFIG_USB_RCAR_GEN2_PHY=y +CONFIG_USB_RENESAS_USBHS=y +CONFIG_USB_GADGET=y +CONFIG_USB_RENESAS_USBHS_UDC=y CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y From 667d0f7b0e940bf36e8d12bd7d64aa0f9217b3ac Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Wed, 2 Apr 2014 18:06:24 +0900 Subject: [PATCH 5/7] ARM: shmobile: Enable HIGHMEM in shmobile_defconfig Many mach-shmobile hardware platforms include support for more than 1GiB of RAM. Enable HIGHMEM by default to allow use of larger amounts of memory. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index c10e626e8510..b73a0380bb03 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -25,6 +25,7 @@ CONFIG_SCHED_MC=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_NR_CPUS=8 CONFIG_AEABI=y +CONFIG_HIGHMEM=y CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y From e4224fe8bfd955d1aea5f89f2f3ac38dc4a590fc Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 8 Apr 2014 21:37:58 +0900 Subject: [PATCH 6/7] ARM: shmobile: Enable VSP1 in shmobile_defconfig Both r8a7790 and r8a7791 have multiple on-chip VSP1 devices, so enable the VSP1 driver by default in the shmobile_defconfig. Signed-off-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index b73a0380bb03..8fb30b09f960 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -92,10 +92,14 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_PLATFORM=y CONFIG_VIDEO_RCAR_VIN=y +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_RENESAS_VSP1=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set CONFIG_VIDEO_ADV7180=y CONFIG_DRM=y From 1d59eb190e3dc575c7bbee4a163c3facd0de2ed9 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 10 Apr 2014 16:12:45 +0900 Subject: [PATCH 7/7] ARM: shmobile: Enable USB [EO]HCI HCD support in shmobile_defconfig The USB [EO]HCI HCD drivers provide USB host support for Renesas R-Car Gen2 platforms. To increase hardware support enable the driver in the shmobile_defconfig multiplatform configuration. Acked-by: Magnus Damm Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 8fb30b09f960..6d6437cbbc52 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -110,6 +110,8 @@ 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_GADGET=y CONFIG_USB_RENESAS_USBHS_UDC=y