public inbox for linux-tegra@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
To: ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org
Cc: linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org,
	Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.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-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

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-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  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
     [not found] ` <1298487532-5000-1-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-02-23 18:58   ` [PATCH 1/5] ARM: Tegra: Add devices.c entries for audio Stephen Warren
     [not found]     ` <1298487532-5000-2-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-02-23 21:04       ` Colin Cross
2011-02-23 18:58   ` Stephen Warren [this message]
     [not found]     ` <1298487532-5000-3-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
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
     [not found]     ` <1298487532-5000-4-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-02-23 21:06       ` Colin Cross
2011-02-23 18:58   ` [PATCH 4/5] ARM: Tegra: Create defines for GPIO names Stephen Warren
     [not found]     ` <1298487532-5000-5-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-02-23 19:08       ` Colin Cross
     [not found]         ` <AANLkTinPssv8Wpy0Qe5GAHqN=9dicSLZ8sUmq+JeW2_q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-23 20:35           ` Stephen Warren
     [not found]             ` <74CDBE0F657A3D45AFBB94109FB122FF03112A5D59-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-02-23 20:39               ` Colin Cross
     [not found]                 ` <AANLkTimgB3CZmiVXR9MYTEOXk9uSok12vcVaTTx1tn2M-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-23 20:49                   ` Stephen Warren
     [not found]                     ` <74CDBE0F657A3D45AFBB94109FB122FF03112A5D63-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-02-23 20:58                       ` Colin Cross
2011-02-23 18:58   ` [PATCH 5/5] ARM: Tegra: Enable Harmony audio support Stephen Warren
     [not found]     ` <1298487532-5000-6-git-send-email-swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2011-02-23 21:08       ` Colin Cross
     [not found]         ` <AANLkTi=Nxh8YKBSDhVVAW4Sqzd6yKj=D6X=R+9KT+UBK-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-23 21:16           ` Stephen Warren
     [not found]             ` <74CDBE0F657A3D45AFBB94109FB122FF03112A5D7D-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-02-23 21:19               ` Colin Cross
2011-02-23 21:08       ` Olof Johansson
     [not found]         ` <AANLkTimffVNK2EmTqypQcrWHLisf3c8_dMsHwSbv-nWi-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-23 21:15           ` Colin Cross
     [not found]             ` <AANLkTikk6f0Nv8XZEmY4-85FtBE1re9hKqgFRNZkyPfz-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-23 21:21               ` Olof Johansson
2011-02-23 21:22               ` Stephen Warren
     [not found]                 ` <74CDBE0F657A3D45AFBB94109FB122FF03112A5D88-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-02-23 21:25                   ` Olof Johansson
2011-02-23 21:21           ` Colin Cross
2011-02-23 21:24             ` Olof Johansson
     [not found]               ` <AANLkTinzVinbW_rDt5Rqe7i68P2u_XvDvRWA8R2mq0_9-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2011-02-23 21:35                 ` Stephen Warren
     [not found]                   ` <74CDBE0F657A3D45AFBB94109FB122FF03112A5D95-C7FfzLzN0UxDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2011-02-23 21:51                     ` Olof Johansson
     [not found]                       ` <AANLkTikmP5H6TQN1v1BNbGTfGokHgyXQ5LbFpEWgWjPB-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
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-ddmlm1+adcrqt0dzr+alfa@public.gmane.org \
    --cc=ccross-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
    --cc=konkers-z5hGa2qSFaRBDgjK7y7TUQ@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.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