sunxi: move SUNXI_GPIO to Kconfig

Probably for no particular reason SUNXI_GPIO was still defined the "old
way", in header files only.

Introduce SUNXI_GPIO to the Kconfig file in drivers/gpio to remove
another line from our dreadful config_whitelist.txt.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com> # Pine-H64
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 87541977259cfa7ffe741c915b48ab144543ad5c..60c4a07a32871b18774dda679579cc471c9f7c0f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -936,6 +936,7 @@ config ARCH_SUNXI
        select SPL_STACK_R if SPL
        select SPL_SYS_MALLOC_SIMPLE if SPL
        select SPL_SYS_THUMB_BUILD if !ARM64
+       select SUNXI_GPIO
        select SYS_NS16550
        select SYS_THUMB_BUILD if !ARM64
        select USB if DISTRO_DEFAULTS

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index fa1c99700f7383c9e1e4ed84f2e30c39d38bd2a8..4532ed3211008d95b8e836854500b74e47623746 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -215,6 +215,12 @@ config SANDBOX_GPIO_COUNT
          of 'anonymous' GPIOs that do not belong to any device or bank.
          Select a suitable value depending on your needs.
 
+config SUNXI_GPIO
+       bool "Allwinner GPIO driver"
+       depends on ARCH_SUNXI
+       help
+         Support the GPIO device in Allwinner SoCs.
+
 config XILINX_GPIO
        bool "Xilinx GPIO driver"
        depends on DM_GPIO

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index fceb812448f2d5d047333caa7a574c2d733c4136..7be94ee7d148ee7f295bb0beb9e3b2d79fd67646 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -257,9 +257,6 @@ extern int soft_i2c_gpio_scl;
 #endif
 #endif /* ifdef CONFIG_REQUIRE_SERIAL_CONSOLE */
 
-/* GPIO */
-#define CONFIG_SUNXI_GPIO
-
 #ifdef CONFIG_VIDEO_SUNXI
 /*
  * The amount of RAM to keep free at the top of RAM when relocating u-boot,

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2c9cfb450d09a5b1e7dd3e88be0d952c1a77ae5a..62bd882411e309a60228742903fd3384603c4c81 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1832,7 +1832,6 @@ CONFIG_STV0991
 CONFIG_STV0991_HZ
 CONFIG_STV0991_HZ_CLOCK
 CONFIG_ST_SMI
-CONFIG_SUNXI_GPIO
 CONFIG_SUNXI_MAX_FB_SIZE
 CONFIG_SUVD3
 CONFIG_SXNI855T