diff options
author | Tom Rini <trini@konsulko.com> | 2017-05-13 02:33:22 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-05-15 14:40:00 (GMT) |
commit | 68ccab51936d92551e3e65944af172ad64ca2ca9 (patch) | |
tree | 4bb901cdbaefe589f71e79c1677147826a620b8a /include/configs | |
parent | 29cb2b3b903ce12e7abc2fc9a8cfb12a0be36852 (diff) | |
download | u-boot-fsl-qoriq-68ccab51936d92551e3e65944af172ad64ca2ca9.tar.xz |
omap3: Migrate CONFIG_OMAP3_GPIO_X to Kconfig
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>
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/cm_t35.h | 7 | ||||
-rw-r--r-- | include/configs/cm_t3517.h | 7 | ||||
-rw-r--r-- | include/configs/mcx.h | 3 | ||||
-rw-r--r-- | include/configs/mt_ventoux.h | 1 | ||||
-rw-r--r-- | include/configs/omap3_beagle.h | 4 | ||||
-rw-r--r-- | include/configs/omap3_igep00x0.h | 5 | ||||
-rw-r--r-- | include/configs/omap3_logic.h | 4 | ||||
-rw-r--r-- | include/configs/omap3_overo.h | 7 | ||||
-rw-r--r-- | include/configs/omap3_pandora.h | 4 | ||||
-rw-r--r-- | include/configs/sniper.h | 9 | ||||
-rw-r--r-- | include/configs/tam3517-common.h | 2 | ||||
-rw-r--r-- | include/configs/tao3530.h | 7 | ||||
-rw-r--r-- | include/configs/tricorder.h | 5 | ||||
-rw-r--r-- | include/configs/twister.h | 3 |
14 files changed, 0 insertions, 68 deletions
diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 349a8de..78f8e5d 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 2fed312..d157f24 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 c698166..09f8b96 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 dfebde2..2e37317 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 c69b325..c91d093 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 70d337e..59da726 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 772fc60..735c9ef 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 ebf7dd0..40107e4 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 ba7d3cd..efee5b0 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 23e965f..c56169d 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 84d5907..9dfda1e 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 85feb05..834fe17 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 bc592cf..8fe4165 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 30ad241..a7de75e 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 */ |