Skip to content

Commit 65462ba

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v5.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/defconfig
Renesas ARM defconfig updates for v5.19 - Enable support for the Renesas RZ/V2L SoC and the Maxim MAX96712 Quad GMSL2 Deserializer in the arm64 defconfig, - Refresh shmobile_defconfig for v5.18-rc1. * tag 'renesas-arm-defconfig-for-v5.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: shmobile: defconfig: Refresh for v5.18-rc1 arm64: defconfig: Enable Maxim MAX96712 Quad GMSL2 Deserializer support arm64: defconfig: Enable ARCH_R9A07G054 Link: https://lore.kernel.org/r/cover.1650638503.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 16a5b26 + dcc1449 commit 65462ba

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

arch/arm/configs/shmobile_defconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,9 @@ CONFIG_MEDIA_SUPPORT=y
119119
CONFIG_MEDIA_CAMERA_SUPPORT=y
120120
CONFIG_MEDIA_PLATFORM_SUPPORT=y
121121
CONFIG_V4L_PLATFORM_DRIVERS=y
122+
CONFIG_V4L_MEM2MEM_DRIVERS=y
122123
CONFIG_VIDEO_RENESAS_CEU=y
123124
CONFIG_VIDEO_RCAR_VIN=y
124-
CONFIG_V4L_MEM2MEM_DRIVERS=y
125125
CONFIG_VIDEO_RENESAS_FDP1=y
126126
CONFIG_VIDEO_RENESAS_JPU=y
127127
CONFIG_VIDEO_RENESAS_VSP1=y
@@ -224,5 +224,5 @@ CONFIG_NLS_ISO8859_1=y
224224
CONFIG_DMA_CMA=y
225225
CONFIG_CMA_SIZE_MBYTES=64
226226
CONFIG_PRINTK_TIME=y
227-
CONFIG_DEBUG_FS=y
228227
CONFIG_DEBUG_KERNEL=y
228+
CONFIG_DEBUG_FS=y

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@ CONFIG_STAGING=y
987987
CONFIG_STAGING_MEDIA=y
988988
CONFIG_VIDEO_HANTRO=m
989989
CONFIG_VIDEO_IMX_MEDIA=m
990+
CONFIG_VIDEO_MAX96712=m
990991
CONFIG_CHROME_PLATFORMS=y
991992
CONFIG_CROS_EC=y
992993
CONFIG_CROS_EC_I2C=y
@@ -1100,6 +1101,7 @@ CONFIG_ARCH_R8A774E1=y
11001101
CONFIG_ARCH_R8A774A1=y
11011102
CONFIG_ARCH_R8A774B1=y
11021103
CONFIG_ARCH_R9A07G044=y
1104+
CONFIG_ARCH_R9A07G054=y
11031105
CONFIG_ROCKCHIP_IODOMAIN=y
11041106
CONFIG_ROCKCHIP_PM_DOMAINS=y
11051107
CONFIG_ARCH_TEGRA_132_SOC=y

0 commit comments

Comments
 (0)