tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sh: fix clock-sh7757 for the latest sh_mobile_sdhi driver

The commit 996bc8aebd2cd5b6d4c5d85085f171fa2447f364 (mmc: sh_mobile_sdhi:
do not manage PM clocks manually) modified the sh_mobile_sdhi driver to
remove the clk_enable/clk_disable. So, we need to change
the "CLKDEV_CON_ID" to "CLKDEV_DEV_ID".

If we don't change this, we will see the following error from the driver:
sh_mobile_sdhi sh_mobile_sdhi.0: timeout waiting for hardware interrupt (CMD52)

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

authored by Shimoda, Yoshihiro and committed by Paul Mundt a052d2c3 915ab177

options
unified split
Changed files
+1 -1
arch
sh
kernel
cpu
sh4a
clock-sh7757.c
+1 -1
arch/sh/kernel/cpu/sh4a/clock-sh7757.c
··· 113 113 CLKDEV_CON_ID("cpu_clk", &div4_clks[DIV4_I]), 114 114 115 115 /* MSTP32 clocks */ 116 - CLKDEV_CON_ID("sdhi0", &mstp_clks[MSTP004]), 116 + CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP004]), 117 117 CLKDEV_CON_ID("riic0", &mstp_clks[MSTP000]), 118 118 CLKDEV_CON_ID("riic1", &mstp_clks[MSTP000]), 119 119 CLKDEV_CON_ID("riic2", &mstp_clks[MSTP000]),