p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iio: adc: rcar-gyroadc: Derive interface clock speed from fck clock 

The "if" interface clock speed is actually derived from the "fck"
block clock, as in the hardware they are the same clock. Drop the
incorrect second "if" clock and get the clock speed from "fck".

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: linux-renesas-soc@vger.kernel.org
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Marek Vasut 2017-04-20 17:43:10 +02:00 committed by Jonathan Cameron
parent 7383d44b84
commit 1a732f4211
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/iio/adc/rcar-gyroadc.c
View File

@ -73,7 +73,7 @@ enum rcar_gyroadc_model {
struct rcar_gyroadc { struct rcar_gyroadc {
struct device *dev; struct device *dev;
void __iomem *regs; void __iomem *regs;
struct clk *iclk; struct clk *clk;
struct regulator *vref[8]; struct regulator *vref[8];
unsigned int num_channels; unsigned int num_channels;
enum rcar_gyroadc_model model; enum rcar_gyroadc_model model;
@ -83,7 +83,7 @@ struct rcar_gyroadc {
static void rcar_gyroadc_hw_init(struct rcar_gyroadc *priv) static void rcar_gyroadc_hw_init(struct rcar_gyroadc *priv)
{ {
const unsigned long clk_mhz = clk_get_rate(priv->iclk) / 1000000; const unsigned long clk_mhz = clk_get_rate(priv->clk) / 1000000;
const unsigned long clk_mul = const unsigned long clk_mul =
(priv->mode == RCAR_GYROADC_MODE_SELECT_1_MB88101A) ? 10 : 5; (priv->mode == RCAR_GYROADC_MODE_SELECT_1_MB88101A) ? 10 : 5;
unsigned long clk_len = clk_mhz * clk_mul; unsigned long clk_len = clk_mhz * clk_mul;
@ -510,9 +510,9 @@ static int rcar_gyroadc_probe(struct platform_device *pdev)
if (IS_ERR(priv->regs)) if (IS_ERR(priv->regs))
return PTR_ERR(priv->regs); return PTR_ERR(priv->regs);
priv->iclk = devm_clk_get(dev, "if"); priv->clk = devm_clk_get(dev, "fck");
if (IS_ERR(priv->iclk)) { if (IS_ERR(priv->clk)) {
ret = PTR_ERR(priv->iclk); ret = PTR_ERR(priv->clk);
if (ret != -EPROBE_DEFER) if (ret != -EPROBE_DEFER)
dev_err(dev, "Failed to get IF clock (ret=%i)\n", ret); dev_err(dev, "Failed to get IF clock (ret=%i)\n", ret);
return ret; return ret;
@ -536,7 +536,7 @@ static int rcar_gyroadc_probe(struct platform_device *pdev)
indio_dev->info = &rcar_gyroadc_iio_info; indio_dev->info = &rcar_gyroadc_iio_info;
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
ret = clk_prepare_enable(priv->iclk); ret = clk_prepare_enable(priv->clk);
if (ret) { if (ret) {
dev_err(dev, "Could not prepare or enable the IF clock.\n"); dev_err(dev, "Could not prepare or enable the IF clock.\n");
goto err_clk_if_enable; goto err_clk_if_enable;
@ -565,7 +565,7 @@ static int rcar_gyroadc_probe(struct platform_device *pdev)
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
pm_runtime_disable(dev); pm_runtime_disable(dev);
pm_runtime_set_suspended(dev); pm_runtime_set_suspended(dev);
clk_disable_unprepare(priv->iclk); clk_disable_unprepare(priv->clk);
err_clk_if_enable: err_clk_if_enable:
rcar_gyroadc_deinit_supplies(indio_dev); rcar_gyroadc_deinit_supplies(indio_dev);
@ -584,7 +584,7 @@ static int rcar_gyroadc_remove(struct platform_device *pdev)
pm_runtime_put_sync(dev); pm_runtime_put_sync(dev);
pm_runtime_disable(dev); pm_runtime_disable(dev);
pm_runtime_set_suspended(dev); pm_runtime_set_suspended(dev);
clk_disable_unprepare(priv->iclk); clk_disable_unprepare(priv->clk);
rcar_gyroadc_deinit_supplies(indio_dev); rcar_gyroadc_deinit_supplies(indio_dev);
return 0; return 0;