Convert CONFIG_AT91_GPIO_PULLUP to Kconfig

This converts the following to Kconfig:
   CONFIG_AT91_GPIO_PULLUP

Cc: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e99b9064e519cfa675513c48dff41e6d4d527ec0..79fe87ca58e0219325f17a0ef3466b2366cbc068 100644 (file)
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -311,6 +311,10 @@ config AT91_EFLASH
          Enable the driver for the embedded flash used in the Atmel
          AT91SAM9XE devices.
 
+config AT91_GPIO_PULLUP
+       bool "Keep pullups on peripheral pins"
+       depends on CPU_ARM926EJS
+
 source "board/atmel/at91sam9260ek/Kconfig"
 source "board/atmel/at91sam9261ek/Kconfig"
 source "board/atmel/at91sam9263ek/Kconfig"

diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index e27f0b71ed9044b33c0bc19a0fd81348e2f44ffa..b6b4104d243fd3e21c43a099b07440b25f02f778 100644 (file)
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -12,6 +12,7 @@ CONFIG_SYS_TEXT_BASE=0x21000000
 CONFIG_SYS_MALLOC_LEN=0x460000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_TAURUS=y
+CONFIG_AT91_GPIO_PULLUP=y
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 0d7352cc4e45404f19cea53e6cd60afe4b339ab6..57cc21764a64387e8eab22c8ac91518aa784eb59 100644 (file)
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_TEXT_BASE=0x72000000
 CONFIG_SYS_MALLOC_LEN=0x460000
 CONFIG_SYS_MALLOC_F_LEN=0x800
 CONFIG_TARGET_CORVUS=y
+CONFIG_AT91_GPIO_PULLUP=y
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

diff --git a/configs/gurnard_defconfig b/configs/gurnard_defconfig
index c44714f4a38f50c96312e0438278f5c4e6a1d356..28ed4ae837dbb0d3c19402ce79a9bbdf95762291 100644 (file)
--- a/configs/gurnard_defconfig
+++ b/configs/gurnard_defconfig
@@ -4,6 +4,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_SYS_TEXT_BASE=0x73f00000
 CONFIG_SYS_MALLOC_LEN=0x100000
 CONFIG_TARGET_GURNARD=y
+CONFIG_AT91_GPIO_PULLUP=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_OFFSET=0x80000

diff --git a/configs/smartweb_defconfig b/configs/smartweb_defconfig
index 64a77b0ddaeb9dcef032accb271f867c73082deb..f39d08371644009fe87ca43bafc818998734658b 100644 (file)
--- a/configs/smartweb_defconfig
+++ b/configs/smartweb_defconfig
@@ -11,6 +11,7 @@ CONFIG_SYS_TEXT_BASE=0x23000000
 CONFIG_SYS_MALLOC_LEN=0x460000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_SMARTWEB=y
+CONFIG_AT91_GPIO_PULLUP=y
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

diff --git a/configs/snapper9260_defconfig b/configs/snapper9260_defconfig
index c2049153275b3c673488e27e110bbdf11d4c30d4..69b73c982104e43c959df27da73db55d6e84a50e 100644 (file)
--- a/configs/snapper9260_defconfig
+++ b/configs/snapper9260_defconfig
@@ -5,6 +5,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_SYS_TEXT_BASE=0x21f00000
 CONFIG_SYS_MALLOC_LEN=0x100000
 CONFIG_TARGET_SNAPPER9260=y
+CONFIG_AT91_GPIO_PULLUP=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_OFFSET=0x80000

diff --git a/configs/snapper9g20_defconfig b/configs/snapper9g20_defconfig
index f18ead2f408005d4451988a5a4cd6b1591996db3..13c4ebe803add72167b9a56642753b661ae24b42 100644 (file)
--- a/configs/snapper9g20_defconfig
+++ b/configs/snapper9g20_defconfig
@@ -5,6 +5,7 @@ CONFIG_ARCH_AT91=y
 CONFIG_SYS_TEXT_BASE=0x21f00000
 CONFIG_SYS_MALLOC_LEN=0x100000
 CONFIG_TARGET_SNAPPER9260=y
+CONFIG_AT91_GPIO_PULLUP=y
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_ENV_SIZE=0x40000
 CONFIG_ENV_OFFSET=0x80000

diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig
index c68945d4b7ec26258fe41c1eb8c4c1eafc16a41f..0b25c3dac1dec57f22b84bb5ee75eab63d55a2c6 100644 (file)
--- a/configs/taurus_defconfig
+++ b/configs/taurus_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_TEXT_BASE=0x21000000
 CONFIG_SYS_MALLOC_LEN=0x460000
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_TARGET_TAURUS=y
+CONFIG_AT91_GPIO_PULLUP=y
 CONFIG_BOARD_TAURUS=y
 CONFIG_SPL_GPIO=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y

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

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 8fb29b0babacccb58613c5bc138c5483c03ef865..15b7727be0b0b9a83553a0dae01d0fac1b7dc765 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -74,7 +74,6 @@
 
 /* general purpose I/O */
 #define CONFIG_ATMEL_LEGACY            /* required until (g)pio is fixed */
-#define CONFIG_AT91_GPIO_PULLUP        1       /* keep pullups on peripheral pins */
 
 /* serial console */
 #define CONFIG_USART_BASE              ATMEL_BASE_DBGU

diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h
index 686134409572919259f0000669646a79a8f89fa7..bf14bd498939bda4de6748d4f2be51a7ffbc584d 100644 (file)
--- a/include/configs/snapper9260.h
+++ b/include/configs/snapper9260.h
@@ -54,7 +54,6 @@
 
 /* GPIOs and IO expander */
 #define CONFIG_ATMEL_LEGACY
-#define CONFIG_AT91_GPIO_PULLUP                1
 #define CONFIG_PCA953X
 #define CONFIG_SYS_I2C_PCA953X_ADDR    0x28
 #define CONFIG_SYS_I2C_PCA953X_WIDTH   { {0x28, 16} }

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

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