Skip to content

Commit 7f499ec

Browse files
committed
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
2 parents 6d04b70 + 2a9c713 commit 7f499ec

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ static void mtk_mipi_tx_pll_disable(struct clk_hw *hw)
100100
static long mtk_mipi_tx_pll_round_rate(struct clk_hw *hw, unsigned long rate,
101101
unsigned long *prate)
102102
{
103-
return clamp_val(rate, 50000000, 1600000000);
103+
return clamp_val(rate, 125000000, 1600000000);
104104
}
105105

106106
static const struct clk_ops mtk_mipi_tx_pll_ops = {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ static int sp_usb_phy_probe(struct platform_device *pdev)
275275

276276
phy = devm_phy_create(&pdev->dev, NULL, &sp_uphy_ops);
277277
if (IS_ERR(phy)) {
278-
ret = -PTR_ERR(phy);
278+
ret = PTR_ERR(phy);
279279
return ret;
280280
}
281281

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ struct phy_gmii_sel_priv {
6464
u32 num_ports;
6565
u32 reg_offset;
6666
u32 qsgmii_main_ports;
67+
bool no_offset;
6768
};
6869

6970
static int phy_gmii_sel_mode(struct phy *phy, enum phy_mode mode, int submode)
@@ -402,7 +403,8 @@ static int phy_gmii_sel_init_ports(struct phy_gmii_sel_priv *priv)
402403
priv->num_ports = size / sizeof(u32);
403404
if (!priv->num_ports)
404405
return -EINVAL;
405-
priv->reg_offset = __be32_to_cpu(*offset);
406+
if (!priv->no_offset)
407+
priv->reg_offset = __be32_to_cpu(*offset);
406408
}
407409

408410
if_phys = devm_kcalloc(dev, priv->num_ports,
@@ -471,6 +473,7 @@ static int phy_gmii_sel_probe(struct platform_device *pdev)
471473
dev_err(dev, "Failed to get syscon %d\n", ret);
472474
return ret;
473475
}
476+
priv->no_offset = true;
474477
}
475478

476479
ret = phy_gmii_sel_init_ports(priv);

0 commit comments

Comments
 (0)