Commit 0f40d509 authored by Andrew Davis's avatar Andrew Davis Committed by Vinod Koul
Browse files

phy: ti: gmii-sel: Fix register offset when parent is not a syscon node 



When the node for this phy selector is a child node of a syscon node then the
property 'reg' is used as an offset into the parent regmap. When the node
is standalone and gets its own regmap this offset is pre-applied. So we need
to track which method was used to get the regmap and not apply the offset
in the standalone case.

Fixes: 1fdfa7cc ("phy: ti: gmii-sel: Allow parent to not be syscon node")
Signed-off-by: default avatarAndrew Davis <afd@ti.com>
Reviewed-by: default avatarRoger Quadros <rogerq@kernel.org>
Link: https://lore.kernel.org/r/20231025143302.1265633-1-afd@ti.com


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent b85ea95d

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);