Skip to content

Commit b104533

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v5.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/defconfig
Renesas ARM defconfig updates for v5.9 - Refresh shmobile_defconfig for v5.8-rc1 - Enable additional support for Renesas platforms to shmobile_defconfig, multi_v7_defconfig, and the arm64 defconfig. * tag 'renesas-arm-defconfig-for-v5.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: arm64: defconfig: Enable additional support for Renesas platforms ARM: multi_v7_defconfig: Enable additional support for Renesas platforms ARM: shmobile: defconfig: Enable RZ/A1H RTC support ARM: shmobile: defconfig: Enable ADV7612 CEC support ARM: shmobile: defconfig: Enable RZ/A1 CEU support ARM: shmobile: defconfig: Enable RZ/A watchdog support ARM: shmobile: defconfig: Enable CAT9554 support ARM: shmobile: defconfig: Enable DA9063 ONKEY support ARM: shmobile: defconfig: Refresh for v5.8-rc1 Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 4877846 + 1d21a0a commit b104533

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

arch/arm/configs/multi_v7_defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
314314
CONFIG_INPUT_MAX8997_HAPTIC=m
315315
CONFIG_INPUT_CPCAP_PWRBUTTON=m
316316
CONFIG_INPUT_AXP20X_PEK=m
317+
CONFIG_INPUT_DA9063_ONKEY=m
317318
CONFIG_INPUT_ADXL34X=m
318319
CONFIG_INPUT_STPMIC1_ONKEY=y
319320
CONFIG_SERIO_AMBAKMI=y
@@ -520,6 +521,7 @@ CONFIG_TEGRA_WATCHDOG=m
520521
CONFIG_MESON_WATCHDOG=y
521522
CONFIG_DIGICOLOR_WATCHDOG=y
522523
CONFIG_RENESAS_WDT=m
524+
CONFIG_RENESAS_RZAWDT=m
523525
CONFIG_STPMIC1_WATCHDOG=y
524526
CONFIG_BCM47XX_WDT=y
525527
CONFIG_BCM2835_WDT=y
@@ -618,6 +620,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
618620
CONFIG_VIDEO_MMP_CAMERA=m
619621
CONFIG_VIDEO_ASPEED=m
620622
CONFIG_VIDEO_STM32_DCMI=m
623+
CONFIG_VIDEO_RENESAS_CEU=m
621624
CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
622625
CONFIG_VIDEO_S5P_FIMC=m
623626
CONFIG_VIDEO_S5P_MIPI_CSIS=m
@@ -640,6 +643,8 @@ CONFIG_VIDEO_VIVID=m
640643
CONFIG_CEC_PLATFORM_DRIVERS=y
641644
CONFIG_CEC_SAMSUNG_S5P=m
642645
CONFIG_VIDEO_ADV7180=m
646+
CONFIG_VIDEO_ADV7604=m
647+
CONFIG_VIDEO_ADV7604_CEC=y
643648
CONFIG_VIDEO_ML86V7667=m
644649
CONFIG_IMX_IPUV3_CORE=m
645650
CONFIG_DRM=y
@@ -901,6 +906,7 @@ CONFIG_RTC_DRV_EFI=m
901906
CONFIG_RTC_DRV_DIGICOLOR=m
902907
CONFIG_RTC_DRV_S3C=m
903908
CONFIG_RTC_DRV_SA1100=m
909+
CONFIG_RTC_DRV_SH=m
904910
CONFIG_RTC_DRV_PL031=y
905911
CONFIG_RTC_DRV_AT91RM9200=m
906912
CONFIG_RTC_DRV_AT91SAM9=m

arch/arm/configs/shmobile_defconfig

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ CONFIG_SMP=y
1313
CONFIG_SCHED_MC=y
1414
CONFIG_NR_CPUS=8
1515
CONFIG_HIGHMEM=y
16-
CONFIG_ZBOOT_ROM_TEXT=0x0
17-
CONFIG_ZBOOT_ROM_BSS=0x0
1816
CONFIG_ARM_APPENDED_DTB=y
1917
CONFIG_KEXEC=y
2018
CONFIG_CPU_FREQ=y
@@ -67,6 +65,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
6765
CONFIG_TOUCHSCREEN_EDT_FT5X06=y
6866
CONFIG_TOUCHSCREEN_ST1232=y
6967
CONFIG_INPUT_MISC=y
68+
CONFIG_INPUT_DA9063_ONKEY=y
7069
CONFIG_INPUT_ADXL34X=y
7170
# CONFIG_LEGACY_PTYS is not set
7271
CONFIG_SERIAL_8250=y
@@ -90,6 +89,7 @@ CONFIG_PINCTRL_RZA1=y
9089
CONFIG_PINCTRL_RZA2=y
9190
CONFIG_GPIO_EM=y
9291
CONFIG_GPIO_RCAR=y
92+
CONFIG_GPIO_PCA953X=y
9393
CONFIG_GPIO_PCF857X=y
9494
CONFIG_POWER_RESET=y
9595
CONFIG_POWER_RESET_RMOBILE=y
@@ -101,6 +101,7 @@ CONFIG_RCAR_THERMAL=y
101101
CONFIG_WATCHDOG=y
102102
CONFIG_DA9063_WATCHDOG=y
103103
CONFIG_RENESAS_WDT=y
104+
CONFIG_RENESAS_RZAWDT=y
104105
CONFIG_MFD_AS3711=y
105106
CONFIG_MFD_DA9063=y
106107
CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -109,18 +110,19 @@ CONFIG_REGULATOR_DA9210=y
109110
CONFIG_REGULATOR_GPIO=y
110111
CONFIG_REGULATOR_MAX8973=y
111112
CONFIG_MEDIA_SUPPORT=y
113+
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
112114
CONFIG_MEDIA_CAMERA_SUPPORT=y
113-
CONFIG_MEDIA_CONTROLLER=y
114-
CONFIG_VIDEO_V4L2_SUBDEV_API=y
115+
CONFIG_MEDIA_PLATFORM_SUPPORT=y
115116
CONFIG_V4L_PLATFORM_DRIVERS=y
117+
CONFIG_VIDEO_RENESAS_CEU=y
116118
CONFIG_VIDEO_RCAR_VIN=y
117119
CONFIG_V4L_MEM2MEM_DRIVERS=y
118120
CONFIG_VIDEO_RENESAS_FDP1=y
119121
CONFIG_VIDEO_RENESAS_JPU=y
120122
CONFIG_VIDEO_RENESAS_VSP1=y
121-
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
122123
CONFIG_VIDEO_ADV7180=y
123124
CONFIG_VIDEO_ADV7604=y
125+
CONFIG_VIDEO_ADV7604_CEC=y
124126
CONFIG_VIDEO_ML86V7667=y
125127
CONFIG_DRM=y
126128
CONFIG_DRM_RCAR_DU=y
@@ -168,6 +170,7 @@ CONFIG_RTC_DRV_BQ32K=y
168170
CONFIG_RTC_DRV_S35390A=y
169171
CONFIG_RTC_DRV_RX8581=y
170172
CONFIG_RTC_DRV_DA9063=y
173+
CONFIG_RTC_DRV_SH=y
171174
CONFIG_DMADEVICES=y
172175
CONFIG_RCAR_DMAC=y
173176
CONFIG_RENESAS_USB_DMAC=y

arch/arm64/configs/defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -309,6 +309,7 @@ CONFIG_MLX5_CORE=m
309309
CONFIG_MLX5_CORE_EN=y
310310
CONFIG_QCOM_EMAC=m
311311
CONFIG_RMNET=m
312+
CONFIG_SH_ETH=y
312313
CONFIG_RAVB=y
313314
CONFIG_SMC91X=y
314315
CONFIG_SMSC911X=y
@@ -593,6 +594,8 @@ CONFIG_VIDEO_RENESAS_FCP=m
593594
CONFIG_VIDEO_RENESAS_VSP1=m
594595
CONFIG_SDR_PLATFORM_DRIVERS=y
595596
CONFIG_VIDEO_RCAR_DRIF=m
597+
CONFIG_VIDEO_IMX219=m
598+
CONFIG_VIDEO_OV5645=m
596599
CONFIG_VIDEO_QCOM_CAMSS=m
597600
CONFIG_DRM=m
598601
CONFIG_DRM_I2C_NXP_TDA998X=m
@@ -628,6 +631,7 @@ CONFIG_DRM_SII902X=m
628631
CONFIG_DRM_THINE_THC63LVD1024=m
629632
CONFIG_DRM_TI_SN65DSI86=m
630633
CONFIG_DRM_I2C_ADV7511=m
634+
CONFIG_DRM_I2C_ADV7511_AUDIO=y
631635
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
632636
CONFIG_DRM_DW_HDMI_CEC=m
633637
CONFIG_DRM_VC4=m

0 commit comments

Comments
 (0)