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

Commit 28f0ccb9 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by David S. Miller
Browse files

drivers: net: davinci_mdio: split reset function on init_clk and enable 



The Davinci MDIO MDIO_CONTROL.CLKDIV can be calculated only once
during probe, hence split __davinci_mdio_reset() on
davinci_mdio_init_clk() and davinci_mdio_enable(). Initialize and
save CLKDIV in .probe(). Then just use saved value.

Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a01d7baa

drivers/net/ethernet/ti/davinci_mdio.c

+14 −7
Original line number Original line Diff line number Diff line
@@ -98,9 +98,10 @@ struct davinci_mdio_data { 
	 * if MDIO bus is registered from DT.

	 * if MDIO bus is registered from DT.

	 */

	 */

	bool		skip_scan;

	bool		skip_scan;

	u32		clk_div;

};

};





static void __davinci_mdio_reset(struct davinci_mdio_data *data)

static void davinci_mdio_init_clk(struct davinci_mdio_data *data)

{

{

	u32 mdio_in, div, mdio_out_khz, access_time;

	u32 mdio_in, div, mdio_out_khz, access_time;
@@ -109,9 +110,7 @@ static void __davinci_mdio_reset(struct davinci_mdio_data *data) 
	if (div > CONTROL_MAX_DIV)

	if (div > CONTROL_MAX_DIV)

		div = CONTROL_MAX_DIV;

		div = CONTROL_MAX_DIV;





	/* set enable and clock divider */

	data->clk_div = div;

	__raw_writel(div | CONTROL_ENABLE, &data->regs->control);



	/*

	/*

	 * One mdio transaction consists of:

	 * One mdio transaction consists of:

	 *	32 bits of preamble

	 *	32 bits of preamble
@@ -132,12 +131,18 @@ static void __davinci_mdio_reset(struct davinci_mdio_data *data) 
		data->access_time = 1;

		data->access_time = 1;

}

}





static void davinci_mdio_enable(struct davinci_mdio_data *data)

{

	/* set enable and clock divider */

	__raw_writel(data->clk_div | CONTROL_ENABLE, &data->regs->control);

}



static int davinci_mdio_reset(struct mii_bus *bus)

static int davinci_mdio_reset(struct mii_bus *bus)

{

{

	struct davinci_mdio_data *data = bus->priv;

	struct davinci_mdio_data *data = bus->priv;

	u32 phy_mask, ver;

	u32 phy_mask, ver;





	__davinci_mdio_reset(data);

	davinci_mdio_enable(data);





	/* wait for scan logic to settle */

	/* wait for scan logic to settle */

	msleep(PHY_MAX_ADDR * data->access_time);

	msleep(PHY_MAX_ADDR * data->access_time);
@@ -188,7 +193,7 @@ static inline int wait_for_user_access(struct davinci_mdio_data *data) 
		 * operation

		 * operation

		 */

		 */

		dev_warn(data->dev, "resetting idled controller\n");

		dev_warn(data->dev, "resetting idled controller\n");

		__davinci_mdio_reset(data);

		davinci_mdio_enable(data);

		return -EAGAIN;

		return -EAGAIN;

	}

	}
@@ -350,6 +355,8 @@ static int davinci_mdio_probe(struct platform_device *pdev) 
	if (IS_ERR(data->regs))

	if (IS_ERR(data->regs))

		return PTR_ERR(data->regs);

		return PTR_ERR(data->regs);





	davinci_mdio_init_clk(data);



	pm_runtime_enable(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);
@@ -425,7 +432,7 @@ static int davinci_mdio_resume(struct device *dev) 
	pinctrl_pm_select_default_state(dev);

	pinctrl_pm_select_default_state(dev);





	/* restart the scan state machine */

	/* restart the scan state machine */

	__davinci_mdio_reset(data);

	davinci_mdio_enable(data);





	return 0;

	return 0;

}

}