Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af707f58 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-for-5.0-rc' of... 

Merge tag 'phy-for-5.0-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy

 into usb-linus

Kishon writes:

phy: for 5.0 -rc

 *) Fix de-reference before null check in TI's phy-gmii-sel driver
 *) Fix build breakage in AHCI platform driver (patch was merged in AHCI
    before dependent patches were merged in PHY layer)
 *) Fix the power on error path in ath79-usb PHY driver
 *) Fix the reset binding name to match the DT binding documentation in
    ath79-usb PHY driver.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>

* tag 'phy-for-5.0-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy:
  phy: ath79-usb: Fix the main reset name to match the DT binding
  phy: ath79-usb: Fix the power on error path
  phy: fix build breakage: add PHY_MODE_SATA
  phy: ti: ensure priv is not null before dereferencing it
parents 70d0ba4c 827cb032

drivers/phy/qualcomm/phy-ath79-usb.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static int ath79_usb_phy_power_on(struct phy *phy) 


	err = reset_control_deassert(priv->reset);

	if (err && priv->no_suspend_override)

		reset_control_assert(priv->no_suspend_override);

		reset_control_deassert(priv->no_suspend_override);



	return err;

}
@@ -69,7 +69,7 @@ static int ath79_usb_phy_probe(struct platform_device *pdev) 
	if (!priv)

		return -ENOMEM;



	priv->reset = devm_reset_control_get(&pdev->dev, "usb-phy");

	priv->reset = devm_reset_control_get(&pdev->dev, "phy");

	if (IS_ERR(priv->reset))

		return PTR_ERR(priv->reset);

drivers/phy/ti/phy-gmii-sel.c

+2 −2
Original line number Diff line number Diff line
@@ -204,11 +204,11 @@ static struct phy *phy_gmii_sel_of_xlate(struct device *dev, 


	if (args->args_count < 1)

		return ERR_PTR(-EINVAL);

	if (!priv || !priv->if_phys)

		return ERR_PTR(-ENODEV);

	if (priv->soc_data->features & BIT(PHY_GMII_SEL_RMII_IO_CLK_EN) &&

	    args->args_count < 2)

		return ERR_PTR(-EINVAL);

	if (!priv || !priv->if_phys)

		return ERR_PTR(-ENODEV);

	if (phy_id > priv->soc_data->num_ports)

		return ERR_PTR(-EINVAL);

	if (phy_id != priv->if_phys[phy_id - 1].id)