mirror of https://gitee.com/openkylin/linux.git
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>
This commit is contained in:
parent
548197bdf0
commit
61aa07328d
|
@ -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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
|
||||
/*----------------------------------------------------------------------*/
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
};
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in New Issue