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

Commit Message

Troy Kisky July 13, 2009, 7:47 p.m. UTC

Russell King - ARM Linux wrote:
> On Fri, Jul 10, 2009 at 12:47:50PM -0700, Troy Kisky wrote:
>> Mani, Arun wrote:
>>> Hi,
>>> I am trying the latest 2.6.31 rc2 branch. I am trying to make the Audio work.
>>>  I found that the I2S clock is set to NULL. Because of this I am getting a NODEV error.
>>> If I commented the check, I was able to map the I2S to the AIC33X. but I am not getting any sound.
>> You need a clock, so don't comment out the check, rather give it one. ie.
>>
>> +static struct snd_platform_data snd_data = {
>> +       .clk_name       = "asp0",
>> +};
>> +
> 
> This is broken from the clk API perspective.  clock "names" must not
> be passed via platform data.  If you want to do that kind of thing you
> might as well give up with the clk API and stop abusing it.
>

Then this patch needs further review. I added Chaithrika to the CC.


commit 2a0232a115e81a4687d7ae07d5e1f2719a67f8a8
Author: Chaithrika U S <[e-mail]>
Date:   Fri Jun 5 06:28:08 2009 -0400

    davinci: ASoC: Add the platform devices for ASP

    1) Registers the platform devices for ASP on dm355, dm644x and dm646x
       so that the machine driver can probe to get ASP related platform
       data.
    2) Move towards definition of the asp clocks using physical name(for
       dm355 and dm644x)
    3) Add platform data to board specific files.

    Signed-off-by: Naresh Medisetty <[e-mail]>
    Signed-off-by: Chaithrika U S <[e-mail]>
    Signed-off-by: Kevin Hilman <[e-mail]>

Patch

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 5ac2f56..78a9604 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -118,6 +118,10 @@  static struct davinci_i2c_platform_data i2c_pdata = {
        .bus_delay      = 0     /* usec */,
 };

+static struct snd_platform_data dm355_evm_snd_data = {
+       .clk_name       = "asp1",
+};
+
 static int dm355evm_mmc_gpios = -EINVAL;

 static void dm355evm_mmcsd_gpios(unsigned gpio)
@@ -280,6 +284,9 @@  static __init void dm355_evm_init(void)

        dm355_init_spi0(BIT(0), dm355_evm_spi_info,
                        ARRAY_SIZE(dm355_evm_spi_info));
+
+       /* DM335 EVM uses ASP1; line-out is a stereo mini-jack */
+       dm355_init_asp1(ASP1_TX_EVT_EN | ASP1_RX_EVT_EN, &dm355_evm_snd_data);
 }