Commit b69d39f6 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Vinod Koul
Browse files

phy: cadence-torrent: Do not configure SERDES if it's already configured 



Do not configure torrent SERDES if it's already configured.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Reviewed-by: default avatarSwapnil Jakhade <sjakhade@cadence.com>
Link: https://lore.kernel.org/r/20210330110138.24356-4-kishon@ti.com


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

drivers/phy/cadence/phy-cadence-torrent.c

+22 −10
Original line number Diff line number Diff line
@@ -371,6 +371,10 @@ static const struct phy_ops cdns_torrent_phy_ops = { 
	.owner		= THIS_MODULE,

};



static const struct phy_ops noop_ops = {

	.owner		= THIS_MODULE,

};



struct cdns_reg_pairs {

	u32 val;

	u32 off;
@@ -2306,6 +2310,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev) 
	struct device_node *child;

	int ret, subnodes, node = 0, i;

	u32 total_num_lanes = 0;

	int already_configured;

	u8 init_dp_regmap = 0;

	u32 phy_type;
@@ -2344,6 +2349,9 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	regmap_field_read(cdns_phy->phy_pma_cmn_ctrl_1, &already_configured);



	if (!already_configured) {

		ret = cdns_torrent_reset(cdns_phy);

		if (ret)

			goto clk_cleanup;
@@ -2354,6 +2362,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev) 


		/* Enable APB */

		reset_control_deassert(cdns_phy->apb_rst);

	}



	for_each_available_child_of_node(dev->of_node, child) {

		struct phy *gphy;
@@ -2423,7 +2432,10 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev) 
		of_property_read_u32(child, "cdns,ssc-mode",

				     &cdns_phy->phys[node].ssc_mode);



		if (!already_configured)

			gphy = devm_phy_create(dev, child, &cdns_torrent_phy_ops);

		else

			gphy = devm_phy_create(dev, child, &noop_ops);

		if (IS_ERR(gphy)) {

			ret = PTR_ERR(gphy);

			goto put_child;
@@ -2507,7 +2519,7 @@ static int cdns_torrent_phy_probe(struct platform_device *pdev) 
		goto put_lnk_rst;

	}



	if (cdns_phy->nsubnodes > 1) {

	if (cdns_phy->nsubnodes > 1 && !already_configured) {

		ret = cdns_torrent_phy_configure_multilink(cdns_phy);

		if (ret)

			goto put_lnk_rst;