From: Florian Fainelli Date: Fri, 3 Jan 2020 22:58:58 +0000 (-0800) Subject: sunxi: Turn on CONFIG_PINCTRL_SUN4I_A10 for A20 X-Git-Tag: v19.07.0~14 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3c110320398b0a19566b36f83643f33b40d4b5eb;p=oweals%2Fopenwrt.git sunxi: Turn on CONFIG_PINCTRL_SUN4I_A10 for A20 CONFIG_PINCTRL_SUN4I_A10 controls both the A10 and the A20 enablong of the pinctrl driver, this is necessary since upstream commit 5d8d349618a9464714c07414c5888bfd9416638f ("pinctrl: sunxi: add A20 support to A10 driver") which has been included in v4.13 and onwards. Fixes: ad2b3bf310f7 ("sunxi: Add support for kernel 4.14") Signed-off-by: Florian Fainelli (cherry picked from commit 32e4eaef1b4c2a7fa44787813fdf715b2ba500d9) --- diff --git a/target/linux/sunxi/cortexa7/config-4.14 b/target/linux/sunxi/cortexa7/config-4.14 index ee8873e081..f0b6a7a861 100644 --- a/target/linux/sunxi/cortexa7/config-4.14 +++ b/target/linux/sunxi/cortexa7/config-4.14 @@ -3,7 +3,7 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y # CONFIG_MACH_SUN4I is not set # CONFIG_MACH_SUN5I is not set # CONFIG_PINCTRL_GR8 is not set -# CONFIG_PINCTRL_SUN4I_A10 is not set +CONFIG_PINCTRL_SUN4I_A10=y # CONFIG_PINCTRL_SUN5I_A10S is not set # CONFIG_PINCTRL_SUN5I_A13 is not set CONFIG_MDIO_BUS_MUX=y