sunxi: enable pinctrl driver in subtarget

The pinctrl driver should be enabled based on the SoC supported
by the subtarget, rather than enabling all by default.

Signed-off-by: Chukun Pan <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20140
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/sunxi/config-6.12 b/target/linux/sunxi/config-6.12
index a11b4848ec11e415d76d8f5bfc735f6210f973a7..7ff8f198b9630674458f49ff26058cdda86a18ba 100644 (file)
--- a/target/linux/sunxi/config-6.12
+++ b/target/linux/sunxi/config-6.12
@@ -365,9 +365,9 @@ CONFIG_PHY_SUN4I_USB=y
 # CONFIG_PHY_SUN6I_MIPI_DPHY is not set
 CONFIG_PHY_SUN9I_USB=y
 CONFIG_PINCTRL=y
-CONFIG_PINCTRL_AXP209=y
+# CONFIG_PINCTRL_AXP209 is not set
 # CONFIG_PINCTRL_SUN20I_D1 is not set
-CONFIG_PINCTRL_SUN4I_A10=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
 # CONFIG_PINCTRL_SUN50I_A100 is not set
 # CONFIG_PINCTRL_SUN50I_A100_R is not set
 # CONFIG_PINCTRL_SUN50I_A64 is not set
@@ -377,19 +377,19 @@ CONFIG_PINCTRL_SUN4I_A10=y
 # CONFIG_PINCTRL_SUN50I_H616 is not set
 # CONFIG_PINCTRL_SUN50I_H616_R is not set
 # CONFIG_PINCTRL_SUN50I_H6_R is not set
-CONFIG_PINCTRL_SUN5I=y
-CONFIG_PINCTRL_SUN6I_A31=y
-CONFIG_PINCTRL_SUN6I_A31_R=y
-CONFIG_PINCTRL_SUN8I_A23=y
-CONFIG_PINCTRL_SUN8I_A23_R=y
-CONFIG_PINCTRL_SUN8I_A33=y
-CONFIG_PINCTRL_SUN8I_A83T=y
-CONFIG_PINCTRL_SUN8I_A83T_R=y
-CONFIG_PINCTRL_SUN8I_H3=y
-CONFIG_PINCTRL_SUN8I_H3_R=y
-CONFIG_PINCTRL_SUN8I_V3S=y
-CONFIG_PINCTRL_SUN9I_A80=y
-CONFIG_PINCTRL_SUN9I_A80_R=y
+# CONFIG_PINCTRL_SUN5I is not set
+# CONFIG_PINCTRL_SUN6I_A31 is not set
+# CONFIG_PINCTRL_SUN6I_A31_R is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
+# CONFIG_PINCTRL_SUN8I_V3S is not set
+# CONFIG_PINCTRL_SUN9I_A80 is not set
+# CONFIG_PINCTRL_SUN9I_A80_R is not set
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_PM=y
 CONFIG_PM_CLK=y

diff --git a/target/linux/sunxi/cortexa7/config-6.12 b/target/linux/sunxi/cortexa7/config-6.12
index d17ea5505f9cc9bb849af06555be352bcb672fb0..789a4e6f1bd1776af039552432796c9a7c4b46cb 100644 (file)
--- a/target/linux/sunxi/cortexa7/config-6.12
+++ b/target/linux/sunxi/cortexa7/config-6.12
@@ -21,6 +21,20 @@ CONFIG_NET_DSA_TAG_BRCM_LEGACY=y
 CONFIG_NET_DSA_TAG_BRCM_LEGACY_FCS=y
 CONFIG_NET_DSA_TAG_BRCM_PREPEND=y
 CONFIG_NOP_USB_XCEIV=y
+CONFIG_PINCTRL_AXP209=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN6I_A31=y
+CONFIG_PINCTRL_SUN6I_A31_R=y
+CONFIG_PINCTRL_SUN8I_A23=y
+CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_A33=y
+CONFIG_PINCTRL_SUN8I_A83T=y
+CONFIG_PINCTRL_SUN8I_A83T_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
+CONFIG_PINCTRL_SUN8I_V3S=y
+CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_SUN20I_D1_CCU=y
 CONFIG_SUN20I_D1_R_CCU=y

diff --git a/target/linux/sunxi/cortexa8/config-6.12 b/target/linux/sunxi/cortexa8/config-6.12
index 274778dd09011f8dbd6a5aa65e3ce54b4c793845..dbf26947ab838ef881fac3c74c943d616eb34020 100644 (file)
--- a/target/linux/sunxi/cortexa8/config-6.12
+++ b/target/linux/sunxi/cortexa8/config-6.12
@@ -8,6 +8,9 @@ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 # CONFIG_MACH_SUN8I is not set
 # CONFIG_MACH_SUN9I is not set
 CONFIG_PGTABLE_LEVELS=2
+CONFIG_PINCTRL_AXP209=y
+CONFIG_PINCTRL_SUN4I_A10=y
+CONFIG_PINCTRL_SUN5I=y
 # CONFIG_PHY_SUN9I_USB is not set
 # CONFIG_SPI_SUN6I is not set
 # CONFIG_SUN8I_A83T_CCU is not set