]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sh: sh7757: switch RSPI clock to dev ID match
authorGeert Uytterhoeven <geert+renesas@linux-m68k.org>
Thu, 3 Apr 2014 21:46:43 +0000 (14:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Apr 2014 23:20:53 +0000 (16:20 -0700)
Switch the RSPI MSTP clock on SH7757 from a con ID match to a dev ID
match, so we can start looking it up using clk_get() with a NULL ID.

Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/sh/kernel/cpu/sh4a/clock-sh7757.c

index e84a43229b9c5af1ec9c7935c8cf8150c698cdac..5c0e3c33516168891aebe5f3283b90fe179ba1af 100644 (file)
@@ -132,7 +132,7 @@ static struct clk_lookup lookups[] = {
        CLKDEV_CON_ID("usb_fck", &mstp_clks[MSTP103]),
        CLKDEV_DEV_ID("renesas_usbhs.0", &mstp_clks[MSTP102]),
        CLKDEV_CON_ID("mmc0", &mstp_clks[MSTP220]),
-       CLKDEV_CON_ID("rspi2", &mstp_clks[MSTP127]),
+       CLKDEV_DEV_ID("rspi.2", &mstp_clks[MSTP127]),
 };
 
 int __init arch_clk_init(void)