The symbols CONFIG_OMAP3_GPIO_X control if we enable the clocks for a given GPIO bank in U-Boot. select the required banks for each target. In some cases we need to also migrate from CONFIG_USB_EHCI (deprecated, in include/configs/) to CONFIG_USB_EHCI_HCD as we only require the GPIO bank to be enabled if USB is also enabled.
Signed-off-by: Tom Rini trini@konsulko.com --- arch/arm/mach-omap2/omap3/Kconfig | 54 +++++++++++++++++++++++++++++++++++++++ configs/eco5pk_defconfig | 1 + configs/mcx_defconfig | 1 + configs/mt_ventoux_defconfig | 1 + configs/twister_defconfig | 1 + include/configs/cm_t35.h | 7 ----- include/configs/cm_t3517.h | 7 ----- include/configs/mcx.h | 3 --- include/configs/mt_ventoux.h | 1 - include/configs/omap3_beagle.h | 4 --- include/configs/omap3_igep00x0.h | 5 ---- include/configs/omap3_logic.h | 4 --- include/configs/omap3_overo.h | 7 ----- include/configs/omap3_pandora.h | 4 --- include/configs/sniper.h | 9 ------- include/configs/tam3517-common.h | 2 -- include/configs/tao3530.h | 7 ----- include/configs/tricorder.h | 5 ---- include/configs/twister.h | 3 --- scripts/config_whitelist.txt | 5 ---- 20 files changed, 58 insertions(+), 73 deletions(-)
diff --git a/arch/arm/mach-omap2/omap3/Kconfig b/arch/arm/mach-omap2/omap3/Kconfig index 933fcba37cf5..7b298d671dd5 100644 --- a/arch/arm/mach-omap2/omap3/Kconfig +++ b/arch/arm/mach-omap2/omap3/Kconfig @@ -1,5 +1,21 @@ if OMAP34XX
+# We only enable the clocks for the GPIO banks that a given board requies. +config OMAP3_GPIO_2 + bool + +config OMAP3_GPIO_3 + bool + +config OMAP3_GPIO_4 + bool + +config OMAP3_GPIO_5 + bool + +config OMAP3_GPIO_6 + bool + choice prompt "OMAP3 board select" optional @@ -9,18 +25,28 @@ config TARGET_AM3517_EVM
config TARGET_MT_VENTOUX bool "TeeJet Mt.Ventoux" + select OMAP3_GPIO_4 + select OMAP3_GPIO_5 if USB_EHCI_HCD
config TARGET_OMAP3_BEAGLE bool "TI OMAP3 BeagleBoard" select DM select DM_SERIAL select DM_GPIO + select OMAP3_GPIO_5 + select OMAP3_GPIO_6
config TARGET_CM_T35 bool "CompuLab CM-T3530 and CM-T3730 boards" + select OMAP3_GPIO_2 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6 if LED_STATUS
config TARGET_CM_T3517 bool "CompuLab CM-T3517 boards" + select OMAP3_GPIO_2 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6 if LED_STATUS
config TARGET_DEVKIT8000 bool "TimLL OMAP3 Devkit8000" @@ -36,12 +62,20 @@ config TARGET_OMAP3_IGEP00X0 select DM select DM_SERIAL select DM_GPIO + select OMAP3_GPIO_3 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6
config TARGET_OMAP3_OVERO bool "OMAP35xx Gumstix Overo" select DM select DM_SERIAL select DM_GPIO + select OMAP3_GPIO_2 + select OMAP3_GPIO_3 + select OMAP3_GPIO_4 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6
config TARGET_OMAP3_ZOOM1 bool "TI Zoom1" @@ -54,16 +88,22 @@ config TARGET_AM3517_CRANE
config TARGET_OMAP3_PANDORA bool "OMAP3 Pandora" + select OMAP3_GPIO_4 + select OMAP3_GPIO_6
config TARGET_ECO5PK bool "ECO5PK" + select OMAP3_GPIO_5 if USB_EHCI_HCD
config TARGET_TRICORDER bool "Tricorder" + select OMAP3_GPIO_2
config TARGET_MCX bool "MCX" select BOARD_LATE_INIT + select OMAP3_GPIO_2 if USB_EHCI_HCD + select OMAP3_GPIO_5 if USB_EHCI_HCD
config TARGET_OMAP3_LOGIC bool "OMAP3 Logic" @@ -71,15 +111,24 @@ config TARGET_OMAP3_LOGIC select DM select DM_SERIAL select DM_GPIO + select OMAP3_GPIO_4 + select OMAP3_GPIO_6
config TARGET_NOKIA_RX51 bool "Nokia RX51"
config TARGET_TAO3530 bool "TAO3530" + select OMAP3_GPIO_2 + select OMAP3_GPIO_3 + select OMAP3_GPIO_4 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6
config TARGET_TWISTER bool "Twister" + select OMAP3_GPIO_2 + select OMAP3_GPIO_5 if USB_EHCI_HCD
config TARGET_OMAP3_CAIRO bool "QUIPOS CAIRO" @@ -92,6 +141,11 @@ config TARGET_SNIPER select DM select DM_SERIAL select DM_GPIO + select OMAP3_GPIO_2 + select OMAP3_GPIO_3 + select OMAP3_GPIO_4 + select OMAP3_GPIO_5 + select OMAP3_GPIO_6
endchoice
diff --git a/configs/eco5pk_defconfig b/configs/eco5pk_defconfig index 2f3d81416390..a6de0b23e12b 100644 --- a/configs/eco5pk_defconfig +++ b/configs/eco5pk_defconfig @@ -24,5 +24,6 @@ CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y diff --git a/configs/mcx_defconfig b/configs/mcx_defconfig index 3cc1a2ba14b5..349df80f05d9 100644 --- a/configs/mcx_defconfig +++ b/configs/mcx_defconfig @@ -33,6 +33,7 @@ CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_ULPI_VIEWPORT_OMAP=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y diff --git a/configs/mt_ventoux_defconfig b/configs/mt_ventoux_defconfig index 08e400cc4e1e..484086837abb 100644 --- a/configs/mt_ventoux_defconfig +++ b/configs/mt_ventoux_defconfig @@ -29,6 +29,7 @@ CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_ULPI_VIEWPORT_OMAP=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y diff --git a/configs/twister_defconfig b/configs/twister_defconfig index ba7b68b31714..62d7d17ca9c0 100644 --- a/configs/twister_defconfig +++ b/configs/twister_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_UBI=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_USB=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_ULPI_VIEWPORT_OMAP=y CONFIG_USB_ULPI=y CONFIG_USB_STORAGE=y diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 349a8de77739..78f8e5d8d556 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -246,14 +246,7 @@
#define CONFIG_SPLASHIMAGE_GUARD
-/* GPIO banks */ -#ifdef CONFIG_LED_STATUS -#define CONFIG_OMAP3_GPIO_6 /* GPIO186 is in GPIO bank 6 */ -#endif - /* Display Configuration */ -#define CONFIG_OMAP3_GPIO_2 -#define CONFIG_OMAP3_GPIO_5 #define CONFIG_VIDEO_OMAP3 #define LCD_BPP LCD_COLOR16
diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 2fed3124f736..d157f240564c 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -247,14 +247,7 @@ /* Status LED */ #define GREEN_LED_GPIO 186 /* CM-T3517 Green LED is GPIO186 */
-/* GPIO banks */ -#ifdef CONFIG_LED_STATUS -#define CONFIG_OMAP3_GPIO_6 /* GPIO186 is in GPIO bank 6 */ -#endif - /* Display Configuration */ -#define CONFIG_OMAP3_GPIO_2 -#define CONFIG_OMAP3_GPIO_5 #define CONFIG_VIDEO_OMAP3 #define LCD_BPP LCD_COLOR16
diff --git a/include/configs/mcx.h b/include/configs/mcx.h index c698166c4ea0..09f8b968ede8 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -73,9 +73,6 @@ 115200}
/* EHCI */ -#define CONFIG_OMAP3_GPIO_2 -#define CONFIG_OMAP3_GPIO_5 -#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index dfebde20ecd8..2e373175dc8a 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -24,7 +24,6 @@ #define CONFIG_BOOTFILE "uImage" #define CONFIG_AUTO_COMPLETE
-#define CONFIG_OMAP3_GPIO_4 #define CONFIG_HOSTNAME mt_ventoux
/* diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index c69b32531cc5..c91d0935bab0 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -66,10 +66,6 @@ #define CONFIG_USB_ETHER_MCS7830 #define CONFIG_USB_ETHER_SMSC95XX
-/* GPIO banks */ -#define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO bank 5 */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ - /* commands to include */
#define MTDIDS_DEFAULT "nand0=nand" diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 70d337e6f166..59da726bd638 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -37,11 +37,6 @@ #endif #endif
-/* GPIO banks */ -#define CONFIG_OMAP3_GPIO_3 /* GPIO64 .. 95 is in GPIO bank 3 */ -#define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO bank 5 */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ - /* USB */ #define CONFIG_USB_MUSB_UDC 1 #define CONFIG_USB_OMAP3 1 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 772fc60c9c3e..735c9ef08ab3 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -49,10 +49,6 @@
/* Hardware drivers */
-/* GPIO banks */ -#define CONFIG_OMAP3_GPIO_4 /* GPIO 96..128 is in GPIO bank 4 */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ - #define CONFIG_USB_OMAP3
/* commands to include */ diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h index ebf7dd0c01fb..40107e42166c 100644 --- a/include/configs/omap3_overo.h +++ b/include/configs/omap3_overo.h @@ -45,13 +45,6 @@ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 183 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3
-/* Initialize GPIOs by default */ -#define CONFIG_OMAP3_GPIO_2 /* GPIO32..63 is in GPIO Bank 2 */ -#define CONFIG_OMAP3_GPIO_3 /* GPIO64..95 is in GPIO Bank 3 */ -#define CONFIG_OMAP3_GPIO_4 /* GPIO96..127 is in GPIO Bank 4 */ -#define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO Bank 5 */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO Bank 6 */ - /* commands to include */
#ifdef CONFIG_NAND diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index ba7d3cdef5df..efee5b0c3f1a 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -35,10 +35,6 @@ /* TWL4030 LED */ #define CONFIG_TWL4030_LED
-/* Initialize GPIOs by default */ -#define CONFIG_OMAP3_GPIO_4 /* GPIO96..127 is in GPIO Bank 4 */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO Bank 6 */ - /* * NS16550 Configuration */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 23e965fafec6..c56169dcff81 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -56,15 +56,6 @@ #define CONFIG_SYS_MALLOC_LEN (1024 * 1024 + CONFIG_ENV_SIZE)
/* - * GPIO - */ -#define CONFIG_OMAP3_GPIO_2 -#define CONFIG_OMAP3_GPIO_3 -#define CONFIG_OMAP3_GPIO_4 -#define CONFIG_OMAP3_GPIO_5 -#define CONFIG_OMAP3_GPIO_6 - -/* * I2C */
diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 84d59077ed18..9dfda1e03895 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -67,8 +67,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} /* EHCI */ -#define CONFIG_OMAP3_GPIO_5 -#define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_OMAP #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 25 #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 3 diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 85feb05e3257..834fe174d640 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -61,13 +61,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
-/* GPIO banks */ -#define CONFIG_OMAP3_GPIO_2 /* GPIO32 ..63 is in GPIO bank 2 */ -#define CONFIG_OMAP3_GPIO_3 /* GPIO64 ..95 is in GPIO bank 3 */ -#define CONFIG_OMAP3_GPIO_4 /* GPIO96 ..127 is in GPIO bank 4 */ -#define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO bank 5 */ -#define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ - /* commands to include */ #define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */ #define CONFIG_MTD_DEVICE /* needed for mtdparts commands */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index bc592cf32411..8fe4165a77f4 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -46,11 +46,6 @@
/* Hardware drivers */
-/* GPIO banks */ -#define CONFIG_OMAP3_GPIO_2 /* GPIO32..63 are in GPIO bank 2 */ - -/* LED support */ - /* NS16550 Configuration */ #define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_REG_SIZE (-4) diff --git a/include/configs/twister.h b/include/configs/twister.h index 30ad241f7ffd..a7de75ec6ff2 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -45,7 +45,4 @@ #define CONFIG_SYS_SPL_ARGS_ADDR (PHYS_SDRAM_1 + 0x100) #define CONFIG_SPL_BOARD_INIT
-/* gpio 55 is used as SPL_OS_BOOT_KEY */ -#define CONFIG_OMAP3_GPIO_2 - #endif /* __CONFIG_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ea82a71b675f..ee8f215c2f7f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1979,11 +1979,6 @@ CONFIG_OF_SPI CONFIG_OF_SPI_FLASH CONFIG_OF_STDOUT_PATH CONFIG_OF_SUPPORT_OLD_DEVICE_TREES -CONFIG_OMAP3_GPIO_2 -CONFIG_OMAP3_GPIO_3 -CONFIG_OMAP3_GPIO_4 -CONFIG_OMAP3_GPIO_5 -CONFIG_OMAP3_GPIO_6 CONFIG_OMAP3_LOGIC_USE_NEW_PRODUCT_ID CONFIG_OMAP3_MICRON_DDR CONFIG_OMAP3_SPI_D0_D1_SWAPPED