Convert CONFIG_OMAP_EHCI_PHY1_RESET_GPIO et al to Kconfig

This converts the following to Kconfig:
   CONFIG_OMAP_EHCI_PHY1_RESET_GPIO
   CONFIG_OMAP_EHCI_PHY2_RESET_GPIO
   CONFIG_OMAP_EHCI_PHY3_RESET_GPIO

To do this, we also introduce CONFIG_HAS_CONFIG_OMAP_EHCI_PHYn_RESET_GPIO
options to get setting the GPIO number.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig
index 1234aa2251e402998e14e9c1d9b8150fcdad1bb4..864d16cf01ce13fb4e86ab3ee3abc72b755a56b8 100644 (file)
--- a/configs/am3517_evm_defconfig
+++ b/configs/am3517_evm_defconfig
@@ -77,6 +77,8 @@ CONFIG_DM_SPI=y
 CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_HAS_OMAP_EHCI_PHY1_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY1_RESET_GPIO=57
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_AM35X=y
 CONFIG_BCH=y

diff --git a/configs/omap35_logic_somlv_defconfig b/configs/omap35_logic_somlv_defconfig
index 4e31f77049a376fc85b3de097efc24a8b87a8952..9f3a88f28ecf3d5693dcc6883fe72e311cb7b77c 100644 (file)
--- a/configs/omap35_logic_somlv_defconfig
+++ b/configs/omap35_logic_somlv_defconfig
@@ -82,6 +82,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_HAS_OMAP_EHCI_PHY1_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY1_RESET_GPIO=4
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
 CONFIG_TWL4030_USB=y

diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 89b2bff5925a1500a3ee694c55d9d4f4c08519bd..578e6829ff14a77101fbb35ab4a2aaf7db4e5768 100644 (file)
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -84,6 +84,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_HAS_OMAP_EHCI_PHY1_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY1_RESET_GPIO=147
 CONFIG_USB_OMAP3=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_OMAP2PLUS=y

diff --git a/configs/omap3_logic_somlv_defconfig b/configs/omap3_logic_somlv_defconfig
index 96f9c6bcaaaa06d28efe6b1821e567ceb75bba1d..7a78682bf69add4e889acd2479ffaa1f34d539bb 100644 (file)
--- a/configs/omap3_logic_somlv_defconfig
+++ b/configs/omap3_logic_somlv_defconfig
@@ -83,6 +83,8 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 # CONFIG_SPL_DM_USB is not set
 CONFIG_USB_EHCI_HCD=y
+CONFIG_HAS_OMAP_EHCI_PHY1_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY1_RESET_GPIO=4
 CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
 CONFIG_TWL4030_USB=y

diff --git a/configs/omap4_panda_defconfig b/configs/omap4_panda_defconfig
index 687e3865e77a9b99b021ad6118e020eb9abaa81a..8c6baaf4fda515cd6962060b1b1cfdbb9b36be01 100644 (file)
--- a/configs/omap4_panda_defconfig
+++ b/configs/omap4_panda_defconfig
@@ -40,6 +40,10 @@ CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_HAS_OMAP_EHCI_PHY1_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY1_RESET_GPIO=1
+CONFIG_HAS_OMAP_EHCI_PHY2_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY2_RESET_GPIO=62
 CONFIG_USB_OMAP3=y
 CONFIG_USB_HOST_ETHER=y
 CONFIG_USB_ETHER_SMSC95XX=y

diff --git a/configs/omap5_uevm_defconfig b/configs/omap5_uevm_defconfig
index 0436463e08722975b97b3b39c0c0056813a1e7e7..0280b4ac8d073cd03f61d1a958ec6ebe99ca70e1 100644 (file)
--- a/configs/omap5_uevm_defconfig
+++ b/configs/omap5_uevm_defconfig
@@ -49,6 +49,10 @@ CONFIG_CONS_INDEX=3
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_HAS_OMAP_EHCI_PHY2_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY2_RESET_GPIO=80
+CONFIG_HAS_OMAP_EHCI_PHY3_RESET_GPIO=y
+CONFIG_OMAP_EHCI_PHY3_RESET_GPIO=79
 CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_OMAP=y
 CONFIG_USB_DWC3_PHY_OMAP=y

diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index e04cf9411ae5d8fde76911424db1e84bf0d79b92..10b0479a8a6a81a581d5286f913d92bb376b9e42 100644 (file)
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -183,6 +183,40 @@ config USB_EHCI_OMAP
          Enables support for the on-chip EHCI controller on OMAP3 and later
          SoCs.
 
+if USB_EHCI_OMAP
+
+config HAS_OMAP_EHCI_PHY1_RESET_GPIO
+       bool "PHY #1 requires a GPIO hold to it in RESET while PHY settles"
+       help
+         Enable this to be able to configure the GPIO number used to hold the
+         PHY in RESET for enough time until the PHY is settled and ready.
+
+config OMAP_EHCI_PHY1_RESET_GPIO
+       int "GPIO number to hold PHY #1 in RESET"
+       depends on HAS_OMAP_EHCI_PHY1_RESET_GPIO
+
+config HAS_OMAP_EHCI_PHY2_RESET_GPIO
+       bool "PHY #2 requires a GPIO hold to it in RESET while PHY settles"
+       help
+         Enable this to be able to configure the GPIO number used to hold the
+         PHY in RESET for enough time until the PHY is settled and ready.
+
+config OMAP_EHCI_PHY2_RESET_GPIO
+       int "GPIO number to hold PHY #2 in RESET"
+       depends on HAS_OMAP_EHCI_PHY2_RESET_GPIO
+
+config HAS_OMAP_EHCI_PHY3_RESET_GPIO
+       bool "PHY #3 requires a GPIO hold to it in RESET while PHY settles"
+       help
+         Enable this to be able to configure the GPIO number used to hold the
+         PHY in RESET for enough time until the PHY is settled and ready.
+
+config OMAP_EHCI_PHY3_RESET_GPIO
+       int "GPIO number to hold PHY #3 in RESET"
+       depends on HAS_OMAP_EHCI_PHY3_RESET_GPIO
+
+endif
+
 config USB_EHCI_VF
        bool "Support for Vybrid on-chip EHCI USB controller"
        depends on ARCH_VF610

diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
index edfd890767d110b1d709eea3db5f17d7e39fb76d..9b56e2101c16a9d4135373937bdf56d2996d1434 100644 (file)
--- a/include/configs/am3517_evm.h
+++ b/include/configs/am3517_evm.h
@@ -23,8 +23,6 @@
  */
 #ifdef CONFIG_SPL_BUILD
 #undef CONFIG_USB_EHCI_OMAP
-#else
-#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       57
 #endif
 
 /* I2C */

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 5d300b13f34e0fb6e4fccd7f54034e916cb99ef3..265b1e2197c908375435690f56542a8cfd00d32b 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -41,9 +41,6 @@
 #endif /* CONFIG_SPL_OS_BOOT */
 #endif /* CONFIG_MTD_RAW_NAND */
 
-/* USB EHCI */
-#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       147
-
 /* Enable Multi Bus support for I2C */
 #define CONFIG_I2C_MULTI_BUS
 

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index 886f2e9d86f80f53d81c123f929048aeb37c5a16..89ffdef287c4ea836e3da21abf211c31630c8664 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -27,9 +27,6 @@
 #ifdef CONFIG_SPL_BUILD
 #undef CONFIG_USB_EHCI_OMAP
 #endif
-#ifdef CONFIG_USB_EHCI_OMAP
-#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       4
-#endif
 
 /* Board NAND Info. */
 #ifdef CONFIG_MTD_RAW_NAND

diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h
index 14eb363816ae3fa5b5e33bf4852fc11b664f0f32..5320dffe55b953d20b4307e98b8851077b4c4249 100644 (file)
--- a/include/configs/omap4_panda.h
+++ b/include/configs/omap4_panda.h
@@ -16,8 +16,6 @@
  */
 
 /* USB UHH support options */
-#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 1
-#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 62
 
 /* USB Networking options */
 

diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index a1f1dafad79ba76c6ca3b4c1e2ddc8fe44d41675..188ab0bf365daceec926959d0673ca55a1365bf0 100644 (file)
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -43,9 +43,6 @@
 /* USB UHH support options */
 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 
-#define CONFIG_OMAP_EHCI_PHY2_RESET_GPIO 80
-#define CONFIG_OMAP_EHCI_PHY3_RESET_GPIO 79
-
 /* Enabled commands */
 
 /* USB Networking options */

diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
index 166b8397adac1d49556b288d6810677a3bd46481..adbc2ae0c5dfa9783bf210c6b35a50b69117071b 100644 (file)
--- a/include/configs/tam3517-common.h
+++ b/include/configs/tam3517-common.h
@@ -43,8 +43,6 @@
 
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
-/* EHCI */
-#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       25
 
 #define CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW    0x07