summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/shmobile_defconfig
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2014-04-08 14:37:58 +0200
committerSimon Horman <horms+renesas@verge.net.au>2014-04-14 04:23:55 +0200
commite4224fe8bfd955d1aea5f89f2f3ac38dc4a590fc (patch)
tree31d6f208795c2ef839d2b0bbe9a00fe5624a1385 /arch/arm/configs/shmobile_defconfig
parentARM: shmobile: Enable HIGHMEM in shmobile_defconfig (diff)
downloadlinux-e4224fe8bfd955d1aea5f89f2f3ac38dc4a590fc.tar.xz
linux-e4224fe8bfd955d1aea5f89f2f3ac38dc4a590fc.zip
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 <damm@opensource.se> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/configs/shmobile_defconfig')
-rw-r--r--arch/arm/configs/shmobile_defconfig4
1 files changed, 4 insertions, 0 deletions
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