Em Tue, 3 Feb 2015 17:30:29 +0000
Sifan Naeem <sifan.naeem@xxxxxxxxxx> escreveu:
> Gets a handle to the system clock, already described in the binding
> document, and calls the appropriate common clock
> framework functions to mark it prepared/enabled, the common clock
> framework initially enables the clock and doesn't disable it at least
> until the device/driver is removed.
> The system clock to IR is needed for the driver to communicate with the
> IR hardware via MMIO accesses on the system bus, so it must not be
> disabled during use or the driver will malfunction.
Hmm... patchwork has two versions of this patch, but I have only one on
my e-mail.
Could you please check if I applied the right one? If not, please
send me an email with a fixup patch.
Thanks!
Mauro
>
> Signed-off-by: Sifan Naeem <sifan.naeem@xxxxxxxxxx>
> ---
> drivers/media/rc/img-ir/img-ir-core.c | 13 +++++++++----
> drivers/media/rc/img-ir/img-ir.h | 2 ++
> 2 files changed, 11 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/rc/img-ir/img-ir-core.c b/drivers/media/rc/img-ir/img-ir-core.c
> index 77c78de..783dd21 100644
> --- a/drivers/media/rc/img-ir/img-ir-core.c
> +++ b/drivers/media/rc/img-ir/img-ir-core.c
> @@ -60,6 +60,8 @@ static void img_ir_setup(struct img_ir_priv *priv)
>
> if (!IS_ERR(priv->clk))
> clk_prepare_enable(priv->clk);
> + if (!IS_ERR(priv->sys_clk))
> + clk_prepare_enable(priv->sys_clk);
> }
>
> static void img_ir_ident(struct img_ir_priv *priv)
> @@ -110,10 +112,11 @@ static int img_ir_probe(struct platform_device *pdev)
> priv->clk = devm_clk_get(&pdev->dev, "core");
> if (IS_ERR(priv->clk))
> dev_warn(&pdev->dev, "cannot get core clock resource\n");
> - /*
> - * The driver doesn't need to know about the system ("sys") or power
> - * modulation ("mod") clocks yet
> - */
> +
> + /* Get sys clock */
> + priv->sys_clk = devm_clk_get(&pdev->dev, "sys");
> + if (IS_ERR(priv->sys_clk))
> + dev_warn(&pdev->dev, "cannot get sys clock resource\n");
>
> /* Set up raw & hw decoder */
> error = img_ir_probe_raw(priv);
> @@ -152,6 +155,8 @@ static int img_ir_remove(struct platform_device *pdev)
>
> if (!IS_ERR(priv->clk))
> clk_disable_unprepare(priv->clk);
> + if (!IS_ERR(priv->sys_clk))
> + clk_disable_unprepare(priv->sys_clk);
> return 0;
> }
>
> diff --git a/drivers/media/rc/img-ir/img-ir.h b/drivers/media/rc/img-ir/img-ir.h
> index 2ddf560..f1387c0 100644
> --- a/drivers/media/rc/img-ir/img-ir.h
> +++ b/drivers/media/rc/img-ir/img-ir.h
> @@ -138,6 +138,7 @@ struct clk;
> * @dev: Platform device.
> * @irq: IRQ number.
> * @clk: Input clock.
> + * @sys_clk: System clock.
> * @reg_base: Iomem base address of IR register block.
> * @lock: Protects IR registers and variables in this struct.
> * @raw: Driver data for raw decoder.
> @@ -147,6 +148,7 @@ struct img_ir_priv {
> struct device *dev;
> int irq;
> struct clk *clk;
> + struct clk *sys_clk;
> void __iomem *reg_base;
> spinlock_t lock;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
