Convert CONFIG_AT91_GPIO to Kconfig

This converts the following to Kconfig:
   CONFIG_AT91_GPIO

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-at91/include/mach/at91rm9200.h b/arch/arm/mach-at91/include/mach/at91rm9200.h
index 3412df0f06c773ebe2a4d9de786fe8a8566f7d4b..309039347c84cbbefb606368eaf3a600ccadc66e 100644 (file)
--- a/arch/arm/mach-at91/include/mach/at91rm9200.h
+++ b/arch/arm/mach-at91/include/mach/at91rm9200.h
@@ -5,8 +5,6 @@
 #ifndef __AT91RM9200_H__
 #define __AT91RM9200_H__
 
-#define CONFIG_AT91_GPIO       /* and require always gpio features */
-
 /* Periperial Identifiers */
 
 #define ATMEL_ID_SYS   1       /* System Peripheral */

diff --git a/configs/at91rm9200ek_defconfig b/configs/at91rm9200ek_defconfig
index 0b025911d69c45d4b03efb42cdf57afdfd7bf8af..2aaf879045625366384975598baff87cdcfeec66 100644 (file)
--- a/configs/at91rm9200ek_defconfig
+++ b/configs/at91rm9200ek_defconfig
@@ -22,6 +22,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x10040000
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y

diff --git a/configs/at91rm9200ek_ram_defconfig b/configs/at91rm9200ek_ram_defconfig
index 09c996b8b225c134a0586b55c345cf37e0b96e66..9d2fc473430b579ef52cd4d257752606e2637193 100644 (file)
--- a/configs/at91rm9200ek_ram_defconfig
+++ b/configs/at91rm9200ek_ram_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_ENV_ADDR=0x10040000
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_FLASH_CFI_DRIVER=y

diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index 78e6c8d3456932d9812f4289bc1ac3b06129009c..1615d8af0eba7050bc87e0cc7c56ba85707e1681 100644 (file)
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -58,6 +58,7 @@ CONFIG_BLK=y
 CONFIG_HAVE_BLOCK_DEVICE=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y

diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 0eedaa93667a2ebd4a4126aeaade053be1711612..c6e5955bf32957c7e162a9eb6c28816e1a53e840 100644 (file)
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -48,6 +48,7 @@ CONFIG_BLK=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y

diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index 0d1a46315bd364b4bc3ffbaae8c8d3a0c2866154..a679c0f6700b8d880421fa2f4e7bd99b5a4b6712 100644 (file)
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -32,6 +32,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-gurnard"
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set

diff --git a/configs/picosam9g45_defconfig b/configs/picosam9g45_defconfig
index 0157f5172e1363e4a6de71bab040dad48b243faa..2921f2dfd4f7fdf97d431e6e6c6750a0ccb029d9 100644 (file)
--- a/configs/picosam9g45_defconfig
+++ b/configs/picosam9g45_defconfig
@@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_FAT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_DM=y
 CONFIG_SPL_DM=y
+CONFIG_AT91_GPIO=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y

diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 8f9a19f695ba4a1510f64c4bb10ff685e1ac4341..4545c7075b3faac2f4cca7996ce376f67402581f 100644 (file)
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -49,6 +49,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y

diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index c684e2b20a11e7b37460f9c1b0a5cc87d0aaac59..9e44395f03f011ea3dfae60bcc1b5f0b11e3fce7 100644 (file)
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -30,6 +30,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y

diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index 3ef091fab48f4eb47e3653454a8b6b8649364408..e1c5c2ef4c1fffd728fc9ada196e2b796fc5bc2e 100644 (file)
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_CMD_PCA953X=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y

diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index d9a2d61ecb605089bf7a9177f709dcf8892c2452..16a804b879f0a939e3ce2404fad5a8cf4bef7714 100644 (file)
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -66,6 +66,7 @@ CONFIG_BLK=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_DFU_NAND=y
+CONFIG_AT91_GPIO=y
 # CONFIG_MMC is not set
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y

diff --git a/configs/vinco_defconfig b/configs/vinco_defconfig
index 2684324cace6dbb2c21363f4a354bda42dbe527b..8ca7556772b8766fdaed44a5be260b2879b06672 100644 (file)
--- a/configs/vinco_defconfig
+++ b/configs/vinco_defconfig
@@ -31,6 +31,7 @@ CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="at91-vinco"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_SUPPORT_EMMC_BOOT=y
 CONFIG_SPI_FLASH=y
 CONFIG_SF_DEFAULT_MODE=0

diff --git a/configs/wb45n_defconfig b/configs/wb45n_defconfig
index 5728cfb45481ac2f75f24a8770ff2bbbc8eeedc8..d770e007a65559b0feb3b13aa7bc1c1dcbd3347a 100644 (file)
--- a/configs/wb45n_defconfig
+++ b/configs/wb45n_defconfig
@@ -33,6 +33,7 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set

diff --git a/configs/wb50n_defconfig b/configs/wb50n_defconfig
index 86a8549406bf2166f401d7f759b4324d57586cb4..e764c303d0697192b27ecbd91070a2233a6e18e2 100644 (file)
--- a/configs/wb50n_defconfig
+++ b/configs/wb50n_defconfig
@@ -33,6 +33,7 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_AT91_GPIO=y
 CONFIG_MTD=y
 CONFIG_MTD_RAW_NAND=y
 # CONFIG_SYS_NAND_USE_FLASH_BBT is not set

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index d87f6cc10517a7420e1a392e7563dfaa98b91f63..af608b7b0ef1a112d7adb2fb991d5d82a4932e8f 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -77,7 +77,6 @@ config DWAPB_GPIO
 
 config AT91_GPIO
        bool "AT91 PIO GPIO driver"
-       depends on DM_GPIO
        default n
        help
          Say yes here to select AT91 PIO GPIO driver. AT91 PIO

diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
index 624b05ad08ce0cef3c594afab6abd9a9572d1845..53629743d9d4308f8b66dada3f968f396107e531 100644 (file)
--- a/include/configs/at91-sama5_common.h
+++ b/include/configs/at91-sama5_common.h
@@ -19,11 +19,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
-/* general purpose I/O */
-#if !CONFIG_IS_ENABLED(DM_GPIO)
-#define CONFIG_AT91_GPIO
-#endif
-
 /*
  * BOOTP options
  */

diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index e9064a200d323d838e9d414b597b2fac642d1dce..1dc946d78990ae2bb2553ce1e70cb7bd61fe62fb 100644 (file)
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -36,7 +36,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY            /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP        1       /* keep pullups on peripheral pins */
 
 /* serial console */

diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h
index 2747c0cb9307a7d776ddb230642ac7f1eafdafa7..94d9111cbaae2a594fda43ffa3f32dc18dec6a5c 100644 (file)
--- a/include/configs/picosam9g45.h
+++ b/include/configs/picosam9g45.h
@@ -28,7 +28,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY            /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP        1       /* keep pullups on peripheral pins */
 
 /* serial console */

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index aacdd1263e7b545ebf7b9206e0b2417c3a07f3ee..8c964087131ddec7447492afc1650ebc1b06a264 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -85,7 +85,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY            /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO               /* enable the GPIO features */
 #define CONFIG_AT91_GPIO_PULLUP        1       /* keep pullups on peripheral pins */
 
 /* serial console */

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 35cd7f69c1d803e311e913d83c5c1218dd657b2b..32dd544a6c753a8713c1bfeee4503ca48a0b4b51 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -62,7 +62,6 @@
 
 /* GPIOs and IO expander */
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP                1
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR    0x28

diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h
index fcd35b715ce1275f335ee1836006bc9ec8b7f699..db4fd9be247f0243f19c9f21199e78a29373445f 100644 (file)
--- a/include/configs/snapper9g45.h
+++ b/include/configs/snapper9g45.h
@@ -60,7 +60,6 @@
 
 /* GPIOs and IO expander */
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP                1
 
 /* UARTs/Serial console */

diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index 9990c9340a3d0f5ae7e60f08f7a45a7583928208..b9b9292502e1a0831024ed1c43c6fe6e317a0370 100644 (file)
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -41,7 +41,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY            /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 #define CONFIG_AT91_GPIO_PULLUP        1       /* keep pullups on peripheral pins */
 
 #define CONFIG_USART_BASE              ATMEL_BASE_DBGU

diff --git a/include/configs/wb45n.h b/include/configs/wb45n.h
index d256ce8e4b9b03bb2fc3376ad199591fbdd73d9f..f13ad112f793f27761a90fc3fc64a15f2764fbeb 100644 (file)
--- a/include/configs/wb45n.h
+++ b/include/configs/wb45n.h
@@ -20,7 +20,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY    /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO
 
 /* serial console */
 #define CONFIG_ATMEL_USART

diff --git a/include/configs/wb50n.h b/include/configs/wb50n.h
index bb4deeac9b7dec1a37ced092d302ff8a24e09762..ffcc9877eddb985f104e410c0ddc29469fa9c3ff 100644 (file)
--- a/include/configs/wb50n.h
+++ b/include/configs/wb50n.h
@@ -20,9 +20,6 @@
 #define CONFIG_SKIP_LOWLEVEL_INIT
 #endif
 
-/* general purpose I/O */
-#define CONFIG_AT91_GPIO
-
 /* serial console */
 #define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE       ATMEL_BASE_DBGU