Commit e5a32979 authored Oct 27, 2020 by Arnd Bergmann

Merge tag 'imx-fixes-5.10-2' of...

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

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>

parents 91caef27 ccee91b5

arch/arm/configs/imx_v4_v5_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ CONFIG_SPI=y
		CONFIG_SPI_IMX=y
		CONFIG_SPI_SPIDEV=y
		CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_MXC=y
		CONFIG_W1=y
		CONFIG_W1_MASTER_MXC=y
		CONFIG_W1_SLAVE_THERM=y

arch/arm/configs/multi_v5_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -166,6 +166,7 @@ CONFIG_SPI_IMX=y
		CONFIG_SPI_ORION=y
		CONFIG_GPIO_ASPEED=m
		CONFIG_GPIO_ASPEED_SGPIO=y
		CONFIG_GPIO_MXC=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_GPIO=y
		CONFIG_POWER_RESET_QNAP=y

Admin message