iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: S5PC100: Upgrade platform device for I2S

Browse Source 
Add more information to I2S platform_devices in order to
prepare them for new controller driver.

Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Jassi Brar 2010-11-19 08:49:44 +09:00 committed by Kukjin Kim
parent 4f2e4e124c
commit 651cba5d17
1 changed files with 39 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
arch/arm/mach-s5pc100/dev-audio.c
View File

@ -23,17 +23,14 @@ static int s5pc100_cfg_i2s(struct platform_device *pdev)
{ {
/* configure GPIO for i2s port */ /* configure GPIO for i2s port */
switch (pdev->id) { switch (pdev->id) {
case 0: /* Dedicated pins */
break;
case 1: case 1:
s3c_gpio_cfgpin_range(S5PC100_GPC(0), 5, S3C_GPIO_SFN(2)); s3c_gpio_cfgpin_range(S5PC100_GPC(0), 5, S3C_GPIO_SFN(2));
break; break;
case 2: case 2:
s3c_gpio_cfgpin_range(S5PC100_GPG3(0), 5, S3C_GPIO_SFN(4)); s3c_gpio_cfgpin_range(S5PC100_GPG3(0), 5, S3C_GPIO_SFN(4));
break; break;
case -1: /* Dedicated pins */
break;
default: default:
printk(KERN_ERR "Invalid Device %d\n", pdev->id); printk(KERN_ERR "Invalid Device %d\n", pdev->id);
return -EINVAL; return -EINVAL;
@ -42,8 +39,20 @@ static int s5pc100_cfg_i2s(struct platform_device *pdev)
return 0; return 0;
} }
static struct s3c_audio_pdata s3c_i2s_pdata = { static const char *rclksrc_v5[] = {
[0] = "iis",
[1] = "i2sclkd2",
};
static struct s3c_audio_pdata i2sv5_pdata = {
.cfg_gpio = s5pc100_cfg_i2s, .cfg_gpio = s5pc100_cfg_i2s,
.type = {
.i2s = {
.quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
| QUIRK_NEED_RSTCLR,
.src_clk = rclksrc_v5,
},
},
}; };
static struct resource s5pc100_iis0_resource[] = { static struct resource s5pc100_iis0_resource[] = {
@ -62,15 +71,34 @@ static struct resource s5pc100_iis0_resource[] = {
.end = DMACH_I2S0_RX, .end = DMACH_I2S0_RX,
.flags = IORESOURCE_DMA, .flags = IORESOURCE_DMA,
}, },
[3] = {
.start = DMACH_I2S0S_TX,
.end = DMACH_I2S0S_TX,
.flags = IORESOURCE_DMA,
},
}; };
struct platform_device s5pc100_device_iis0 = { struct platform_device s5pc100_device_iis0 = {
.name = "samsung-i2s-v4", .name = "samsung-i2s",
.id = -1, .id = 0,
.num_resources = ARRAY_SIZE(s5pc100_iis0_resource), .num_resources = ARRAY_SIZE(s5pc100_iis0_resource),
.resource = s5pc100_iis0_resource, .resource = s5pc100_iis0_resource,
.dev = { .dev = {
.platform_data = &s3c_i2s_pdata, .platform_data = &i2sv5_pdata,
},
};
static const char *rclksrc_v3[] = {
[0] = "iis",
[1] = "sclk_audio",
};
static struct s3c_audio_pdata i2sv3_pdata = {
.cfg_gpio = s5pc100_cfg_i2s,
.type = {
.i2s = {
.src_clk = rclksrc_v3,
},
}, },
}; };
@ -98,7 +126,7 @@ struct platform_device s5pc100_device_iis1 = {
.num_resources = ARRAY_SIZE(s5pc100_iis1_resource), .num_resources = ARRAY_SIZE(s5pc100_iis1_resource),
.resource = s5pc100_iis1_resource, .resource = s5pc100_iis1_resource,
.dev = { .dev = {
.platform_data = &s3c_i2s_pdata, .platform_data = &i2sv3_pdata,
}, },
}; };
@ -126,7 +154,7 @@ struct platform_device s5pc100_device_iis2 = {
.num_resources = ARRAY_SIZE(s5pc100_iis2_resource), .num_resources = ARRAY_SIZE(s5pc100_iis2_resource),
.resource = s5pc100_iis2_resource, .resource = s5pc100_iis2_resource,
.dev = { .dev = {
.platform_data = &s3c_i2s_pdata, .platform_data = &i2sv3_pdata,
}, },
}; };