Skip to content

Commit c6175cf

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v6.10 - Enable support for the Renesas RZ/G2L display unit, DA9062 PMIC, and RZ/V2H (R9A09G057) SoC in the ARM64 defconfig, - Refresh shmobile_defconfig for v6.9-rc1. * tag 'renesas-arm-defconfig-for-v6.10-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: shmobile: defconfig: Refresh for v6.9-rc1 arm64: defconfig: Enable R9A09G057 SoC arm64: defconfig: Enable Renesas DA9062 PMIC arm64: defconfig: Enable Renesas RZ/G2L display unit DRM driver Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6e0b0f8 + ec78ed2 commit c6175cf

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

arch/arm/configs/shmobile_defconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,8 +139,8 @@ CONFIG_DRM_FBDEV_EMULATION=y
139139
CONFIG_DRM_RCAR_DU=y
140140
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
141141
CONFIG_DRM_SHMOBILE=y
142-
CONFIG_DRM_PANEL_SIMPLE=y
143142
CONFIG_DRM_PANEL_EDP=y
143+
CONFIG_DRM_PANEL_SIMPLE=y
144144
CONFIG_DRM_DISPLAY_CONNECTOR=y
145145
CONFIG_DRM_LVDS_CODEC=y
146146
CONFIG_DRM_SII902X=y
@@ -235,3 +235,4 @@ CONFIG_CMA_SIZE_MBYTES=64
235235
CONFIG_PRINTK_TIME=y
236236
CONFIG_DEBUG_KERNEL=y
237237
CONFIG_DEBUG_FS=y
238+
CONFIG_ARM_DEBUG_WX=y

arch/arm64/configs/defconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,7 @@ CONFIG_INPUT_TPS65219_PWRBUTTON=m
446446
CONFIG_INPUT_PWM_BEEPER=m
447447
CONFIG_INPUT_PWM_VIBRA=m
448448
CONFIG_INPUT_RK805_PWRKEY=m
449+
CONFIG_INPUT_DA9063_ONKEY=m
449450
CONFIG_INPUT_HISI_POWERKEY=y
450451
# CONFIG_SERIO_SERPORT is not set
451452
CONFIG_SERIO_AMBAKMI=y
@@ -563,6 +564,7 @@ CONFIG_SPI_TEGRA114=m
563564
CONFIG_SPI_SPIDEV=m
564565
CONFIG_SPMI=y
565566
CONFIG_SPMI_MTK_PMIF=m
567+
CONFIG_PINCTRL_DA9062=m
566568
CONFIG_PINCTRL_MAX77620=y
567569
CONFIG_PINCTRL_RK805=m
568570
CONFIG_PINCTRL_SINGLE=y
@@ -728,6 +730,7 @@ CONFIG_MFD_ALTERA_SYSMGR=y
728730
CONFIG_MFD_BD9571MWV=y
729731
CONFIG_MFD_AXP20X_I2C=y
730732
CONFIG_MFD_AXP20X_RSB=y
733+
CONFIG_MFD_DA9062=m
731734
CONFIG_MFD_EXYNOS_LPASS=m
732735
CONFIG_MFD_HI6421_PMIC=y
733736
CONFIG_MFD_HI655X_PMIC=y
@@ -856,6 +859,7 @@ CONFIG_DRM_RCAR_DU=m
856859
CONFIG_DRM_RCAR_DW_HDMI=m
857860
CONFIG_DRM_RCAR_MIPI_DSI=m
858861
CONFIG_DRM_RZG2L_MIPI_DSI=m
862+
CONFIG_DRM_RZG2L_DU=m
859863
CONFIG_DRM_SUN4I=m
860864
CONFIG_DRM_SUN6I_DSI=m
861865
CONFIG_DRM_SUN8I_DW_HDMI=m
@@ -1176,6 +1180,7 @@ CONFIG_RTC_DRV_RV8803=m
11761180
CONFIG_RTC_DRV_S5M=y
11771181
CONFIG_RTC_DRV_DS3232=y
11781182
CONFIG_RTC_DRV_PCF2127=m
1183+
CONFIG_RTC_DRV_DA9063=m
11791184
CONFIG_RTC_DRV_EFI=y
11801185
CONFIG_RTC_DRV_CROS_EC=y
11811186
CONFIG_RTC_DRV_FSL_FTM_ALARM=m
@@ -1417,6 +1422,7 @@ CONFIG_ARCH_R9A07G044=y
14171422
CONFIG_ARCH_R9A07G054=y
14181423
CONFIG_ARCH_R9A08G045=y
14191424
CONFIG_ARCH_R9A09G011=y
1425+
CONFIG_ARCH_R9A09G057=y
14201426
CONFIG_ROCKCHIP_IODOMAIN=y
14211427
CONFIG_ARCH_TEGRA_132_SOC=y
14221428
CONFIG_ARCH_TEGRA_210_SOC=y

0 commit comments

Comments
 (0)