Skip to contentSkip to conversation

ARM: S5PV210: I2S: Upgrade platform device

PATCH New Jassi Brar 5 participants 13 messages Oct 26, 2010 – Nov 15, 2010

Subsystems (3)
lore
Share & tools
lore

Jassi Brar

author
#0 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

From: Jassi Brar <[email protected]>

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

---
 arch/arm/mach-s5pv210/clock.c     |   10 +++---
 arch/arm/mach-s5pv210/dev-audio.c |   52 ++++++++++++++++++++++++++++--------
 2 files changed, 45 insertions(+), 17 deletions(-)
arch/arm/mach-s5pv210/clock.c +5 -5
index 019c3a6..b774ff1 100644
@@ -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),
arch/arm/mach-s5pv210/dev-audio.c +40 -12

99 lines not on this page · raw message

Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

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

Quoted 158 lines · Jassi Brar

From: Jassi Brar <[email protected]>

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

---
?arch/arm/mach-s5pv210/clock.c ? ? | ? 10 +++--- ?arch/arm/mach-s5pv210/dev-audio.c | ? 52 ++++++++++++++++++++++++++++-------- ?2 files changed, 45 insertions(+), 17 deletions(-)

arch/arm/mach-s5pv210/clock.c +5 -5
index 019c3a6..b774ff1 100644
@@ -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),
arch/arm/mach-s5pv210/dev-audio.c +0 -0
index 961477a..ddd2704 100644
@@ -19,22 +19,24 @@

?#include <mach/dma.h>
?#include <mach/irqs.h>

arch/arm/mach-s5pv210/dev-audio.c +5 -0
+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;

arch/arm/mach-s5pv210/dev-audio.c +0 -5
-
- ? ? ? 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;

arch/arm/mach-s5pv210/dev-audio.c +32 -7
@@ -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

#2 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 2 lines · Kyungmin Park

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).

#3 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 8 lines · Mark Brown
Quoted 2 lines · Kyungmin Park

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 <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

#4 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 4 lines · Kukjin Kim

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

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).

author
#5 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 7 lines · Mark Brown
Quoted 4 lines · Kukjin Kim

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.

Quoted 7 lines

I'm OK with the arch/arm side

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 ?

#6 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 2 lines · Jassi Brar

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.

#7 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 8 lines · Mark Brown
Quoted 2 lines · Jassi Brar

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

Signature · 3 lines
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
author
#8 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 6 lines · Liam Girdwood
Quoted 5 lines · Mark Brown
Quoted 2 lines · Jassi Brar

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 ?

Quoted 7 lines
Quoted 3 lines

Not from me - Liam are you OK? ?It's possible something crept through but we can always fix incrementally.

Fine by me, all

Hi Mark,
Did you miss the ack or want to merge it late ?
Thanks.

#9 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 12 lines · Jassi Brar
Quoted 10 lines · Liam Girdwood
Quoted 8 lines · Mark Brown
Quoted 2 lines · Jassi Brar

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.

Quoted 7 lines
Quoted 3 lines

Fine by me, all

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 <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.

author
#10 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

Quoted 4 lines · Kukjin Kim

Hi Jassi,

I think, need to rebase your patches against latest kernel. Maybe, it would be helpful to me and Mark.

Sounds good, will do.

Thanks

#11 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

In reply to Jassi Brar
Quoted 3 lines · Jassi Brar

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.

author
#12 lore raw

PATCH 8/9 ARM: S5PV210: I2S: Upgrade platform device

In reply to Mark Brown
Quoted 7 lines · Mark Brown
Quoted 2 lines · Kyungmin Park

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.