[07/26] davinci: dm646x: Adds McASP clock

Commit Message

Kevin Hilman July 6, 2009, 9:14 p.m. UTC

From: Chaithrika U S <[e-mail]>

Adds McASP clock support for the two instances of mcasp (mcasp0,mcasp1). This
patch is part of the audio support for dm646x series.

Signed-off-by: Naresh Medisetty <[e-mail]>
Signed-off-by: Chaithrika U S <[e-mail]>
Signed-off-by: Kevin Hilman <[e-mail]>
---
 arch/arm/mach-davinci/dm646x.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 deletions(-)

Comments

Kevin Hilman July 6, 2009, 9:50 p.m. UTC | #1

Mark Brown <[e-mail]> writes:

> On Mon, Jul 06, 2009 at 02:14:41PM -0700, Kevin Hilman wrote:
>> From: Chaithrika U S <[e-mail]>
>> 
>> Adds McASP clock support for the two instances of mcasp (mcasp0,mcasp1). This
>> patch is part of the audio support for dm646x series.
>> 
>> Signed-off-by: Naresh Medisetty <[e-mail]>
>> Signed-off-by: Chaithrika U S <[e-mail]>
>> Signed-off-by: Kevin Hilman <[e-mail]>
>
> I guess it's safe for me to go ahead and merge the ASoC changes that
> were waiting for this now, then?  

Yes, go ahead.

> IIRC it's runtime dependencies only so there should be no merge
> issues.

There shouldn't be any merge issues, but there will be some compile
issues.

The DaVinci core had some EDMA changes which are now part of my
'davinci-next' queue in DaVinci git[1].

Also, in the same tree, I have a 'davinci-next-drivers' branch which
includes a commit for the ASoC changes needed on top of the EDMA API
changes, as well as another unrelated change for default volume.  I'll
send those to alsa-devel shortly.

Kevin

[1] http://git.kernel.org/?p=linux/kernel/git/khilman/linux-davinci.git

Patch

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 5326edf..e4d7d0f 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -227,6 +227,18 @@  static struct clk gpio_clk = {
 	.lpsc = DM646X_LPSC_GPIO,
 };
 
+static struct clk mcasp0_clk = {
+	.name = "mcasp0",
+	.parent = &pll1_sysclk3,
+	.lpsc = DM646X_LPSC_McASP0,
+};
+
+static struct clk mcasp1_clk = {
+	.name = "mcasp1",
+	.parent = &pll1_sysclk3,
+	.lpsc = DM646X_LPSC_McASP1,
+};
+
 static struct clk aemif_clk = {
 	.name = "aemif",
 	.parent = &pll1_sysclk3,
@@ -314,6 +326,8 @@  struct davinci_clk dm646x_clks[] = {
 	CLK(NULL, "uart2", &uart2_clk),
 	CLK("i2c_davinci.1", NULL, &i2c_clk),
 	CLK(NULL, "gpio", &gpio_clk),
+	CLK(NULL, "mcasp0", &mcasp0_clk),
+	CLK(NULL, "mcasp1", &mcasp1_clk),
 	CLK(NULL, "aemif", &aemif_clk),
 	CLK("davinci_emac.1", NULL, &emac_clk),
 	CLK(NULL, "pwm0", &pwm0_clk),