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

Commit c2a25e81 authored by Paul Mundt's avatar Paul Mundt
Browse files

clocksource: Deprecate clock string across the SH drivers. 



We want to get rid of the clock string from platform data entirely,
depending on the clkdev-based clock lookup to do the right thing for us
instead.

This converts all of the SH drivers to request their associated function
clocks directly, and if there is no match for that then we fall back on
the legacy lookup while warning about it. After all of the outstanding
CPUs have been converted to clkdev lookups the clock string will be
killed off completely.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 620bb636

drivers/clocksource/sh_cmt.c

+8 −4
Original line number Diff line number Diff line
@@ -608,12 +608,16 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) 
	p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;



	/* get hold of clock */

	p->clk = clk_get(&p->pdev->dev, "cmt_fck");

	if (IS_ERR(p->clk)) {

		dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");

		p->clk = clk_get(&p->pdev->dev, cfg->clk);

		if (IS_ERR(p->clk)) {

			dev_err(&p->pdev->dev, "cannot get clock\n");

			ret = PTR_ERR(p->clk);

			goto err1;

		}

	}



	if (resource_size(res) == 6) {

		p->width = 16;

drivers/clocksource/sh_mtu2.c

+8 −4
Original line number Diff line number Diff line
@@ -283,12 +283,16 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) 
	p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;



	/* get hold of clock */

	p->clk = clk_get(&p->pdev->dev, "mtu2_fck");

	if (IS_ERR(p->clk)) {

		dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");

		p->clk = clk_get(&p->pdev->dev, cfg->clk);

		if (IS_ERR(p->clk)) {

			dev_err(&p->pdev->dev, "cannot get clock\n");

			ret = PTR_ERR(p->clk);

			goto err1;

		}

	}



	return sh_mtu2_register(p, (char *)dev_name(&p->pdev->dev),

				cfg->clockevent_rating);

drivers/clocksource/sh_tmu.c

+8 −4
Original line number Diff line number Diff line
@@ -387,12 +387,16 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) 
	p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL;



	/* get hold of clock */

	p->clk = clk_get(&p->pdev->dev, "tmu_fck");

	if (IS_ERR(p->clk)) {

		dev_warn(&p->pdev->dev, "using deprecated clock lookup\n");

		p->clk = clk_get(&p->pdev->dev, cfg->clk);

		if (IS_ERR(p->clk)) {

			dev_err(&p->pdev->dev, "cannot get clock\n");

			ret = PTR_ERR(p->clk);

			goto err1;

		}

	}



	return sh_tmu_register(p, (char *)dev_name(&p->pdev->dev),

			       cfg->clockevent_rating,