leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Convert CONFIG_OMAP_EHCI_PHY1_RESET_GPIO et al to Kconfig

Browse Source 
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>
This commit is contained in:
Tom Rini 2021-09-12 20:32:28 -04:00
parent fb1d1778f9
commit 899867a28a
13 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/am3517_evm_defconfig
View File

@ -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

2
configs/omap35_logic_somlv_defconfig
View File

@ -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

2
configs/omap3_beagle_defconfig
View File

@ -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

2
configs/omap3_logic_somlv_defconfig
View File

@ -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

4
configs/omap4_panda_defconfig
View File

@ -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

4
configs/omap5_uevm_defconfig
View File

@ -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

34
drivers/usb/host/Kconfig
View File

@ -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

2
include/configs/am3517_evm.h
View File

@ -23,8 +23,6 @@
*/
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_USB_EHCI_OMAP
#else
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 57
#endif
/* I2C */

3
include/configs/omap3_beagle.h
View File

@ -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

3
include/configs/omap3_logic.h
View File

@ -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

2
include/configs/omap4_panda.h
View File

@ -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 */

3
include/configs/omap5_uevm.h
View File

@ -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 */

2
include/configs/tam3517-common.h
View File

@ -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