Commit 40fa0489 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'amlogic-defconfig-for-v6.7' of...

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/2e08bd06-09e0-4352-8207-bc3b5d26fba4@linaro.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0c74ef26 a23bfeda
...@@ -423,6 +423,7 @@ CONFIG_MHI_WWAN_MBIM=m ...@@ -423,6 +423,7 @@ CONFIG_MHI_WWAN_MBIM=m
CONFIG_INPUT_EVDEV=y CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_ADC=m CONFIG_KEYBOARD_ADC=m
CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_GPIO=y
CONFIG_KEYBOARD_GPIO_POLLED=m
CONFIG_KEYBOARD_SNVS_PWRKEY=m CONFIG_KEYBOARD_SNVS_PWRKEY=m
CONFIG_KEYBOARD_IMX_SC_KEY=m CONFIG_KEYBOARD_IMX_SC_KEY=m
CONFIG_KEYBOARD_CROS_EC=y CONFIG_KEYBOARD_CROS_EC=y
...@@ -685,6 +686,7 @@ CONFIG_QCOM_SPMI_ADC_TM5=m ...@@ -685,6 +686,7 @@ CONFIG_QCOM_SPMI_ADC_TM5=m
CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_QCOM_SPMI_TEMP_ALARM=m
CONFIG_QCOM_LMH=m CONFIG_QCOM_LMH=m
CONFIG_UNIPHIER_THERMAL=y CONFIG_UNIPHIER_THERMAL=y
CONFIG_KHADAS_MCU_FAN_THERMAL=m
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_SL28CPLD_WATCHDOG=m CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_ARM_SP805_WATCHDOG=y CONFIG_ARM_SP805_WATCHDOG=y
...@@ -727,6 +729,7 @@ CONFIG_MFD_TPS65219=y ...@@ -727,6 +729,7 @@ CONFIG_MFD_TPS65219=y
CONFIG_MFD_TI_AM335X_TSCADC=m CONFIG_MFD_TI_AM335X_TSCADC=m
CONFIG_MFD_ROHM_BD718XX=y CONFIG_MFD_ROHM_BD718XX=y
CONFIG_MFD_WCD934X=m CONFIG_MFD_WCD934X=m
CONFIG_MFD_KHADAS_MCU=m
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_AXP20X=y CONFIG_REGULATOR_AXP20X=y
CONFIG_REGULATOR_BD718XX=y CONFIG_REGULATOR_BD718XX=y
...@@ -764,6 +767,8 @@ CONFIG_RC_DEVICES=y ...@@ -764,6 +767,8 @@ CONFIG_RC_DEVICES=y
CONFIG_IR_GPIO_CIR=m CONFIG_IR_GPIO_CIR=m
CONFIG_IR_MESON=m CONFIG_IR_MESON=m
CONFIG_IR_SUNXI=m CONFIG_IR_SUNXI=m
CONFIG_MEDIA_CEC_SUPPORT=y
CONFIG_CEC_MESON_G12A_AO=m
CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_SUPPORT=m
CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
...@@ -1111,6 +1116,7 @@ CONFIG_RTC_DRV_RK808=m ...@@ -1111,6 +1116,7 @@ CONFIG_RTC_DRV_RK808=m
CONFIG_RTC_DRV_ISL1208=m CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_PCF85063=m CONFIG_RTC_DRV_PCF85063=m
CONFIG_RTC_DRV_PCF85363=m CONFIG_RTC_DRV_PCF85363=m
CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_M41T80=m CONFIG_RTC_DRV_M41T80=m
CONFIG_RTC_DRV_BQ32K=m CONFIG_RTC_DRV_BQ32K=m
CONFIG_RTC_DRV_RX8581=m CONFIG_RTC_DRV_RX8581=m
...@@ -1166,6 +1172,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y ...@@ -1166,6 +1172,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=y
CONFIG_STAGING=y CONFIG_STAGING=y
CONFIG_STAGING_MEDIA=y CONFIG_STAGING_MEDIA=y
CONFIG_VIDEO_MAX96712=m CONFIG_VIDEO_MAX96712=m
CONFIG_VIDEO_MESON_VDEC=m
CONFIG_CHROME_PLATFORMS=y CONFIG_CHROME_PLATFORMS=y
CONFIG_CROS_EC=y CONFIG_CROS_EC=y
CONFIG_CROS_EC_I2C=y CONFIG_CROS_EC_I2C=y
...@@ -1460,6 +1467,7 @@ CONFIG_QCOM_L3_PMU=y ...@@ -1460,6 +1467,7 @@ CONFIG_QCOM_L3_PMU=y
CONFIG_ARM_SPE_PMU=m CONFIG_ARM_SPE_PMU=m
CONFIG_ARM_DMC620_PMU=m CONFIG_ARM_DMC620_PMU=m
CONFIG_HISI_PMU=y CONFIG_HISI_PMU=y
CONFIG_MESON_DDR_PMU=m
CONFIG_NVMEM_LAYOUT_SL28_VPD=m CONFIG_NVMEM_LAYOUT_SL28_VPD=m
CONFIG_NVMEM_IMX_OCOTP=y CONFIG_NVMEM_IMX_OCOTP=y
CONFIG_NVMEM_IMX_OCOTP_ELE=m CONFIG_NVMEM_IMX_OCOTP_ELE=m
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment