Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25acf553 authored by Chaithrika U S's avatar Chaithrika U S Committed by Kevin Hilman
Browse files

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: default avatarNaresh Medisetty <naresh@ti.com>
Signed-off-by: default avatarChaithrika U S <chaithrika@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
parent 7a36071e

arch/arm/mach-davinci/board-dm355-evm.c

+7 −0
Original line number Diff line number Diff line
@@ -117,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)
@@ -279,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)

arch/arm/mach-davinci/board-dm644x-evm.c

+5 −0
Original line number Diff line number Diff line
@@ -225,6 +225,10 @@ static struct platform_device ide_dev = { 
	},

};



static struct snd_platform_data dm644x_evm_snd_data = {

	.clk_name	= "asp0",

};



/*----------------------------------------------------------------------*/



/*
@@ -666,6 +670,7 @@ static __init void davinci_evm_init(void) 
	davinci_setup_mmc(0, &dm6446evm_mmc_config);



	davinci_serial_init(&uart_config);

	dm644x_init_asp(&dm644x_evm_snd_data);



	soc_info->emac_pdata->phy_mask = DM644X_EVM_PHY_MASK;

	soc_info->emac_pdata->mdio_max_freq = DM644X_EVM_MDIO_FREQUENCY;

arch/arm/mach-davinci/board-dm646x-evm.c

+33 −0
Original line number Diff line number Diff line
@@ -206,6 +206,37 @@ static struct at24_platform_data eeprom_info = { 
	.context	= (void *)0x7f00,

};



static u8 dm646x_iis_serializer_direction[] = {

       TX_MODE, RX_MODE, INACTIVE_MODE, INACTIVE_MODE,

};



static u8 dm646x_dit_serializer_direction[] = {

       TX_MODE,

};



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,

		.num_serializer = ARRAY_SIZE(dm646x_iis_serializer_direction),

		.tdm_slots      = 2,

		.serial_dir     = dm646x_iis_serializer_direction,

		.eventq_no      = EVENTQ_0,

	},

	{

		.clk_name       = "mcasp1",

		.tx_dma_offset  = 0x400,

		.rx_dma_offset  = 0,

		.op_mode        = DAVINCI_MCASP_DIT_MODE,

		.num_serializer = ARRAY_SIZE(dm646x_dit_serializer_direction),

		.tdm_slots      = 32,

		.serial_dir     = dm646x_dit_serializer_direction,

		.eventq_no      = EVENTQ_0,

	},

};



static struct i2c_board_info __initdata i2c_info[] =  {

	{

		I2C_BOARD_INFO("24c256", 0x50),
@@ -239,6 +270,8 @@ static __init void evm_init(void) 


	evm_init_i2c();

	davinci_serial_init(&uart_config);

	dm646x_init_mcasp0(&dm646x_evm_snd_data[0]);

	dm646x_init_mcasp1(&dm646x_evm_snd_data[1]);



	soc_info->emac_pdata->phy_mask = DM646X_EVM_PHY_MASK;

	soc_info->emac_pdata->mdio_max_freq = DM646X_EVM_MDIO_FREQUENCY;

arch/arm/mach-davinci/dm355.c

+41 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <mach/time.h>

#include <mach/serial.h>

#include <mach/common.h>

#include <mach/asp.h>



#include "clock.h"

#include "mux.h"
@@ -360,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("soc-audio.0", NULL, &asp0_clk),

	CLK("soc-audio.1", NULL, &asp1_clk),

	CLK(NULL, "asp0", &asp0_clk),

	CLK(NULL, "asp1", &asp1_clk),

	CLK("davinci_mmc.0", NULL, &mmcsd0_clk),

	CLK("davinci_mmc.1", NULL, &mmcsd1_clk),

	CLK(NULL, "spi0", &spi0_clk),
@@ -627,6 +628,31 @@ static struct platform_device dm355_edma_device = { 
	.resource		= edma_resources,

};



static struct resource dm355_asp1_resources[] = {

	{

		.start	= DAVINCI_ASP1_BASE,

		.end	= DAVINCI_ASP1_BASE + SZ_8K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= DAVINCI_DMA_ASP1_TX,

		.end	= DAVINCI_DMA_ASP1_TX,

		.flags	= IORESOURCE_DMA,

	},

	{

		.start	= DAVINCI_DMA_ASP1_RX,

		.end	= DAVINCI_DMA_ASP1_RX,

		.flags	= IORESOURCE_DMA,

	},

};



static struct platform_device dm355_asp1_device = {

	.name		= "davinci-asp",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(dm355_asp1_resources),

	.resource	= dm355_asp1_resources,

};



/*----------------------------------------------------------------------*/



static struct map_desc dm355_io_desc[] = {
@@ -735,6 +761,19 @@ static struct davinci_soc_info davinci_soc_info_dm355 = { 
	.sram_len		= SZ_32K,

};



void __init dm355_init_asp1(u32 evt_enable, struct snd_platform_data *pdata)

{

	/* we don't use ASP1 IRQs, or we'd need to mux them ... */

	if (evt_enable & ASP1_TX_EVT_EN)

		davinci_cfg_reg(DM355_EVT8_ASP1_TX);



	if (evt_enable & ASP1_RX_EVT_EN)

		davinci_cfg_reg(DM355_EVT9_ASP1_RX);



	dm355_asp1_device.dev.platform_data = pdata;

	platform_device_register(&dm355_asp1_device);

}



void __init dm355_init(void)

{

	davinci_common_init(&davinci_soc_info_dm355);

arch/arm/mach-davinci/dm644x.c

+35 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <mach/time.h>

#include <mach/serial.h>

#include <mach/common.h>

#include <mach/asp.h>



#include "clock.h"

#include "mux.h"
@@ -303,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("soc-audio.0", NULL, &asp_clk),

	CLK(NULL, "asp0", &asp_clk),

	CLK("davinci_mmc.0", NULL, &mmcsd_clk),

	CLK(NULL, "spi", &spi_clk),

	CLK(NULL, "gpio", &gpio_clk),
@@ -553,6 +554,32 @@ static struct platform_device dm644x_edma_device = { 
	.resource		= edma_resources,

};



/* DM6446 EVM uses ASP0; line-out is a pair of RCA jacks */

static struct resource dm644x_asp_resources[] = {

	{

		.start	= DAVINCI_ASP0_BASE,

		.end	= DAVINCI_ASP0_BASE + SZ_8K - 1,

		.flags	= IORESOURCE_MEM,

	},

	{

		.start	= DAVINCI_DMA_ASP0_TX,

		.end	= DAVINCI_DMA_ASP0_TX,

		.flags	= IORESOURCE_DMA,

	},

	{

		.start	= DAVINCI_DMA_ASP0_RX,

		.end	= DAVINCI_DMA_ASP0_RX,

		.flags	= IORESOURCE_DMA,

	},

};



static struct platform_device dm644x_asp_device = {

	.name		= "davinci-asp",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(dm644x_asp_resources),

	.resource	= dm644x_asp_resources,

};



/*----------------------------------------------------------------------*/



static struct map_desc dm644x_io_desc[] = {
@@ -669,6 +696,13 @@ static struct davinci_soc_info davinci_soc_info_dm644x = { 
	.sram_len		= SZ_16K,

};



void __init dm644x_init_asp(struct snd_platform_data *pdata)

{

	davinci_cfg_reg(DM644X_MCBSP);

	dm644x_asp_device.dev.platform_data = pdata;

	platform_device_register(&dm644x_asp_device);

}



void __init dm644x_init(void)

{

	davinci_common_init(&davinci_soc_info_dm644x);