iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: atmel-isc: Fix clock ID for clk_prepare/unprepare

Browse Source 
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>
This commit is contained in:
Wenyou Yang 2017-10-29 20:46:50 -04:00 committed by Mauro Carvalho Chehab
parent bf3881707b
commit d7ca1c9c15
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/media/platform/atmel/atmel-isc.c
View File

@ -598,7 +598,7 @@ static int isc_clk_prepare(struct clk_hw *hw)
{ {
struct isc_clk *isc_clk = to_isc_clk(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); pm_runtime_get_sync(isc_clk->dev);
return isc_wait_clk_stable(hw); return isc_wait_clk_stable(hw);
@ -610,7 +610,7 @@ static void isc_clk_unprepare(struct clk_hw *hw)
isc_wait_clk_stable(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); 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); struct isc_clk *isc_clk = to_isc_clk(hw);
u32 status; u32 status;
if (isc_clk->id == ISC_MCK) if (isc_clk->id == ISC_ISPCK)
pm_runtime_get_sync(isc_clk->dev); pm_runtime_get_sync(isc_clk->dev);
regmap_read(isc_clk->regmap, ISC_CLKSR, &status); 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); pm_runtime_put_sync(isc_clk->dev);
return status & ISC_CLK(isc_clk->id) ? 1 : 0; return status & ISC_CLK(isc_clk->id) ? 1 : 0;