[PATCH 7/8] Convert CONFIG_AT91_GPIO_PULLUP to Kconfig

Sat Mar 12 05:07:35 CET 2022

This converts the following to Kconfig:
   CONFIG_AT91_GPIO_PULLUP

Cc: Eugen Hristev <eugen.hristev at microchip.com>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 arch/arm/mach-at91/Kconfig    | 4 ++++
 configs/axm_defconfig         | 1 +
 configs/corvus_defconfig      | 1 +
 configs/gurnard_defconfig     | 1 +
 configs/smartweb_defconfig    | 1 +
 configs/snapper9260_defconfig | 1 +
 configs/snapper9g20_defconfig | 1 +
 configs/taurus_defconfig      | 1 +
 include/configs/corvus.h      | 1 -
 include/configs/smartweb.h    | 1 -
 include/configs/snapper9260.h | 1 -
 include/configs/snapper9g45.h | 1 -
 include/configs/taurus.h      | 1 -
 13 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e99b9064e519..79fe87ca58e0 100644
--- 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 e27f0b71ed90..b6b4104d243f 100644
--- 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 0d7352cc4e45..57cc21764a64 100644
--- 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 c44714f4a38f..28ed4ae837db 100644
--- 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 64a77b0ddaeb..f39d08371644 100644
--- 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 c2049153275b..69b73c982104 100644
--- 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 f18ead2f4080..13c4ebe803ad 100644
--- 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 c68945d4b7ec..0b25c3dac1de 100644
--- 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 4c25c906e811..c08ef567ed48 100644
--- 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 8fb29b0babac..15b7727be0b0 100644
--- 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 686134409572..bf14bd498939 100644
--- 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 069f4c2d2494..f79e421c2612 100644
--- 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 e4609b5c8971..92e691c1222d 100644
--- 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
-- 
2.25.1

