Commit 7f499ec2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'phy-fixes-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy 

Pull phy fixes from Vinod Koul:

  - register offset fix for TI driver

  - mediatek driver minimal supported frequency fix

  - negative error code in probe fix for sunplus driver

* tag 'phy-fixes-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy:
  phy: sunplus: return negative error code in sp_usb_phy_probe
  phy: mediatek: mipi: mt8183: fix minimal supported frequency
  phy: ti: gmii-sel: Fix register offset when parent is not a syscon node
parents 6d04b70e 2a9c7138

drivers/phy/mediatek/phy-mtk-mipi-dsi-mt8183.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static void mtk_mipi_tx_pll_disable(struct clk_hw *hw) 
static long mtk_mipi_tx_pll_round_rate(struct clk_hw *hw, unsigned long rate,

				       unsigned long *prate)

{

	return clamp_val(rate, 50000000, 1600000000);

	return clamp_val(rate, 125000000, 1600000000);

}



static const struct clk_ops mtk_mipi_tx_pll_ops = {

drivers/phy/sunplus/phy-sunplus-usb2.c

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ static int sp_usb_phy_probe(struct platform_device *pdev) 


	phy = devm_phy_create(&pdev->dev, NULL, &sp_uphy_ops);

	if (IS_ERR(phy)) {

		ret = -PTR_ERR(phy);

		ret = PTR_ERR(phy);

		return ret;

	}

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

+4 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ struct phy_gmii_sel_priv { 
	u32 num_ports;

	u32 reg_offset;

	u32 qsgmii_main_ports;

	bool no_offset;

};



static int phy_gmii_sel_mode(struct phy *phy, enum phy_mode mode, int submode)
@@ -402,6 +403,7 @@ static int phy_gmii_sel_init_ports(struct phy_gmii_sel_priv *priv) 
		priv->num_ports = size / sizeof(u32);

		if (!priv->num_ports)

			return -EINVAL;

		if (!priv->no_offset)

			priv->reg_offset = __be32_to_cpu(*offset);

	}
@@ -471,6 +473,7 @@ static int phy_gmii_sel_probe(struct platform_device *pdev) 
			dev_err(dev, "Failed to get syscon %d\n", ret);

			return ret;

		}

		priv->no_offset = true;

	}



	ret = phy_gmii_sel_init_ports(priv);