DaVinci: DM365: Voice codec support for the DM365 SoC

This patch adds the generic Voice Codec support for the DM365 based
platforms.

Signed-off-by: Miguel Aguilar <miguel.aguilar@ridgerun.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index ec15f3d6f61371699a03cdf4b7d36bee9a6d82f4..d5010567b496a660fc0eaa28d05546fb98941470 100644 (file)
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -455,7 +455,7 @@ static struct davinci_clk dm365_clks[] = {
        CLK(NULL, "timer3", &timer3_clk),
        CLK(NULL, "usb", &usb_clk),
        CLK("davinci_emac.1", NULL, &emac_clk),
-       CLK("voice_codec", NULL, &voicecodec_clk),
+       CLK("davinci_voicecodec", NULL, &voicecodec_clk),
        CLK("davinci-asp.0", NULL, &asp0_clk),
        CLK(NULL, "rto", &rto_clk),
        CLK(NULL, "mjcp", &mjcp_clk),
@@ -606,6 +606,8 @@ INT_CFG(DM365,  INT_NSF_DISABLE,     25,    1,    0,     false)
 
 EVT_CFG(DM365, EVT2_ASP_TX,         0,     1,    0,     false)
 EVT_CFG(DM365, EVT3_ASP_RX,         1,     1,    0,     false)
+EVT_CFG(DM365, EVT2_VC_TX,          0,     1,    1,     false)
+EVT_CFG(DM365, EVT3_VC_RX,          1,     1,    1,     false)
 #endif
 };
 
@@ -835,6 +837,31 @@ static struct platform_device dm365_asp_device = {
        .resource       = dm365_asp_resources,
 };
 
+static struct resource dm365_vc_resources[] = {
+       {
+               .start  = DAVINCI_DM365_VC_BASE,
+               .end    = DAVINCI_DM365_VC_BASE + SZ_1K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = DAVINCI_DMA_VC_TX,
+               .end    = DAVINCI_DMA_VC_TX,
+               .flags  = IORESOURCE_DMA,
+       },
+       {
+               .start  = DAVINCI_DMA_VC_RX,
+               .end    = DAVINCI_DMA_VC_RX,
+               .flags  = IORESOURCE_DMA,
+       },
+};
+
+static struct platform_device dm365_vc_device = {
+       .name           = "davinci_voicecodec",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(dm365_vc_resources),
+       .resource       = dm365_vc_resources,
+};
+
 static struct resource dm365_rtc_resources[] = {
        {
                .start = DM365_RTC_BASE,
@@ -991,6 +1018,14 @@ void __init dm365_init_asp(struct snd_platform_data *pdata)
        platform_device_register(&dm365_asp_device);
 }
 
+void __init dm365_init_vc(struct snd_platform_data *pdata)
+{
+       davinci_cfg_reg(DM365_EVT2_VC_TX);
+       davinci_cfg_reg(DM365_EVT3_VC_RX);
+       dm365_vc_device.dev.platform_data = pdata;
+       platform_device_register(&dm365_vc_device);
+}
+
 void __init dm365_init_ks(struct davinci_ks_platform_data *pdata)
 {
        dm365_ks_device.dev.platform_data = pdata;

diff --git a/arch/arm/mach-davinci/include/mach/dm365.h b/arch/arm/mach-davinci/include/mach/dm365.h
index c3610eb39869330e848cc5b37ad60471d4d30869..fdf6f8507cc3301cc280eb6d341a03cb9f5f85e5 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/dm365.h
+++ b/arch/arm/mach-davinci/include/mach/dm365.h
@@ -32,8 +32,13 @@
 
 #define DM365_RTC_BASE                 (0x01C69000)
 
+#define DAVINCI_DM365_VC_BASE          (0x01D0C000)
+#define DAVINCI_DMA_VC_TX              2
+#define DAVINCI_DMA_VC_RX              3
+
 void __init dm365_init(void);
 void __init dm365_init_asp(struct snd_platform_data *pdata);
+void __init dm365_init_vc(struct snd_platform_data *pdata);
 void __init dm365_init_ks(struct davinci_ks_platform_data *pdata);
 void __init dm365_init_rtc(void);
 

diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index 137bfba51d1fd6c1d8f13786f04212415fa3c7cd..2a68c1d8a24bc1e58a1db9a908818de235663574 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -327,6 +327,8 @@ enum davinci_dm365_index {
        /* EDMA event muxing */
        DM365_EVT2_ASP_TX,
        DM365_EVT3_ASP_RX,
+       DM365_EVT2_VC_TX,
+       DM365_EVT3_VC_RX,
        DM365_EVT26_MMC0_RX,
 };