summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Ford <aford173@gmail.com>2018-07-10 07:01:20 -0500
committerTom Rini <trini@konsulko.com>2018-07-23 14:33:21 -0400
commit5d653afc177f1e260c311b821801a8b6eb609c02 (patch)
treeb72d18d9a3f8ff78d03027b1673040c87a9c38df
parentd7cc15bb53a8e217dee70beb47d0521628f9ecbf (diff)
downloadu-boot-5d653afc177f1e260c311b821801a8b6eb609c02.tar.gz
u-boot-5d653afc177f1e260c311b821801a8b6eb609c02.tar.bz2
u-boot-5d653afc177f1e260c311b821801a8b6eb609c02.zip
Convert CONFIG_DA8XX_GPIO to Kconfig
This converts the following to Kconfig: CONFIG_DA8XX_GPIO Signed-off-by: Adam Ford <aford173@gmail.com>
-rw-r--r--configs/calimain_defconfig1
-rw-r--r--configs/da850_am18xxevm_defconfig1
-rw-r--r--configs/da850evm_defconfig1
-rw-r--r--configs/da850evm_direct_nor_defconfig1
-rw-r--r--configs/ea20_defconfig1
-rw-r--r--configs/ipam390_defconfig1
-rw-r--r--drivers/gpio/Kconfig5
-rw-r--r--include/configs/calimain.h1
-rw-r--r--include/configs/da850evm.h1
-rw-r--r--include/configs/ea20.h1
-rw-r--r--include/configs/ipam390.h1
-rw-r--r--scripts/config_whitelist.txt1
12 files changed, 11 insertions, 5 deletions
diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig
index 7908cfcc34..bc704ff7bd 100644
--- a/configs/calimain_defconfig
+++ b/configs/calimain_defconfig
@@ -23,6 +23,7 @@ CONFIG_CMD_DIAG=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_BOOTCOUNT_LIMIT=y
CONFIG_SYS_BOOTCOUNT_ADDR=0x01C23000
+CONFIG_DA8XX_GPIO=y
# CONFIG_MMC is not set
CONFIG_MTD_NOR_FLASH=y
CONFIG_SYS_NS16550=y
diff --git a/configs/da850_am18xxevm_defconfig b/configs/da850_am18xxevm_defconfig
index 9283bf9da1..abb2295951 100644
--- a/configs/da850_am18xxevm_defconfig
+++ b/configs/da850_am18xxevm_defconfig
@@ -35,6 +35,7 @@ CONFIG_CMD_DIAG=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y
+CONFIG_DA8XX_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y
CONFIG_MTD_DEVICE=y
diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig
index 3c22932f48..4242728e6a 100644
--- a/configs/da850evm_defconfig
+++ b/configs/da850evm_defconfig
@@ -37,6 +37,7 @@ CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
CONFIG_DM=y
CONFIG_DM_GPIO=y
+CONFIG_DA8XX_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y
CONFIG_MTD_DEVICE=y
diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig
index f71d351ad3..9d6c47df50 100644
--- a/configs/da850evm_direct_nor_defconfig
+++ b/configs/da850evm_direct_nor_defconfig
@@ -35,6 +35,7 @@ CONFIG_CMD_DIAG=y
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_FLASH=y
CONFIG_DM=y
+CONFIG_DA8XX_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_I2C_COMPAT=y
# CONFIG_MMC is not set
diff --git a/configs/ea20_defconfig b/configs/ea20_defconfig
index 43292a126d..ace5fc51d4 100644
--- a/configs/ea20_defconfig
+++ b/configs/ea20_defconfig
@@ -29,6 +29,7 @@ CONFIG_CMD_BMP=y
CONFIG_CMD_DIAG=y
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_SPI_FLASH=y
+CONFIG_DA8XX_GPIO=y
# CONFIG_MMC is not set
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
diff --git a/configs/ipam390_defconfig b/configs/ipam390_defconfig
index d1a6e542cb..a142402952 100644
--- a/configs/ipam390_defconfig
+++ b/configs/ipam390_defconfig
@@ -33,6 +33,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=davinci_nand.0:128k(u-boot-env),1408k(u-boot),
CONFIG_CMD_DIAG=y
CONFIG_CMD_UBI=y
CONFIG_ENV_IS_IN_NAND=y
+CONFIG_DA8XX_GPIO=y
# CONFIG_MMC is not set
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 5699a71b23..5cd8b34400 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -58,6 +58,11 @@ config ATMEL_PIO4
may be dedicated as a general purpose I/O or be assigned to
a function of an embedded peripheral.
+config DA8XX_GPIO
+ bool "DA8xx GPIO Driver"
+ help
+ This driver supports the DA8xx GPIO controller
+
config INTEL_BROADWELL_GPIO
bool "Intel Broadwell GPIO driver"
depends on DM
diff --git a/include/configs/calimain.h b/include/configs/calimain.h
index ab4a9e6ddc..690f605695 100644
--- a/include/configs/calimain.h
+++ b/include/configs/calimain.h
@@ -26,7 +26,6 @@
#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE
#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID)
#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DA8XX_GPIO
#define CONFIG_HW_WATCHDOG
#define CONFIG_SYS_WDTTIMERBASE DAVINCI_TIMER1_BASE
#define CONFIG_SYS_WDT_PERIOD_LOW \
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index beb9575256..3dcd1390ca 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -223,7 +223,6 @@
#endif
#endif
-#define CONFIG_DA8XX_GPIO
/*
* U-Boot general configuration
*/
diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index b7a839f0b3..485866d694 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -28,7 +28,6 @@
#define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE
#define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID)
#define CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_DA8XX_GPIO
/*
* Memory Info
diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h
index e3a4f4bd07..eb3f394231 100644
--- a/include/configs/ipam390.h
+++ b/include/configs/ipam390.h
@@ -231,7 +231,6 @@
#define CONFIG_SYS_SPL_ARGS_ADDR LINUX_BOOT_PARAM_ADDR
/* GPIO support */
-#define CONFIG_DA8XX_GPIO
#define CONFIG_IPAM390_GPIO_BOOTMODE ((16 * 7) + 14)
#define CONFIG_SHOW_BOOT_PROGRESS
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 8334585437..80c7f3cf98 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -309,7 +309,6 @@ CONFIG_CUSTOMER_BOARD_SUPPORT
CONFIG_D2NET_V2
CONFIG_DA850_AM18X_EVM
CONFIG_DA850_EVM_MAX_CPU_CLK
-CONFIG_DA8XX_GPIO
CONFIG_DBAU1000
CONFIG_DBGU
CONFIG_DBG_MONITOR