From: Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>
To: Simon <horms@verge.net.au>, broonie@kernel.org
Cc: Magnus <magnus.damm@gmail.com>,
linux-sh@vger.kernel.org,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
alsa-devel@alsa-project.org
Subject: [PATCH 1/7] ARM: shmobile: r8a7778: remove old style audio clock
Date: Sun, 13 Apr 2014 17:56:42 -0700 (PDT) [thread overview]
Message-ID: <87r45020fs.wl%kuninori.morimoto.gx@gmail.com> (raw)
In-Reply-To: <87sipg20h1.wl%kuninori.morimoto.gx@gmail.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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>
---
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 2009a9b..201fc48 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)
--
1.7.9.5
next prev parent reply other threads:[~2014-04-14 0:56 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-14 0:55 [PATCH 0/7] ARM: shmobile: swtich audio settings to new style, and remove compatibility code from driver Kuninori Morimoto
2014-04-14 0:56 ` Kuninori Morimoto [this message]
2014-04-14 0:56 ` [PATCH 2/7] ARM: shmobile: r8a7790: remove old style audio clock Kuninori Morimoto
2014-04-14 0:56 ` [PATCH 3/7] ARM: shmobile: bockw: " Kuninori Morimoto
2014-04-14 0:57 ` [PATCH 4/7] ARM: shmobile: bockw: switch to use dai info for R-Car sound Kuninori Morimoto
2014-04-14 0:57 ` [PATCH 5/7] ARM: shmobile: lager: " Kuninori Morimoto
2014-04-14 0:57 ` [PATCH 6/7] ASoC: rsnd: remove old clock style support Kuninori Morimoto
2014-04-14 0:57 ` [PATCH 7/7] ASoC: rsnd: remove compatibility code Kuninori Morimoto
2014-04-14 19:03 ` Mark Brown
2014-05-08 0:15 ` Kuninori Morimoto
2014-05-08 5:28 ` Mark Brown
2014-05-08 8:57 ` Kuninori Morimoto
2014-05-08 8:59 ` [PATCH 6/7][resend] ASoC: rsnd: remove old clock style support Kuninori Morimoto
2014-05-08 8:59 ` [PATCH 7/7][resend] ASoC: rsnd: remove compatibility code Kuninori Morimoto
2014-05-08 11:18 ` [PATCH 7/7] " Mark Brown
2014-04-14 3:56 ` [PATCH 0/7] ARM: shmobile: swtich audio settings to new style, and remove compatibility code from driver Simon Horman
2014-04-14 19:01 ` Mark Brown
2014-04-14 22:46 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r45020fs.wl%kuninori.morimoto.gx@gmail.com \
--to=kuninori.morimoto.gx@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox