summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorWenyou Yang <wenyou.yang@microchip.com>2017-10-29 20:46:50 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2017-10-31 07:29:43 -0400
commitd7ca1c9c15e309344e8dcd19826434359dff33b7 (patch)
treeeb1cac1ee30da06c6027dbc5f500a23693de745b /drivers/media
parentbf3881707b6f6350c3f8f8ff15524b6d719847bc (diff)
media: atmel-isc: Fix clock ID for clk_prepare/unprepare
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/atmel/atmel-isc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/platform/atmel/atmel-isc.c b/drivers/media/platform/atmel/atmel-isc.c
index 8b37656f035d..30f2867c2932 100644
--- a/drivers/media/platform/atmel/atmel-isc.c
+++ b/drivers/media/platform/atmel/atmel-isc.c
@@ -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;