usb: host: ehci: add GENERIC_PHY dependency to Kconfig
Subsystems (2)
PATCH 1/2 usb: host: ehci: add GENERIC_PHY dependency to Kconfig
With GENERIC_PHY disabled, EHCI driver initialization fails in ehci_probe() as calling phy_optional_get() returns "Function not implemented" value. So it seems reasonable to make USB_EHCI explicitly depend on GENERIC_PHY.
--- drivers/usb/host/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/usb/host/Kconfig +1 -0
@@ -2,6 +2,7 @@ config USB_EHCI bool "EHCI driver" depends on HAS_DMA + depends on GENERIC_PHY config USB_EHCI_OMAP depends on ARCH_OMAP3
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/2 usb: host: ehci: reorder code in ehci_probe()
Currently, after successful memory region requests the driver initialization could still fail, leaving those regions allocated. By reordering the code those requests can be placed later, after the possibly failing calls.
--- drivers/usb/host/ehci-hcd.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-)
drivers/usb/host/ehci-hcd.c +14 -14
@@ -1421,20 +1421,6 @@ static int ehci_probe(struct device_d *dev)*/ data.flags =EHCI_HAS_TT ; - iores =dev_request_mem_resource (dev,0 ); -if (IS_ERR (iores)) -return PTR_ERR (iores); - data.hccr =IOMEM (iores->start); - -if (dev->num_resources >1 ) { - iores =dev_request_mem_resource (dev,1 ); -if (IS_ERR (iores)) -return PTR_ERR (iores); - data.hcor =IOMEM (iores->start); - } -else - data.hcor =NULL ; - usb2_generic_phy =phy_optional_get (dev,"usb" );if (IS_ERR (usb2_generic_phy))return PTR_ERR (usb2_generic_phy);
@@ -1456,6 +1442,20 @@ static int ehci_probe(struct device_d *dev)if (ret)return ret; + iores =dev_request_mem_resource (dev,0 ); +if (IS_ERR (iores)) +return PTR_ERR (iores); + data.hccr =IOMEM (iores->start); + +if (dev->num_resources >1 ) { + iores =dev_request_mem_resource (dev,1 ); +if (IS_ERR (iores)) +return PTR_ERR (iores); + data.hcor =IOMEM (iores->start); + } +else + data.hcor =NULL ; + ehci =ehci_register (dev, &data);if (IS_ERR (ehci))return PTR_ERR (ehci);
Signature · 7 lines
2.20.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Hi Denis,
Quoted 15 lines · Denis Orlov
With
GENERIC_PHYdisabled, EHCI driver initialization fails inehci_probe()as callingphy_optional_get()returns "Function not implemented" value. So it seems reasonable to makeUSB_EHCIexplicitly depend onGENERIC_PHY.Signed-off-by Denis Orlov <[email protected]>--- drivers/usb/host/Kconfig | 1 + 1 file changed, 1 insertion(+)drivers/usb/host/Kconfig +0
-0
drivers/usb/host/Kconfig line 5
Quoted 4 lines
drivers/usb/host/Kconfig +1
-0@@ -2,6 +2,7 @@ config USB_EHCI bool "EHCI driver" depends on HAS_DMA + depends on GENERIC_PHY
This effectively disables the EHCI in a bunch of defconfigs. I finally decided for the other approach and made phy_optional_get() return NULL when GENERIC_PHY is disabled. This should solve this problem.
Applied the other patch in the series.
Sascha
Quoted 7 lines
drivers/usb/host/Kconfig +0
-0config USB_EHCI_OMAP depends on ARCH_OMAP3Signature · 1 line
2.20.1
Signature · 9 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox