davinci: da830: updates for mach-type name change

[safe/jmp/linux-2.6] / arch / arm / mach-davinci / board-dm355-evm.c

diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index 5ac2f56..4ef6dbe 100644 (file)
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -37,7 +37,6 @@
 #include <mach/serial.h>
 #include <mach/nand.h>
 #include <mach/mmc.h>
-#include <mach/common.h>
 
 #define DAVINCI_ASYNC_EMIF_CONTROL_BASE                0x01e10000
 #define DAVINCI_ASYNC_EMIF_DATA_CE0_BASE       0x02000000
@@ -118,6 +117,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 +283,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);
 }
 
 static __init void dm355_evm_irq_init(void)