1 files changed, 10 insertions, 14 deletions

diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index 2009a9bc6356..6609beb9b9b4 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -170,15 +170,11 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP010] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 10, 0), /* SSI2 */
         [MSTP009] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  9, 0), /* SSI3 */
         [MSTP008] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  8, 0), /* SRU */
-        [MSTP007] = SH_CLK_MSTP32(&p_clk, MSTPCR0,  7, 0), /* HSPI */
+        [MSTP007] = SH_CLK_MSTP32(&s_clk, MSTPCR0,  7, 0), /* HSPI */
 };
 
 static struct clk_lookup lookups[] = {
         /* main */
-        CLKDEV_CON_ID("audio_clk_a",    &audio_clk_a),
-        CLKDEV_CON_ID("audio_clk_b",    &audio_clk_b),
-        CLKDEV_CON_ID("audio_clk_c",    &audio_clk_c),
-        CLKDEV_CON_ID("audio_clk_internal",     &s1_clk),
         CLKDEV_CON_ID("shyway_clk",     &s_clk),
         CLKDEV_CON_ID("peripheral_clk", &p_clk),
 
@@ -234,15 +230,15 @@ static struct clk_lookup lookups[] = {
         CLKDEV_ICK_ID("ssi.6", "rcar_sound", &mstp_clks[MSTP309]),
         CLKDEV_ICK_ID("ssi.7", "rcar_sound", &mstp_clks[MSTP308]),
         CLKDEV_ICK_ID("ssi.8", "rcar_sound", &mstp_clks[MSTP307]),
-        CLKDEV_ICK_ID("scu.0", "rcar_sound", &mstp_clks[MSTP531]),
-        CLKDEV_ICK_ID("scu.1", "rcar_sound", &mstp_clks[MSTP530]),
-        CLKDEV_ICK_ID("scu.2", "rcar_sound", &mstp_clks[MSTP529]),
-        CLKDEV_ICK_ID("scu.3", "rcar_sound", &mstp_clks[MSTP528]),
-        CLKDEV_ICK_ID("scu.4", "rcar_sound", &mstp_clks[MSTP527]),
-        CLKDEV_ICK_ID("scu.5", "rcar_sound", &mstp_clks[MSTP526]),
-        CLKDEV_ICK_ID("scu.6", "rcar_sound", &mstp_clks[MSTP525]),
-        CLKDEV_ICK_ID("scu.7", "rcar_sound", &mstp_clks[MSTP524]),
-        CLKDEV_ICK_ID("scu.8", "rcar_sound", &mstp_clks[MSTP523]),
+        CLKDEV_ICK_ID("src.0", "rcar_sound", &mstp_clks[MSTP531]),
+        CLKDEV_ICK_ID("src.1", "rcar_sound", &mstp_clks[MSTP530]),
+        CLKDEV_ICK_ID("src.2", "rcar_sound", &mstp_clks[MSTP529]),
+        CLKDEV_ICK_ID("src.3", "rcar_sound", &mstp_clks[MSTP528]),
+        CLKDEV_ICK_ID("src.4", "rcar_sound", &mstp_clks[MSTP527]),
+        CLKDEV_ICK_ID("src.5", "rcar_sound", &mstp_clks[MSTP526]),
+        CLKDEV_ICK_ID("src.6", "rcar_sound", &mstp_clks[MSTP525]),
+        CLKDEV_ICK_ID("src.7", "rcar_sound", &mstp_clks[MSTP524]),
+        CLKDEV_ICK_ID("src.8", "rcar_sound", &mstp_clks[MSTP523]),
 };
 
 void __init r8a7778_clock_init(void)