Skip to contentSkip to conversation

ARM: S3C64XX: Declare IISv4 PCLK for S3C6410

PATCH New Mark Brown 2 participants 4 messages Feb 17, 2010 – Feb 18, 2010

Subsystems (3)
lore
Share & tools
lore

Mark Brown

author
#0 lore raw

PATCH 1/2 ARM: S3C64XX: Declare IISv4 PCLK for S3C6410

From: Jassi <[email protected]>

[Updated the device ID to -1 since there's only one IISv4 device but the S3C clock API tries to match based on the ID of the requesting device (and not the name) -- broonie.]

---
 arch/arm/plat-s3c64xx/clock.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
arch/arm/plat-s3c64xx/clock.c +8 -0
index 2989c3a..1ba30cb 100644
@@ -129,6 +129,14 @@ static struct clk init_clocks_disable[] = {
 		.enable		= s3c64xx_pclk_ctrl,
 		.ctrlbit	= S3C_CLKCON_PCLK_IIS1,
 	}, {
+#ifdef CONFIG_CPU_S3C6410
+		.name		= "iis",
+		.id		= -1,  /* There's only one IISv4 port */
+		.parent		= &clk_p,
+		.enable		= s3c64xx_pclk_ctrl,
+		.ctrlbit	= S3C6410_CLKCON_PCLK_IIS2,
+	}, {
+#endif
 		.name		= "spi",
 		.id		= 0,
 		.parent		= &clk_p,
Signature · 1 line
1.6.6.1
author
#1 lore raw

PATCH 2/2 ARM: SMDK6410: Register IISv4 device

The IISv4 controller is connected to the WM8580 on the board.

---
 arch/arm/mach-s3c6410/mach-smdk6410.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-s3c6410/mach-smdk6410.c +1 -0
index 297f1fa..6176243 100644
@@ -255,6 +255,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 	&s3c_device_fb,
 	&s3c_device_ohci,
 	&s3c_device_usb_hsotg,
+	&s3c64xx_device_iisv4,
 
 #ifdef CONFIG_REGULATOR
 	&smdk6410_b_pwr_5v,
Signature · 1 line
1.6.6.1
#2 lore raw

PATCH 2/2 ARM: SMDK6410: Register IISv4 device

arch/arm/mach-s3c6410/mach-smdk6410.c static struct platform_device *smdk6410_devices[] __initdata = { · line 258

Quoted 9 lines · Mark Brown
arch/arm/mach-s3c6410/mach-smdk6410.c +1 -0
index 297f1fa..6176243 100644
@@ -255,6 +255,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 ? ? ? ?&s3c_device_fb,
 ? ? ? ?&s3c_device_ohci,
 ? ? ? ?&s3c_device_usb_hsotg,
+ ? ? ? &s3c64xx_device_iisv4,

Since, we now compile dev-audio.c unconditionally, I think this should be ok.

author
#3 lore raw

PATCH 2/2 ARM: SMDK6410: Register IISv4 device

Quoted 7 lines · jassi brar

On Thu, Feb 18, 2010 at 4:03 AM, Mark Brown

Quoted 1 line

+ ? ? ? &s3c64xx_device_iisv4,

Since, we now compile dev-audio.c unconditionally, I think this should be ok.

This is actually a revised version of the patch, rather than the original (I've been carrying it for over a release now...).