On 06/06/2015 11:42 PM, Geert Uytterhoeven wrote:
> Hi Hans,
>
> On Fri, Jun 5, 2015 at 12:59 PM, Hans Verkuil <hverkuil@xxxxxxxxx> wrote:
>> From: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>>
>> Bitrot has set in for this driver and the sh-vou.0 clock was never enabled,
>> so this driver didn't do anything. In addition, the clock was incorrectly
>> defined in clock-sh7724.c. Fix this.
>
> I think the clock should be enabled automatically using Runtime PM.
> drivers/sh/pm_runtime.c should configure the "NULL" (i.e. the first) clock
> for power management, after which pm_runtime_get_sync() will enable it.
Ah, that works too after I fixed a small bug in sh_vou_release (status should
have been reset to SH_VOU_INITIALISING).
>> While we're at it: use proper resource managed calls.
>
> Shouldn't that be a separate patch? Especially if the real fix becomes a
> one-liner (see below).
I'll split it up.
>> Signed-off-by: Hans Verkuil <hans.verkuil@xxxxxxxxx>
>> Cc: Magnus Damm <damm@xxxxxxxxxxxxx>
>> ---
>> arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +-
>> drivers/media/platform/sh_vou.c | 54 ++++++++++++----------------------
>> 2 files changed, 20 insertions(+), 36 deletions(-)
>>
>> diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
>> index c187b95..f1df899 100644
>> --- a/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
>> +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7724.c
>> @@ -343,7 +343,7 @@ static struct clk_lookup lookups[] = {
>> CLKDEV_CON_ID("2ddmac0", &mstp_clks[HWBLK_2DDMAC]),
>> CLKDEV_DEV_ID("sh_fsi.0", &mstp_clks[HWBLK_SPU]),
>> CLKDEV_CON_ID("jpu0", &mstp_clks[HWBLK_JPU]),
>> - CLKDEV_DEV_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),
>> + CLKDEV_CON_ID("sh-vou.0", &mstp_clks[HWBLK_VOU]),
>
> I don't know which SH board you have, but both
> arch/sh/boards/mach-ecovec24/setup.c and
> arch/sh/boards/mach-se/7724/setup.c create the platform device as:
I have a R0P7724LC0011/21RL (mach-ecovec24 based) board.
>
> static struct platform_device vou_device = {
> .name = "sh-vou",
> .id = -1,
> };
>
> so unless I'm mistaken, the platform device's name will be "sh-vou",
> not "sh-vou.0".
>
> Does it work if you just correct the name in the CLKDEV_DEV_ID() line?
Yes, that works.
Thanks for the help, I'll report this patch series with these fixes.
Regards,
Hans
>
> Thanks!
>
> Gr{oetje,eeting}s,
>
> Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> -- Linus Torvalds
> --
> 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
>
--
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
