davinci: audio clocks: use struct device instead of clock names

There is no need to pass clock name strings in platform_data.
Instead, setup clkdev nodes to have correct ASoC device names.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 4ef6dbeccf3c5d84450447658437513e6411bcb6..38157f78e1a4a07c5ed84aca9e54b1e11dcebfbb 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -117,9 +117,7 @@ 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 struct snd_platform_data dm355_evm_snd_data;
 
 static int dm355evm_mmc_gpios = -EINVAL;
 

diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index d37f5c204b66609508f8ad10d039d553c1f4b9a5..6a27c5db328291dff19af9668b7a284ee5a92996 100644 (file)
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -225,9 +225,7 @@ static struct platform_device ide_dev = {
        },
 };
 
-static struct snd_platform_data dm644x_evm_snd_data = {
-       .clk_name       = "asp0",
-};
+static struct snd_platform_data dm644x_evm_snd_data;
 
 /*----------------------------------------------------------------------*/
 

diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index fa91520532ac0aac25ff0cf8162291cedba28844..cb30afe22050f9d05b5c5ec0c50643db424e8c6d 100644 (file)
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -268,7 +268,6 @@ static u8 dm646x_dit_serializer_direction[] = {
 
 static struct snd_platform_data dm646x_evm_snd_data[] = {
        {
-               .clk_name       = "mcasp0",
                .tx_dma_offset  = 0x400,
                .rx_dma_offset  = 0x400,
                .op_mode        = DAVINCI_MCASP_IIS_MODE,
@@ -278,7 +277,6 @@ static struct snd_platform_data dm646x_evm_snd_data[] = {
                .eventq_no      = EVENTQ_0,
        },
        {
-               .clk_name       = "mcasp1",
                .tx_dma_offset  = 0x400,
                .rx_dma_offset  = 0,
                .op_mode        = DAVINCI_MCASP_DIT_MODE,

diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index b4d709a8612ab6ff1a195f4506731e512ef32f50..3abeb3eb9b2498b6258b494631fce5312944f011 100644 (file)
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -361,8 +361,8 @@ static struct davinci_clk dm355_clks[] = {
        CLK(NULL, "uart1", &uart1_clk),
        CLK(NULL, "uart2", &uart2_clk),
        CLK("i2c_davinci.1", NULL, &i2c_clk),
-       CLK(NULL, "asp0", &asp0_clk),
-       CLK(NULL, "asp1", &asp1_clk),
+       CLK("davinci-asp.0", NULL, &asp0_clk),
+       CLK("davinci-asp.1", NULL, &asp1_clk),
        CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
        CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
        CLK(NULL, "spi0", &spi0_clk),
@@ -648,7 +648,7 @@ static struct resource dm355_asp1_resources[] = {
 
 static struct platform_device dm355_asp1_device = {
        .name           = "davinci-asp",
-       .id             = -1,
+       .id             = 1,
        .num_resources  = ARRAY_SIZE(dm355_asp1_resources),
        .resource       = dm355_asp1_resources,
 };

diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index 55317b1cf865e1efacef8fc3b0efebe9448f1f81..e554aa6c9a84994ecdb3aa14750dabd88e711e86 100644 (file)
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -304,7 +304,7 @@ struct davinci_clk dm644x_clks[] = {
        CLK("davinci_emac.1", NULL, &emac_clk),
        CLK("i2c_davinci.1", NULL, &i2c_clk),
        CLK("palm_bk3710", NULL, &ide_clk),
-       CLK(NULL, "asp0", &asp_clk),
+       CLK("davinci-asp", NULL, &asp_clk),
        CLK("davinci_mmc.0", NULL, &mmcsd_clk),
        CLK(NULL, "spi", &spi_clk),
        CLK(NULL, "gpio", &gpio_clk),

diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 3516f7699db2f73464d69b29dbee1a4b4667af45..8fa28039f27ef451b7b70d3fabe2525d8b2dd284 100644 (file)
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -334,8 +334,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("davinci-mcasp.0", NULL, &mcasp0_clk),
+       CLK("davinci-mcasp.1", NULL, &mcasp1_clk),
        CLK(NULL, "aemif", &aemif_clk),
        CLK("davinci_emac.1", NULL, &emac_clk),
        CLK(NULL, "pwm0", &pwm0_clk),

diff --git a/arch/arm/mach-davinci/include/mach/asp.h b/arch/arm/mach-davinci/include/mach/asp.h
index 038ecb7c231b789bb956dec66d38cfc291e6a5f8..cdf1f444233021e7d23d99500ba6f6029adcee92 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/asp.h
+++ b/arch/arm/mach-davinci/include/mach/asp.h
@@ -33,7 +33,6 @@
 #define DAVINCI_ASP1_TX_INT    IRQ_MBXINT
 
 struct snd_platform_data {
-       char *clk_name;
        u32 tx_dma_offset;
        u32 rx_dma_offset;
        enum dma_event_q eventq_no;     /* event queue number */