Commit dff61e68 authored Oct 26, 2020 by Arnd Bergmann

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

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

i.MX fixes for 5.10:

With commit 12d16b39 ("gpio: mxc: Support module build") in place,
GPIO_MXC has no 'def_bool y' anymore, and needs to be enabled by
defconfig.  It updates the defconfig files to explicitly enable the
option for fixing boot failure on i.MX platform.

* tag 'imx-fixes-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: multi_v7_defconfig: Build in CONFIG_GPIO_MXC by default
  ARM: imx_v6_v7_defconfig: Build in CONFIG_GPIO_MXC by default
  arm64: defconfig: Build in CONFIG_GPIO_MXC by default

Link: https://lore.kernel.org/r/20201026135601.GA32675@dragon


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 926e9785 d6820bc6

arch/arm/configs/imx_v6_v7_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,7 @@ CONFIG_GPIO_PCA953X=y
		CONFIG_GPIO_PCF857X=y
		CONFIG_GPIO_STMPE=y
		CONFIG_GPIO_74X164=y
		CONFIG_GPIO_MXC=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_SYSCON=y
		CONFIG_POWER_RESET_SYSCON_POWEROFF=y

arch/arm/configs/multi_v7_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -465,6 +465,7 @@ CONFIG_GPIO_PALMAS=y
		CONFIG_GPIO_TPS6586X=y
		CONFIG_GPIO_TPS65910=y
		CONFIG_GPIO_TWL4030=y
		CONFIG_GPIO_MXC=y
		CONFIG_POWER_AVS=y
		CONFIG_ROCKCHIP_IODOMAIN=y
		CONFIG_POWER_RESET_AS3722=y

arch/arm64/configs/defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -500,6 +500,7 @@ CONFIG_GPIO_ALTERA=m
		CONFIG_GPIO_DWAPB=y
		CONFIG_GPIO_MB86S7X=y
		CONFIG_GPIO_MPC8XXX=y
		CONFIG_GPIO_MXC=y
		CONFIG_GPIO_PL061=y
		CONFIG_GPIO_RCAR=y
		CONFIG_GPIO_UNIPHIER=y

Admin message