]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
media: atmel-isc: Fix clock ID for clk_prepare/unprepare
authorWenyou Yang <wenyou.yang@microchip.com>
Mon, 30 Oct 2017 00:46:50 +0000 (20:46 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Tue, 31 Oct 2017 11:29:43 +0000 (07:29 -0400)
Fix the clock ID to do the runtime pm should be ISC_ISPCK,
instead of ISC_MCK in clk_prepare(), clk_unprepare() and
isc_clk_is_enabled().

Signed-off-by: Wenyou Yang <wenyou.yang@microchip.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/media/platform/atmel/atmel-isc.c

index 8b37656f035dfd0f040e53fe2d600402a7f9c44b..30f2867c29326618f9a3daef86ba3c417cd216f5 100644 (file)
@@ -598,7 +598,7 @@ static int isc_clk_prepare(struct clk_hw *hw)
 {
        struct isc_clk *isc_clk = to_isc_clk(hw);
 
-       if (isc_clk->id == ISC_MCK)
+       if (isc_clk->id == ISC_ISPCK)
                pm_runtime_get_sync(isc_clk->dev);
 
        return isc_wait_clk_stable(hw);
@@ -610,7 +610,7 @@ static void isc_clk_unprepare(struct clk_hw *hw)
 
        isc_wait_clk_stable(hw);
 
-       if (isc_clk->id == ISC_MCK)
+       if (isc_clk->id == ISC_ISPCK)
                pm_runtime_put_sync(isc_clk->dev);
 }
 
@@ -657,12 +657,12 @@ static int isc_clk_is_enabled(struct clk_hw *hw)
        struct isc_clk *isc_clk = to_isc_clk(hw);
        u32 status;
 
-       if (isc_clk->id == ISC_MCK)
+       if (isc_clk->id == ISC_ISPCK)
                pm_runtime_get_sync(isc_clk->dev);
 
        regmap_read(isc_clk->regmap, ISC_CLKSR, &status);
 
-       if (isc_clk->id == ISC_MCK)
+       if (isc_clk->id == ISC_ISPCK)
                pm_runtime_put_sync(isc_clk->dev);
 
        return status & ISC_CLK(isc_clk->id) ? 1 : 0;