* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
@ 2010-10-26 1:41 Jassi Brar
2010-10-26 2:00 ` Kyungmin Park
0 siblings, 1 reply; 14+ messages in thread
From: Jassi Brar @ 2010-10-26 1:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Jassi Brar <jassi.brar@samsung.com>
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>
---
arch/arm/mach-s5pv210/clock.c | 10 +++---
arch/arm/mach-s5pv210/dev-audio.c | 52 ++++++++++++++++++++++++++++--------
2 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index 019c3a6..b774ff1 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -467,20 +467,20 @@ static struct clk init_clocks_disable[] = {
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1<<21),
}, {
- .name = "i2s_v50",
+ .name = "iis",
.id = 0,
.parent = &clk_p,
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1<<4),
}, {
- .name = "i2s_v32",
- .id = 0,
+ .name = "iis",
+ .id = 1,
.parent = &clk_p,
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1 << 5),
}, {
- .name = "i2s_v32",
- .id = 1,
+ .name = "iis",
+ .id = 2,
.parent = &clk_p,
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1 << 6),
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
index 961477a..ddd2704 100644
--- a/arch/arm/mach-s5pv210/dev-audio.c
+++ b/arch/arm/mach-s5pv210/dev-audio.c
@@ -19,22 +19,24 @@
#include <mach/dma.h>
#include <mach/irqs.h>
+static const char *rclksrc[] = {
+ [0] = "busclk",
+ [1] = "i2sclk",
+};
+
static int s5pv210_cfg_i2s(struct platform_device *pdev)
{
/* configure GPIO for i2s port */
switch (pdev->id) {
+ case 0:
+ s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
+ break;
case 1:
s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(2));
break;
-
case 2:
s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(4));
break;
-
- case -1:
- s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
- break;
-
default:
printk(KERN_ERR "Invalid Device %d\n", pdev->id);
return -EINVAL;
@@ -43,8 +45,15 @@ static int s5pv210_cfg_i2s(struct platform_device *pdev)
return 0;
}
-static struct s3c_audio_pdata s3c_i2s_pdata = {
+static struct s3c_audio_pdata i2sv5_pdata = {
.cfg_gpio = s5pv210_cfg_i2s,
+ .type = {
+ .i2s = {
+ .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
+ | QUIRK_NEED_RSTCLR,
+ .src_clk = rclksrc,
+ },
+ },
};
static struct resource s5pv210_iis0_resource[] = {
@@ -63,15 +72,34 @@ static struct resource s5pv210_iis0_resource[] = {
.end = DMACH_I2S0_RX,
.flags = IORESOURCE_DMA,
},
+ [3] = {
+ .start = DMACH_I2S0S_TX,
+ .end = DMACH_I2S0S_TX,
+ .flags = IORESOURCE_DMA,
+ },
};
struct platform_device s5pv210_device_iis0 = {
- .name = "samsung-i2s-v4",
- .id = -1,
+ .name = "samsung-i2s",
+ .id = 0,
.num_resources = ARRAY_SIZE(s5pv210_iis0_resource),
.resource = s5pv210_iis0_resource,
.dev = {
- .platform_data = &s3c_i2s_pdata,
+ .platform_data = &i2sv5_pdata,
+ },
+};
+
+static const char *rclksrc_v3[] = {
+ [0] = "iis",
+ [1] = "audio-bus",
+};
+
+static struct s3c_audio_pdata i2sv3_pdata = {
+ .cfg_gpio = s5pv210_cfg_i2s,
+ .type = {
+ .i2s = {
+ .src_clk = rclksrc_v3,
+ },
},
};
@@ -99,7 +127,7 @@ struct platform_device s5pv210_device_iis1 = {
.num_resources = ARRAY_SIZE(s5pv210_iis1_resource),
.resource = s5pv210_iis1_resource,
.dev = {
- .platform_data = &s3c_i2s_pdata,
+ .platform_data = &i2sv3_pdata,
},
};
@@ -127,7 +155,7 @@ struct platform_device s5pv210_device_iis2 = {
.num_resources = ARRAY_SIZE(s5pv210_iis2_resource),
.resource = s5pv210_iis2_resource,
.dev = {
- .platform_data = &s3c_i2s_pdata,
+ .platform_data = &i2sv3_pdata,
},
};
--
1.6.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-26 1:41 [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device Jassi Brar
@ 2010-10-26 2:00 ` Kyungmin Park
2010-10-26 3:00 ` Mark Brown
0 siblings, 1 reply; 14+ messages in thread
From: Kyungmin Park @ 2010-10-26 2:00 UTC (permalink / raw)
To: linux-arm-kernel
Hi Jassi,
Can you unify the word iis vs. i2s? some variables use the 'iis', some
names use the i2s. As title is i2s. just unify the i2s?
Thank you,
Kyungmin Park
On Tue, Oct 26, 2010 at 10:41 AM, Jassi Brar <jassisinghbrar@gmail.com> wrote:
> From: Jassi Brar <jassi.brar@samsung.com>
>
> 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>
> ---
> ?arch/arm/mach-s5pv210/clock.c ? ? | ? 10 +++---
> ?arch/arm/mach-s5pv210/dev-audio.c | ? 52 ++++++++++++++++++++++++++++--------
> ?2 files changed, 45 insertions(+), 17 deletions(-)
>
> diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
> index 019c3a6..b774ff1 100644
> --- a/arch/arm/mach-s5pv210/clock.c
> +++ b/arch/arm/mach-s5pv210/clock.c
> @@ -467,20 +467,20 @@ static struct clk init_clocks_disable[] = {
> ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5pv210_clk_ip3_ctrl,
> ? ? ? ? ? ? ? ?.ctrlbit ? ? ? ?= (1<<21),
> ? ? ? ?}, {
> - ? ? ? ? ? ? ? .name ? ? ? ? ? = "i2s_v50",
> + ? ? ? ? ? ? ? .name ? ? ? ? ? = "iis",
> ? ? ? ? ? ? ? ?.id ? ? ? ? ? ? = 0,
> ? ? ? ? ? ? ? ?.parent ? ? ? ? = &clk_p,
> ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5pv210_clk_ip3_ctrl,
> ? ? ? ? ? ? ? ?.ctrlbit ? ? ? ?= (1<<4),
> ? ? ? ?}, {
> - ? ? ? ? ? ? ? .name ? ? ? ? ? = "i2s_v32",
> - ? ? ? ? ? ? ? .id ? ? ? ? ? ? = 0,
> + ? ? ? ? ? ? ? .name ? ? ? ? ? = "iis",
> + ? ? ? ? ? ? ? .id ? ? ? ? ? ? = 1,
> ? ? ? ? ? ? ? ?.parent ? ? ? ? = &clk_p,
> ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5pv210_clk_ip3_ctrl,
> ? ? ? ? ? ? ? ?.ctrlbit ? ? ? ?= (1 << 5),
> ? ? ? ?}, {
> - ? ? ? ? ? ? ? .name ? ? ? ? ? = "i2s_v32",
> - ? ? ? ? ? ? ? .id ? ? ? ? ? ? = 1,
> + ? ? ? ? ? ? ? .name ? ? ? ? ? = "iis",
> + ? ? ? ? ? ? ? .id ? ? ? ? ? ? = 2,
> ? ? ? ? ? ? ? ?.parent ? ? ? ? = &clk_p,
> ? ? ? ? ? ? ? ?.enable ? ? ? ? = s5pv210_clk_ip3_ctrl,
> ? ? ? ? ? ? ? ?.ctrlbit ? ? ? ?= (1 << 6),
> diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
> index 961477a..ddd2704 100644
> --- a/arch/arm/mach-s5pv210/dev-audio.c
> +++ b/arch/arm/mach-s5pv210/dev-audio.c
> @@ -19,22 +19,24 @@
> ?#include <mach/dma.h>
> ?#include <mach/irqs.h>
>
> +static const char *rclksrc[] = {
> + ? ? ? [0] = "busclk",
> + ? ? ? [1] = "i2sclk",
> +};
> +
> ?static int s5pv210_cfg_i2s(struct platform_device *pdev)
> ?{
> ? ? ? ?/* configure GPIO for i2s port */
> ? ? ? ?switch (pdev->id) {
> + ? ? ? case 0:
> + ? ? ? ? ? ? ? s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
> + ? ? ? ? ? ? ? break;
> ? ? ? ?case 1:
> ? ? ? ? ? ? ? ?s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(2));
> ? ? ? ? ? ? ? ?break;
> -
> ? ? ? ?case 2:
> ? ? ? ? ? ? ? ?s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(4));
> ? ? ? ? ? ? ? ?break;
> -
> - ? ? ? case -1:
> - ? ? ? ? ? ? ? s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
> - ? ? ? ? ? ? ? break;
> -
> ? ? ? ?default:
> ? ? ? ? ? ? ? ?printk(KERN_ERR "Invalid Device %d\n", pdev->id);
> ? ? ? ? ? ? ? ?return -EINVAL;
> @@ -43,8 +45,15 @@ static int s5pv210_cfg_i2s(struct platform_device *pdev)
> ? ? ? ?return 0;
> ?}
>
> -static struct s3c_audio_pdata s3c_i2s_pdata = {
> +static struct s3c_audio_pdata i2sv5_pdata = {
> ? ? ? ?.cfg_gpio = s5pv210_cfg_i2s,
> + ? ? ? .type = {
> + ? ? ? ? ? ? ? .i2s = {
> + ? ? ? ? ? ? ? ? ? ? ? .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
> + ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?| QUIRK_NEED_RSTCLR,
> + ? ? ? ? ? ? ? ? ? ? ? .src_clk = rclksrc,
> + ? ? ? ? ? ? ? },
> + ? ? ? },
> ?};
>
> ?static struct resource s5pv210_iis0_resource[] = {
> @@ -63,15 +72,34 @@ static struct resource s5pv210_iis0_resource[] = {
> ? ? ? ? ? ? ? ?.end ? = DMACH_I2S0_RX,
> ? ? ? ? ? ? ? ?.flags = IORESOURCE_DMA,
> ? ? ? ?},
> + ? ? ? [3] = {
> + ? ? ? ? ? ? ? .start = DMACH_I2S0S_TX,
> + ? ? ? ? ? ? ? .end = DMACH_I2S0S_TX,
> + ? ? ? ? ? ? ? .flags = IORESOURCE_DMA,
> + ? ? ? },
> ?};
>
> ?struct platform_device s5pv210_device_iis0 = {
> - ? ? ? .name ? ? ? ? ? ? = "samsung-i2s-v4",
> - ? ? ? .id ? ? ? ? ? ? ? = -1,
> + ? ? ? .name = "samsung-i2s",
> + ? ? ? .id = 0,
> ? ? ? ?.num_resources ? ?= ARRAY_SIZE(s5pv210_iis0_resource),
> ? ? ? ?.resource ? ? ? ? = s5pv210_iis0_resource,
> ? ? ? ?.dev = {
> - ? ? ? ? ? ? ? .platform_data = &s3c_i2s_pdata,
> + ? ? ? ? ? ? ? .platform_data = &i2sv5_pdata,
> + ? ? ? },
> +};
> +
> +static const char *rclksrc_v3[] = {
> + ? ? ? [0] = "iis",
> + ? ? ? [1] = "audio-bus",
> +};
> +
> +static struct s3c_audio_pdata i2sv3_pdata = {
> + ? ? ? .cfg_gpio = s5pv210_cfg_i2s,
> + ? ? ? .type = {
> + ? ? ? ? ? ? ? .i2s = {
> + ? ? ? ? ? ? ? ? ? ? ? .src_clk = rclksrc_v3,
> + ? ? ? ? ? ? ? },
> ? ? ? ?},
> ?};
>
> @@ -99,7 +127,7 @@ struct platform_device s5pv210_device_iis1 = {
> ? ? ? ?.num_resources ? ?= ARRAY_SIZE(s5pv210_iis1_resource),
> ? ? ? ?.resource ? ? ? ? = s5pv210_iis1_resource,
> ? ? ? ?.dev = {
> - ? ? ? ? ? ? ? .platform_data = &s3c_i2s_pdata,
> + ? ? ? ? ? ? ? .platform_data = &i2sv3_pdata,
> ? ? ? ?},
> ?};
>
> @@ -127,7 +155,7 @@ struct platform_device s5pv210_device_iis2 = {
> ? ? ? ?.num_resources ? ?= ARRAY_SIZE(s5pv210_iis2_resource),
> ? ? ? ?.resource ? ? ? ? = s5pv210_iis2_resource,
> ? ? ? ?.dev = {
> - ? ? ? ? ? ? ? .platform_data = &s3c_i2s_pdata,
> + ? ? ? ? ? ? ? .platform_data = &i2sv3_pdata,
> ? ? ? ?},
> ?};
>
> --
> 1.6.2.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-26 2:00 ` Kyungmin Park
@ 2010-10-26 3:00 ` Mark Brown
2010-10-26 3:42 ` Kukjin Kim
2010-10-26 3:47 ` Jassi Brar
0 siblings, 2 replies; 14+ messages in thread
From: Mark Brown @ 2010-10-26 3:00 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 26, 2010 at 11:00:34AM +0900, Kyungmin Park wrote:
> Can you unify the word iis vs. i2s? some variables use the 'iis', some
> names use the i2s. As title is i2s. just unify the i2s?
I'd prefer I2S as well, it's vastly more common than IIS (I don't recall
anyone except Samsung ever using that abbreviation).
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-26 3:00 ` Mark Brown
@ 2010-10-26 3:42 ` Kukjin Kim
2010-10-26 18:31 ` Mark Brown
2010-10-26 3:47 ` Jassi Brar
1 sibling, 1 reply; 14+ messages in thread
From: Kukjin Kim @ 2010-10-26 3:42 UTC (permalink / raw)
To: linux-arm-kernel
Mark Brown wrote:
>
> On Tue, Oct 26, 2010 at 11:00:34AM +0900, Kyungmin Park wrote:
>
> > Can you unify the word iis vs. i2s? some variables use the 'iis', some
> > names use the i2s. As title is i2s. just unify the i2s?
>
> I'd prefer I2S as well, it's vastly more common than IIS (I don't recall
> anyone except Samsung ever using that abbreviation).
Yeah, I also like I2S :-)
Maybe Jassi used original naming...
Anyway Mark, as you know we have no much time to merge for this merge
window.
So...if you don't mind, I'd like to apply current style now...then I think
we can cleanup it during -rc.
As a note, If possible, I will send pull request tonight(KST) for 37-rc1.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-26 3:42 ` Kukjin Kim
@ 2010-10-26 18:31 ` Mark Brown
2010-10-28 2:06 ` Jassi Brar
0 siblings, 1 reply; 14+ messages in thread
From: Mark Brown @ 2010-10-26 18:31 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 26, 2010 at 12:42:13PM +0900, Kukjin Kim wrote:
> Anyway Mark, as you know we have no much time to merge for this merge
> window.
> So...if you don't mind, I'd like to apply current style now...then I think
> we can cleanup it during -rc.
I'm OK with the arch/arm side
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
but note that the sound/soc side is probably going to have to wait for
2.6.38 as Takashi has already done the ALSA merge with Linus (unless we
do an additional merge later on).
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-26 18:31 ` Mark Brown
@ 2010-10-28 2:06 ` Jassi Brar
2010-10-28 2:54 ` Mark Brown
0 siblings, 1 reply; 14+ messages in thread
From: Jassi Brar @ 2010-10-28 2:06 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 27, 2010 at 3:31 AM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Tue, Oct 26, 2010 at 12:42:13PM +0900, Kukjin Kim wrote:
>
>> Anyway Mark, as you know we have no much time to merge for this merge
>> window.
>> So...if you don't mind, I'd like to apply current style now...then I think
>> we can cleanup it during -rc.
>
> I'm OK with the arch/arm side
>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
> but note that the sound/soc side is probably going to have to wait for
> 2.6.38 as Takashi has already done the ALSA merge with Linus (unless we
> do an additional merge later on).
OK, I think I'll survive one release cycle :)
Any action item on my part before you accept the series to for-2.6.38 ?
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-28 2:06 ` Jassi Brar
@ 2010-10-28 2:54 ` Mark Brown
2010-10-28 8:58 ` Liam Girdwood
0 siblings, 1 reply; 14+ messages in thread
From: Mark Brown @ 2010-10-28 2:54 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 28, 2010 at 11:06:13AM +0900, Jassi Brar wrote:
> OK, I think I'll survive one release cycle :)
> Any action item on my part before you accept the series to for-2.6.38 ?
Not from me - Liam are you OK? It's possible something crept through
but we can always fix incrementally.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-28 2:54 ` Mark Brown
@ 2010-10-28 8:58 ` Liam Girdwood
2010-11-15 5:51 ` Jassi Brar
0 siblings, 1 reply; 14+ messages in thread
From: Liam Girdwood @ 2010-10-28 8:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 2010-10-27 at 19:54 -0700, Mark Brown wrote:
> On Thu, Oct 28, 2010 at 11:06:13AM +0900, Jassi Brar wrote:
>
> > OK, I think I'll survive one release cycle :)
> > Any action item on my part before you accept the series to for-2.6.38 ?
>
> Not from me - Liam are you OK? It's possible something crept through
> but we can always fix incrementally.
>
Fine by me, all
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-28 8:58 ` Liam Girdwood
@ 2010-11-15 5:51 ` Jassi Brar
2010-11-15 6:26 ` Kukjin Kim
2010-11-15 8:52 ` Mark Brown
0 siblings, 2 replies; 14+ messages in thread
From: Jassi Brar @ 2010-11-15 5:51 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Oct 28, 2010 at 5:58 PM, Liam Girdwood <lrg@slimlogic.co.uk> wrote:
> On Wed, 2010-10-27 at 19:54 -0700, Mark Brown wrote:
>> On Thu, Oct 28, 2010 at 11:06:13AM +0900, Jassi Brar wrote:
>>
>> > OK, I think I'll survive one release cycle :)
>> > Any action item on my part before you accept the series to for-2.6.38 ?
>>
>> Not from me - Liam are you OK? ?It's possible something crept through
>> but we can always fix incrementally.
>>
>
> Fine by me, all
>
> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Hi Mark,
Did you miss the ack or want to merge it late ?
Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-11-15 5:51 ` Jassi Brar
@ 2010-11-15 6:26 ` Kukjin Kim
2010-11-15 6:42 ` Jassi Brar
2010-11-15 8:52 ` Mark Brown
1 sibling, 1 reply; 14+ messages in thread
From: Kukjin Kim @ 2010-11-15 6:26 UTC (permalink / raw)
To: linux-arm-kernel
Jassi Brar wrote:
>
> On Thu, Oct 28, 2010 at 5:58 PM, Liam Girdwood <lrg@slimlogic.co.uk> wrote:
> > On Wed, 2010-10-27 at 19:54 -0700, Mark Brown wrote:
> >> On Thu, Oct 28, 2010 at 11:06:13AM +0900, Jassi Brar wrote:
> >>
> >> > OK, I think I'll survive one release cycle :)
> >> > Any action item on my part before you accept the series to for-2.6.38 ?
> >>
> >> Not from me - Liam are you OK? It's possible something crept through
> >> but we can always fix incrementally.
> >>
> >
> > Fine by me, all
> >
> > Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
>
> Hi Mark,
> Did you miss the ack or want to merge it late ?
> Thanks.
Hi Jassi,
I think, need to rebase your patches against latest kernel.
Maybe, it would be helpful to me and Mark.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-11-15 5:51 ` Jassi Brar
2010-11-15 6:26 ` Kukjin Kim
@ 2010-11-15 8:52 ` Mark Brown
1 sibling, 0 replies; 14+ messages in thread
From: Mark Brown @ 2010-11-15 8:52 UTC (permalink / raw)
To: linux-arm-kernel
On 15 Nov 2010, at 05:51, Jassi Brar wrote:
> Hi Mark,
> Did you miss the ack or want to merge it late ?
> Thanks.
I wasn't planning on merging them - Kukjin said he wanted to merge all the arch/arm patches. I was waiting for them to show up in mainline for the ASoC side.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-10-26 3:00 ` Mark Brown
2010-10-26 3:42 ` Kukjin Kim
@ 2010-10-26 3:47 ` Jassi Brar
1 sibling, 0 replies; 14+ messages in thread
From: Jassi Brar @ 2010-10-26 3:47 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 26, 2010 at 12:00 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Tue, Oct 26, 2010 at 11:00:34AM +0900, Kyungmin Park wrote:
>
>> Can you unify the word iis vs. i2s? some variables use the 'iis', some
>> names use the i2s. As title is i2s. just unify the i2s?
>
> I'd prefer I2S as well, it's vastly more common than IIS (I don't recall
> anyone except Samsung ever using that abbreviation).
I thought so too, but that would have required even more changes in existing
board init files as well. I tried to keep the number of patches as
less as possible.
But if we are to miss this cycle, maybe I should take time out to do it too.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 1/9] S5PV310: DMA: Add platform devices for PL330 DMACs
@ 2010-11-18 9:24 Jassi Brar
2010-11-18 9:21 ` [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device Jassi Brar
0 siblings, 1 reply; 14+ messages in thread
From: Jassi Brar @ 2010-11-18 9:24 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Oct 26, 2010 at 1:33 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>
> As you know...maybe need to fix.
I am re-submitting this 9 patch series after required updates.
Thanks.
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device
2010-11-18 9:24 [PATCH 1/9] S5PV310: DMA: Add platform devices for PL330 DMACs Jassi Brar
@ 2010-11-18 9:21 ` Jassi Brar
0 siblings, 0 replies; 14+ messages in thread
From: Jassi Brar @ 2010-11-18 9:21 UTC (permalink / raw)
To: linux-arm-kernel
From: Jassi Brar <jassi.brar@samsung.com>
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>
---
arch/arm/mach-s5pv210/clock.c | 10 +++---
arch/arm/mach-s5pv210/dev-audio.c | 52 ++++++++++++++++++++++++++++--------
2 files changed, 45 insertions(+), 17 deletions(-)
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index 019c3a6..b774ff1 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -467,20 +467,20 @@ static struct clk init_clocks_disable[] = {
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1<<21),
}, {
- .name = "i2s_v50",
+ .name = "iis",
.id = 0,
.parent = &clk_p,
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1<<4),
}, {
- .name = "i2s_v32",
- .id = 0,
+ .name = "iis",
+ .id = 1,
.parent = &clk_p,
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1 << 5),
}, {
- .name = "i2s_v32",
- .id = 1,
+ .name = "iis",
+ .id = 2,
.parent = &clk_p,
.enable = s5pv210_clk_ip3_ctrl,
.ctrlbit = (1 << 6),
diff --git a/arch/arm/mach-s5pv210/dev-audio.c b/arch/arm/mach-s5pv210/dev-audio.c
index 961477a..ddd2704 100644
--- a/arch/arm/mach-s5pv210/dev-audio.c
+++ b/arch/arm/mach-s5pv210/dev-audio.c
@@ -19,22 +19,24 @@
#include <mach/dma.h>
#include <mach/irqs.h>
+static const char *rclksrc[] = {
+ [0] = "busclk",
+ [1] = "i2sclk",
+};
+
static int s5pv210_cfg_i2s(struct platform_device *pdev)
{
/* configure GPIO for i2s port */
switch (pdev->id) {
+ case 0:
+ s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
+ break;
case 1:
s3c_gpio_cfgpin_range(S5PV210_GPC0(0), 5, S3C_GPIO_SFN(2));
break;
-
case 2:
s3c_gpio_cfgpin_range(S5PV210_GPC1(0), 5, S3C_GPIO_SFN(4));
break;
-
- case -1:
- s3c_gpio_cfgpin_range(S5PV210_GPI(0), 7, S3C_GPIO_SFN(2));
- break;
-
default:
printk(KERN_ERR "Invalid Device %d\n", pdev->id);
return -EINVAL;
@@ -43,8 +45,15 @@ static int s5pv210_cfg_i2s(struct platform_device *pdev)
return 0;
}
-static struct s3c_audio_pdata s3c_i2s_pdata = {
+static struct s3c_audio_pdata i2sv5_pdata = {
.cfg_gpio = s5pv210_cfg_i2s,
+ .type = {
+ .i2s = {
+ .quirks = QUIRK_PRI_6CHAN | QUIRK_SEC_DAI
+ | QUIRK_NEED_RSTCLR,
+ .src_clk = rclksrc,
+ },
+ },
};
static struct resource s5pv210_iis0_resource[] = {
@@ -63,15 +72,34 @@ static struct resource s5pv210_iis0_resource[] = {
.end = DMACH_I2S0_RX,
.flags = IORESOURCE_DMA,
},
+ [3] = {
+ .start = DMACH_I2S0S_TX,
+ .end = DMACH_I2S0S_TX,
+ .flags = IORESOURCE_DMA,
+ },
};
struct platform_device s5pv210_device_iis0 = {
- .name = "samsung-i2s-v4",
- .id = -1,
+ .name = "samsung-i2s",
+ .id = 0,
.num_resources = ARRAY_SIZE(s5pv210_iis0_resource),
.resource = s5pv210_iis0_resource,
.dev = {
- .platform_data = &s3c_i2s_pdata,
+ .platform_data = &i2sv5_pdata,
+ },
+};
+
+static const char *rclksrc_v3[] = {
+ [0] = "iis",
+ [1] = "audio-bus",
+};
+
+static struct s3c_audio_pdata i2sv3_pdata = {
+ .cfg_gpio = s5pv210_cfg_i2s,
+ .type = {
+ .i2s = {
+ .src_clk = rclksrc_v3,
+ },
},
};
@@ -99,7 +127,7 @@ struct platform_device s5pv210_device_iis1 = {
.num_resources = ARRAY_SIZE(s5pv210_iis1_resource),
.resource = s5pv210_iis1_resource,
.dev = {
- .platform_data = &s3c_i2s_pdata,
+ .platform_data = &i2sv3_pdata,
},
};
@@ -127,7 +155,7 @@ struct platform_device s5pv210_device_iis2 = {
.num_resources = ARRAY_SIZE(s5pv210_iis2_resource),
.resource = s5pv210_iis2_resource,
.dev = {
- .platform_data = &s3c_i2s_pdata,
+ .platform_data = &i2sv3_pdata,
},
};
--
1.6.2.5
^ permalink raw reply related [flat|nested] 14+ messages in thread
end of thread, other threads:[~2010-11-18 9:21 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-26 1:41 [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device Jassi Brar
2010-10-26 2:00 ` Kyungmin Park
2010-10-26 3:00 ` Mark Brown
2010-10-26 3:42 ` Kukjin Kim
2010-10-26 18:31 ` Mark Brown
2010-10-28 2:06 ` Jassi Brar
2010-10-28 2:54 ` Mark Brown
2010-10-28 8:58 ` Liam Girdwood
2010-11-15 5:51 ` Jassi Brar
2010-11-15 6:26 ` Kukjin Kim
2010-11-15 6:42 ` Jassi Brar
2010-11-15 8:52 ` Mark Brown
2010-10-26 3:47 ` Jassi Brar
-- strict thread matches above, loose matches on Subject: below --
2010-11-18 9:24 [PATCH 1/9] S5PV310: DMA: Add platform devices for PL330 DMACs Jassi Brar
2010-11-18 9:21 ` [PATCH 8/9] ARM: S5PV210: I2S: Upgrade platform device Jassi Brar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.