Skip to content

Commit 40fa048

Browse files
committed
Merge tag 'amlogic-defconfig-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/defconfig
Amlogic defconfig changes for v6.7: - add various drivers for Amlogic based boards - KEYBOARD_GPIO_POLLED=m used to support buttons on pre-G12A boards - KHADAS_MCU_FAN_THERMAL=m & MFD_KHADAS_MCU=m to control FAN over the MCU on Khadas VIM boards - MEDIA_CEC_SUPPORT=y & CEC_MESON_G12A_AO=m to enable the CEC bus - RTC_DRV_PCF8563=m to enable support for RTC on most SBC boards - VIDEO_MESON_VDEC=m to enable HW Video Decoder - MESON_DDR_PMU=m to enable DDR PMU perf driver on G12A & SM1 SoCs * tag 'amlogic-defconfig-for-v6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: defconfig: add various drivers for Amlogic based boards Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 0c74ef2 + a23bfed commit 40fa048

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ CONFIG_MHI_WWAN_MBIM=m
423423
CONFIG_INPUT_EVDEV=y
424424
CONFIG_KEYBOARD_ADC=m
425425
CONFIG_KEYBOARD_GPIO=y
426+
CONFIG_KEYBOARD_GPIO_POLLED=m
426427
CONFIG_KEYBOARD_SNVS_PWRKEY=m
427428
CONFIG_KEYBOARD_IMX_SC_KEY=m
428429
CONFIG_KEYBOARD_CROS_EC=y
@@ -685,6 +686,7 @@ CONFIG_QCOM_SPMI_ADC_TM5=m
685686
CONFIG_QCOM_SPMI_TEMP_ALARM=m
686687
CONFIG_QCOM_LMH=m
687688
CONFIG_UNIPHIER_THERMAL=y
689+
CONFIG_KHADAS_MCU_FAN_THERMAL=m
688690
CONFIG_WATCHDOG=y
689691
CONFIG_SL28CPLD_WATCHDOG=m
690692
CONFIG_ARM_SP805_WATCHDOG=y
@@ -727,6 +729,7 @@ CONFIG_MFD_TPS65219=y
727729
CONFIG_MFD_TI_AM335X_TSCADC=m
728730
CONFIG_MFD_ROHM_BD718XX=y
729731
CONFIG_MFD_WCD934X=m
732+
CONFIG_MFD_KHADAS_MCU=m
730733
CONFIG_REGULATOR_FIXED_VOLTAGE=y
731734
CONFIG_REGULATOR_AXP20X=y
732735
CONFIG_REGULATOR_BD718XX=y
@@ -764,6 +767,8 @@ CONFIG_RC_DEVICES=y
764767
CONFIG_IR_GPIO_CIR=m
765768
CONFIG_IR_MESON=m
766769
CONFIG_IR_SUNXI=m
770+
CONFIG_MEDIA_CEC_SUPPORT=y
771+
CONFIG_CEC_MESON_G12A_AO=m
767772
CONFIG_MEDIA_SUPPORT=m
768773
CONFIG_MEDIA_CAMERA_SUPPORT=y
769774
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
@@ -1111,6 +1116,7 @@ CONFIG_RTC_DRV_RK808=m
11111116
CONFIG_RTC_DRV_ISL1208=m
11121117
CONFIG_RTC_DRV_PCF85063=m
11131118
CONFIG_RTC_DRV_PCF85363=m
1119+
CONFIG_RTC_DRV_PCF8563=m
11141120
CONFIG_RTC_DRV_M41T80=m
11151121
CONFIG_RTC_DRV_BQ32K=m
11161122
CONFIG_RTC_DRV_RX8581=m
@@ -1166,6 +1172,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y
11661172
CONFIG_STAGING=y
11671173
CONFIG_STAGING_MEDIA=y
11681174
CONFIG_VIDEO_MAX96712=m
1175+
CONFIG_VIDEO_MESON_VDEC=m
11691176
CONFIG_CHROME_PLATFORMS=y
11701177
CONFIG_CROS_EC=y
11711178
CONFIG_CROS_EC_I2C=y
@@ -1460,6 +1467,7 @@ CONFIG_QCOM_L3_PMU=y
14601467
CONFIG_ARM_SPE_PMU=m
14611468
CONFIG_ARM_DMC620_PMU=m
14621469
CONFIG_HISI_PMU=y
1470+
CONFIG_MESON_DDR_PMU=m
14631471
CONFIG_NVMEM_LAYOUT_SL28_VPD=m
14641472
CONFIG_NVMEM_IMX_OCOTP=y
14651473
CONFIG_NVMEM_IMX_OCOTP_ELE=m

0 commit comments

Comments
 (0)