| From d6fcd883b4a1d3f67ab21d808039a7de55e4a05c Mon Sep 17 00:00:00 2001 |
| From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Date: Sun, 13 Apr 2014 17:56:42 -0700 |
| Subject: ARM: shmobile: r8a7778: remove old style audio clock |
| |
| Current sound driver moves to new style clock, |
| but is keeping compatiblity at this point. |
| Move to new style on r8a7778 |
| |
| Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit a9d83bd6abc00e14e2db1660e2c7d889745bb3aa) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/clock-r8a7778.c | 22 +++++++++------------- |
| 1 file changed, 9 insertions(+), 13 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c |
| index 9989b1b06ffd..6609beb9b9b4 100644 |
| --- a/arch/arm/mach-shmobile/clock-r8a7778.c |
| +++ b/arch/arm/mach-shmobile/clock-r8a7778.c |
| @@ -175,10 +175,6 @@ static struct clk mstp_clks[MSTP_NR] = { |
| |
| 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) |
| -- |
| 2.1.2 |
| |