Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-11 15:34:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

phy: Extend generic_setup_phy() with PHY mode and submode

Browse source 
Extend generic_setup_phy() parameter list with PHY mode and submode and
call generic_phy_set_mode() in generic_setup_phy(), so the generic PHY
setup function can configure the PHY into correct mode before powering
the PHY up.

Update all call sites of generic_setup_phy() as well, all of which are
USB host related, except for DM test which now behaves as a USB host
test.

Note that if the PHY driver does not implement the .set_mode callback,
generic_phy_set_mode() call returns 0 and does not error out, so this
should not break any existing systems.

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2024-09-08 23:09:03 +02:00 • committed by Marek Vasut
parent d0f74bd417
commit 35941d3a96
8 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/phy/phy-uclass.c
View file

@ -508,7 +508,8 @@ int generic_phy_power_off_bulk(struct phy_bulk *bulk)
return ret;
}
int generic_setup_phy(struct udevice *dev, struct phy *phy, int index)
int generic_setup_phy(struct udevice *dev, struct phy *phy, int index,
enum phy_mode mode, int submode)
{
int ret;
@ -520,10 +521,18 @@ int generic_setup_phy(struct udevice *dev, struct phy *phy, int index)
if (ret)
return ret;
ret = generic_phy_set_mode(phy, mode, submode);
if (ret)
goto phys_mode_err;
ret = generic_phy_power_on(phy);
if (ret)
generic_phy_exit(phy);
goto phys_mode_err;
return 0;
phys_mode_err:
generic_phy_exit(phy);
return ret;
}

2
drivers/usb/host/ehci-generic.c
View file

@ -94,7 +94,7 @@ static int ehci_usb_probe(struct udevice *dev)
if (err)
goto reset_err;
err = generic_setup_phy(dev, &priv->phy, 0);
err = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
if (err)
goto regulator_err;

2
drivers/usb/host/ehci-msm.c
View file

@ -80,7 +80,7 @@ static int ehci_usb_probe(struct udevice *dev)
hcor = (struct ehci_hcor *)((phys_addr_t)hccr +
HC_LENGTH(ehci_readl(&(hccr)->cr_capbase)));
ret = generic_setup_phy(dev, &p->phy, 0);
ret = generic_setup_phy(dev, &p->phy, 0, PHY_MODE_USB_HOST, 0);
if (ret)
goto cleanup_iface;

2
drivers/usb/host/ehci-mx6.c
View file

@ -703,7 +703,7 @@ static int ehci_usb_probe(struct udevice *dev)
usb_phy_enable(ehci, priv->phy_addr);
#endif
#else
ret = generic_setup_phy(dev, &priv->phy, 0);
ret = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
if (ret)
goto err_regulator;
#endif

2
drivers/usb/host/ehci-pci.c
View file

@ -30,7 +30,7 @@ static int ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr,
int ret;
u32 cmd;
ret = generic_setup_phy(dev, &priv->phy, 0);
ret = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
if (ret)
return ret;

2
drivers/usb/host/ohci-generic.c
View file

@ -50,7 +50,7 @@ static int ohci_usb_probe(struct udevice *dev)
goto reset_err;
}
err = generic_setup_phy(dev, &priv->phy, 0);
err = generic_setup_phy(dev, &priv->phy, 0, PHY_MODE_USB_HOST, 0);
if (err)
goto reset_err;

8
include/generic-phy.h
View file

@ -415,10 +415,13 @@ int generic_phy_power_off_bulk(struct phy_bulk *bulk);
* @dev: The consumer device.
* @phy: A pointer to the PHY port
* @index: The index in the list of available PHYs
* @mode: PHY mode
* @submode: PHY submode
*
* Return: 0 if OK, or negative error code.
*/
int generic_setup_phy(struct udevice *dev, struct phy *phy, int index);
int generic_setup_phy(struct udevice *dev, struct phy *phy, int index,
enum phy_mode mode, int submode);
/**
* generic_shutdown_phy() - Power off and de-initialize phy.
@ -509,7 +512,8 @@ static inline int generic_phy_power_off_bulk(struct phy_bulk *bulk)
return 0;
}
static inline int generic_setup_phy(struct udevice *dev, struct phy *phy, int index)
static inline int generic_setup_phy(struct udevice *dev, struct phy *phy, int index,
enum phy_mode mode, int submode)
{
return 0;
}

8
test/dm/phy.c
View file

@ -243,20 +243,20 @@ static int dm_test_phy_setup(struct unit_test_state *uts)
"gen_phy_user", &parent));
/* normal */
ut_assertok(generic_setup_phy(parent, &phy, 0));
ut_assertok(generic_setup_phy(parent, &phy, 0, PHY_MODE_USB_HOST, 0));
ut_assertok(generic_shutdown_phy(&phy));
/* power_off fail with -EIO */
ut_assertok(generic_setup_phy(parent, &phy, 1));
ut_assertok(generic_setup_phy(parent, &phy, 1, PHY_MODE_USB_HOST, 0));
ut_asserteq(-EIO, generic_shutdown_phy(&phy));
/* power_on fail with -EIO */
ut_asserteq(-EIO, generic_setup_phy(parent, &phy, 2));
ut_asserteq(-EIO, generic_setup_phy(parent, &phy, 2, PHY_MODE_USB_HOST, 0));
ut_assertok(generic_shutdown_phy(&phy));
/* generic_phy_get_by_index fail with -ENOENT */
ut_asserteq(-ENOENT, generic_phy_get_by_index(parent, 3, &phy));
ut_assertok(generic_setup_phy(parent, &phy, 3));
ut_assertok(generic_setup_phy(parent, &phy, 3, PHY_MODE_USB_HOST, 0));
ut_assertok(generic_shutdown_phy(&phy));
return 0;