diff options
| author | Olof Johansson <olof@lixom.net> | 2019-06-27 04:11:32 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-27 04:11:32 +0200 |
| commit | 01453179b8c1b85b473ecb9ecc2fba3e92d0f8b5 (patch) | |
| tree | 78e817d3032680aa1a95a5accfb8e2956bba66f2 /arch/arm | |
| parent | ARM: configs: multi_v5: Remove duplicate ASPEED options (diff) | |
| parent | arm64: defconfig: Enable CONFIG_KEYBOARD_SNVS_PWRKEY as module (diff) | |
| download | linux-01453179b8c1b85b473ecb9ecc2fba3e92d0f8b5.tar.xz linux-01453179b8c1b85b473ecb9ecc2fba3e92d0f8b5.zip | |
Merge tag 'imx-defconfig-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/defconfig
i.MX defconfig changes for 5.3:
* imx_v6_v7_defconfig:
- PCF857X GPIO expander
- SIOX bus driver
- thermal statistics
- TPM PWM driver
- OV2680 camera driver
- SNVS LPGPR NVMEM driver
- i.MX DT based cpufreq driver
* arm64 defconfig built-in:
- i.MX8MM pinctrl and clock
- i.MX LPI2C driver
- ROHM_BD718XX PMIC
- OCOTP NVMEM support
- i.MX SCU based SoC bus driver
* arm64 defconfig modules:
- i.MX SPI driver
- i.MX system controller watchdog
- SNVS RTC driver
- ISL29018 light and proximity sensor driver
- MPL3115 pressure sensor driver
- i.MX8 DT based cpufreq support
- QorIQ Thermal Monitoring Unit driver
- SNVS power key driver
* tag 'imx-defconfig-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
arm64: defconfig: Enable CONFIG_KEYBOARD_SNVS_PWRKEY as module
ARM: imx_v6_v7_defconfig: Enable CONFIG_ARM_IMX_CPUFREQ_DT
defconfig: arm64: enable i.MX8 SCU octop driver
arm64: defconfig: Add i.MX SCU SoC info driver
arm64: defconfig: Enable CONFIG_QORIQ_THERMAL
ARM: imx_v6_v7_defconfig: Select CONFIG_NVMEM_SNVS_LPGPR
arm64: defconfig: ARM_IMX_CPUFREQ_DT=m
ARM: imx_v6_v7_defconfig: Add TPM PWM support by default
ARM: imx_v6_v7_defconfig: Enable the OV2680 camera driver
ARM: imx_v6_v7_defconfig: Enable CONFIG_THERMAL_STATISTICS
arm64: defconfig: NVMEM_IMX_OCOTP=y for imx8m
arm64: defconfig: Enable ROHM_BD718XX PMIC for imx8mm-evk
arm64: defconfig: Enable lpi2c for imx8qxp and sensors
arm64: defconfig: Enable imx8mm clk/pinctrl
arm64: defconfig: Enable RTC_DRV_SNVS
arm64: defconfig: add support for i.MX system controller watchdog
ARM: imx_v6_v7_defconfig: Enable SIOX bus
ARM: imx_v6_v7_defconfig: Add GPIO_PCF857X
arm64: defconfig: Enable CONFIG_SPI_IMX
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 8116648a8efd..a53b29251ed4 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -57,6 +57,7 @@ CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y CONFIG_CPUFREQ_DT=y CONFIG_ARM_IMX6Q_CPUFREQ=y +CONFIG_ARM_IMX_CPUFREQ_DT=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y CONFIG_VFP=y @@ -211,9 +212,11 @@ CONFIG_SPI_GPIO=y CONFIG_SPI_IMX=y CONFIG_SPI_FSL_DSPI=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_SIOX=m CONFIG_GPIO_MAX732X=y CONFIG_GPIO_MC9S08DZ60=y CONFIG_GPIO_PCA953X=y +CONFIG_GPIO_PCF857X=y CONFIG_GPIO_STMPE=y CONFIG_GPIO_74X164=y CONFIG_POWER_RESET=y @@ -223,6 +226,7 @@ CONFIG_POWER_SUPPLY=y CONFIG_SENSORS_MC13783_ADC=y CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_IIO_HWMON=y +CONFIG_THERMAL_STATISTICS=y CONFIG_THERMAL_WRITABLE_TRIPS=y CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y @@ -266,6 +270,7 @@ CONFIG_VIDEO_CODA=m CONFIG_VIDEO_IMX_PXP=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set CONFIG_VIDEO_ADV7180=m +CONFIG_VIDEO_OV2680=m CONFIG_VIDEO_OV5640=m CONFIG_IMX_IPUV3_CORE=y CONFIG_DRM=y @@ -399,11 +404,15 @@ CONFIG_MPL3115=y CONFIG_PWM=y CONFIG_PWM_FSL_FTM=y CONFIG_PWM_IMX27=y +CONFIG_PWM_IMX_TPM=y CONFIG_NVMEM_IMX_OCOTP=y CONFIG_NVMEM_VF610_OCOTP=y +CONFIG_NVMEM_SNVS_LPGPR=y CONFIG_TEE=y CONFIG_OPTEE=y CONFIG_MUX_MMIO=y +CONFIG_SIOX=m +CONFIG_SIOX_BUS_GPIO=m CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y |