diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 10:51:06 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-11-21 10:51:07 +0100 |
| commit | 972d89438dc959358466df15e0dda80996ff658b (patch) | |
| tree | da22011144f2a22ab97f0d5614bba5e07059e6f7 /arch | |
| parent | Merge tag 'tegra-for-6.2-arm64-defconfig' of git://git.kernel.org/pub/scm/lin... (diff) | |
| parent | arm64: defconfig: Add Renesas 9-series PCIe clock generator (diff) | |
| download | linux-972d89438dc959358466df15e0dda80996ff658b.tar.xz linux-972d89438dc959358466df15e0dda80996ff658b.zip | |
Merge tag 'imx-defconfig-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig change for 6.2:
- Enable Renesas 9-series PCIe clock generator, SNVS LPGRP and i.MX8MP
interconnect driver support in arm64 defconfig.
- Enable Silergy SY7636A EPD PMIC, CYTTSP5 touchscreen and USB GPIO
extcon support in imx_v6_v7_defconfig.
* tag 'imx-defconfig-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: defconfig: Add Renesas 9-series PCIe clock generator
ARM: imx_v6_v7_defconfig: Enable the cyttsp5 touchscreen
ARM: imx_v6_v7_defconfig: Enable silergy,sy7636a
ARM: imx_v6_v7_defconfig: Enable USB GPIO extcon support
arm64: defconfig: enable i.mx 8m plus specific interconnect support
arm64: defconfig: enable snvs lpgpr support
Link: https://lore.kernel.org/r/20221119125733.32719-6-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 078d61b758a9..025eb333dcaa 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -166,6 +166,7 @@ CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_TOUCHSCREEN_AD7879=y CONFIG_TOUCHSCREEN_AD7879_I2C=y CONFIG_TOUCHSCREEN_ATMEL_MXT=y +CONFIG_TOUCHSCREEN_CYTTSP5=y CONFIG_TOUCHSCREEN_DA9052=y CONFIG_TOUCHSCREEN_EGALAX=y CONFIG_TOUCHSCREEN_GOODIX=y @@ -222,6 +223,7 @@ CONFIG_RN5T618_POWER=m CONFIG_SENSORS_MC13783_ADC=y CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_IIO_HWMON=y +CONFIG_SENSORS_SY7636A=y CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_CPU_THERMAL=y @@ -237,6 +239,7 @@ CONFIG_MFD_DA9062=y CONFIG_MFD_DA9063=y CONFIG_MFD_MC13XXX_SPI=y CONFIG_MFD_MC13XXX_I2C=y +CONFIG_MFD_SY7636A=y CONFIG_MFD_RN5T618=y CONFIG_MFD_STMPE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y @@ -250,6 +253,7 @@ CONFIG_REGULATOR_MC13783=y CONFIG_REGULATOR_MC13892=y CONFIG_REGULATOR_PFUZE100=y CONFIG_REGULATOR_RN5T618=y +CONFIG_REGULATOR_SY7636A=y CONFIG_RC_CORE=y CONFIG_RC_DEVICES=y CONFIG_IR_GPIO_CIR=y @@ -397,6 +401,7 @@ CONFIG_CLK_IMX8MN=y CONFIG_CLK_IMX8MP=y CONFIG_CLK_IMX8MQ=y CONFIG_SOC_IMX8M=y +CONFIG_EXTCON_USB_GPIO=y CONFIG_IIO=y CONFIG_MMA8452=y CONFIG_IMX7D_ADC=y diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index cc0f459c8fb9..87247f9a4d1d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1054,6 +1054,7 @@ CONFIG_COMMON_CLK_CS2000_CP=y CONFIG_COMMON_CLK_FSL_SAI=y CONFIG_COMMON_CLK_S2MPS11=y CONFIG_COMMON_CLK_PWM=y +CONFIG_COMMON_CLK_RS9_PCIE=y CONFIG_COMMON_CLK_VC5=y CONFIG_COMMON_CLK_NPCM8XX=y CONFIG_COMMON_CLK_BD718XX=m @@ -1276,6 +1277,7 @@ CONFIG_NVMEM_IMX_OCOTP_SCU=y CONFIG_NVMEM_MTK_EFUSE=y CONFIG_NVMEM_QCOM_QFPROM=y CONFIG_NVMEM_ROCKCHIP_EFUSE=y +CONFIG_NVMEM_SNVS_LPGPR=y CONFIG_NVMEM_SUNXI_SID=y CONFIG_NVMEM_UNIPHIER_EFUSE=y CONFIG_NVMEM_MESON_EFUSE=m @@ -1299,6 +1301,7 @@ CONFIG_INTERCONNECT_IMX=m CONFIG_INTERCONNECT_IMX8MM=m CONFIG_INTERCONNECT_IMX8MN=m CONFIG_INTERCONNECT_IMX8MQ=m +CONFIG_INTERCONNECT_IMX8MP=m CONFIG_INTERCONNECT_QCOM=y CONFIG_INTERCONNECT_QCOM_MSM8916=m CONFIG_INTERCONNECT_QCOM_MSM8996=m |