Merge tag 'imx-fixes-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

i.MX fixes for 5.10, 2nd round:

A couple of more defconfig fixes to enable CONFIG_GPIO_MXC option for
i.MX ARMv4/v5 devices.

* tag 'imx-fixes-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: multi_v5_defconfig: Select CONFIG_GPIO_MXC
ARM: imx_v4_v5_defconfig: Select CONFIG_GPIO_MXC

Link: https://lore.kernel.org/r/20201026235230.GL9880@dragon
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Arnd Bergmann 5 years ago e5a32979 91caef27

2 changed files

expand all

arch

arm

configs

imx_v4_v5_defconfig

multi_v5_defconfig

arch/arm/configs/imx_v4_v5_defconfig

··· 93 93 CONFIG_SPI_IMX=y 94 94 CONFIG_SPI_SPIDEV=y 95 95 CONFIG_GPIO_SYSFS=y 96 + CONFIG_GPIO_MXC=y 96 97 CONFIG_W1=y 97 98 CONFIG_W1_MASTER_MXC=y 98 99 CONFIG_W1_SLAVE_THERM=y

arch/arm/configs/multi_v5_defconfig

··· 166 166 CONFIG_SPI_ORION=y 167 167 CONFIG_GPIO_ASPEED=m 168 168 CONFIG_GPIO_ASPEED_SGPIO=y 169 + CONFIG_GPIO_MXC=y 169 170 CONFIG_POWER_RESET=y 170 171 CONFIG_POWER_RESET_GPIO=y 171 172 CONFIG_POWER_RESET_QNAP=y