From: swarren@nvidia.com (Stephen Warren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/5] ARM: Tegra: Rename I2S clocks to match driver name
Date: Wed, 23 Feb 2011 11:58:49 -0700 [thread overview]
Message-ID: <1298487532-5000-3-git-send-email-swarren@nvidia.com> (raw)
In-Reply-To: <1298487532-5000-1-git-send-email-swarren@nvidia.com>
The driver is tegra-i2s not just i2s. Rename the clocks to match, so that
clk_get_sys can look up by driver name.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
NOTE: This patch should apply right now.
arch/arm/mach-tegra/tegra2_clocks.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-tegra/tegra2_clocks.c b/arch/arm/mach-tegra/tegra2_clocks.c
index 3015a2c..ee3f9d7 100644
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@ -2128,8 +2128,8 @@ struct clk tegra_list_clks[] = {
PERIPH_CLK("apbdma", "tegra-dma", NULL, 34, 0, 108000000, mux_pclk, 0),
PERIPH_CLK("rtc", "rtc-tegra", NULL, 4, 0, 32768, mux_clk_32k, PERIPH_NO_RESET),
PERIPH_CLK("timer", "timer", NULL, 5, 0, 26000000, mux_clk_m, 0),
- PERIPH_CLK("i2s1", "i2s.0", NULL, 11, 0x100, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
- PERIPH_CLK("i2s2", "i2s.1", NULL, 18, 0x104, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
+ PERIPH_CLK("i2s1", "tegra-i2s.0", NULL, 11, 0x100, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
+ PERIPH_CLK("i2s2", "tegra-i2s.1", NULL, 18, 0x104, 26000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
PERIPH_CLK("spdif_out", "spdif_out", NULL, 10, 0x108, 100000000, mux_pllaout0_audio2x_pllp_clkm, MUX | DIV_U71),
PERIPH_CLK("spdif_in", "spdif_in", NULL, 10, 0x10c, 100000000, mux_pllp_pllc_pllm, MUX | DIV_U71),
PERIPH_CLK("pwm", "pwm", NULL, 17, 0x110, 432000000, mux_pllp_pllc_audio_clkm_clk32, MUX | DIV_U71),
--
1.7.1
next prev parent reply other threads:[~2011-02-23 18:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-23 18:58 [PATCH 0/5] ARM: Tegra: Harmony: Enable audio driver Stephen Warren
2011-02-23 18:58 ` [PATCH 1/5] ARM: Tegra: Add devices.c entries for audio Stephen Warren
2011-02-23 21:04 ` Colin Cross
2011-02-23 18:58 ` Stephen Warren [this message]
2011-02-23 21:06 ` [PATCH 2/5] ARM: Tegra: Rename I2S clocks to match driver name Colin Cross
2011-02-23 18:58 ` [PATCH 3/5] ARM: Tegra: Rename clk_dev1/2 to cdev1/2 Stephen Warren
2011-02-23 21:06 ` Colin Cross
2011-02-23 18:58 ` [PATCH 4/5] ARM: Tegra: Create defines for GPIO names Stephen Warren
2011-02-23 19:08 ` Colin Cross
2011-02-23 20:35 ` Stephen Warren
2011-02-23 20:39 ` Colin Cross
2011-02-23 20:49 ` Stephen Warren
2011-02-23 20:58 ` Colin Cross
2011-02-23 18:58 ` [PATCH 5/5] ARM: Tegra: Enable Harmony audio support Stephen Warren
2011-02-23 21:08 ` Colin Cross
2011-02-23 21:16 ` Stephen Warren
2011-02-23 21:19 ` Colin Cross
2011-02-23 21:08 ` Olof Johansson
2011-02-23 21:15 ` Colin Cross
2011-02-23 21:21 ` Olof Johansson
2011-02-23 21:22 ` Stephen Warren
2011-02-23 21:25 ` Olof Johansson
2011-02-23 21:21 ` Colin Cross
2011-02-23 21:24 ` Olof Johansson
2011-02-23 21:35 ` Stephen Warren
2011-02-23 21:51 ` Olof Johansson
2011-02-23 21:54 ` Stephen Warren
2011-02-23 22:48 ` Russell King - ARM Linux
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=1298487532-5000-3-git-send-email-swarren@nvidia.com \
--to=swarren@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).