* [PATCH 1/2] ARM: S3C64XX: Declare IISv4 PCLK for S3C6410
@ 2010-02-17 19:03 Mark Brown
2010-02-17 19:03 ` [PATCH 2/2] ARM: SMDK6410: Register IISv4 device Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2010-02-17 19:03 UTC (permalink / raw)
To: linux-arm-kernel
From: Jassi <jassi.brar@samsung.com>
[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.]
Signed-Off-by: Jassi <jassi.brar@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/plat-s3c64xx/clock.c | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-s3c64xx/clock.c b/arch/arm/plat-s3c64xx/clock.c
index 2989c3a..1ba30cb 100644
--- a/arch/arm/plat-s3c64xx/clock.c
+++ b/arch/arm/plat-s3c64xx/clock.c
@@ -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,
--
1.6.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: SMDK6410: Register IISv4 device
2010-02-17 19:03 [PATCH 1/2] ARM: S3C64XX: Declare IISv4 PCLK for S3C6410 Mark Brown
@ 2010-02-17 19:03 ` Mark Brown
2010-02-18 1:07 ` jassi brar
0 siblings, 1 reply; 4+ messages in thread
From: Mark Brown @ 2010-02-17 19:03 UTC (permalink / raw)
To: linux-arm-kernel
The IISv4 controller is connected to the WM8580 on the board.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
arch/arm/mach-s3c6410/mach-smdk6410.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
index 297f1fa..6176243 100644
--- a/arch/arm/mach-s3c6410/mach-smdk6410.c
+++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
@@ -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,
--
1.6.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: SMDK6410: Register IISv4 device
2010-02-17 19:03 ` [PATCH 2/2] ARM: SMDK6410: Register IISv4 device Mark Brown
@ 2010-02-18 1:07 ` jassi brar
2010-02-18 9:32 ` Mark Brown
0 siblings, 1 reply; 4+ messages in thread
From: jassi brar @ 2010-02-18 1:07 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 18, 2010 at 4:03 AM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> diff --git a/arch/arm/mach-s3c6410/mach-smdk6410.c b/arch/arm/mach-s3c6410/mach-smdk6410.c
> index 297f1fa..6176243 100644
> --- a/arch/arm/mach-s3c6410/mach-smdk6410.c
> +++ b/arch/arm/mach-s3c6410/mach-smdk6410.c
> @@ -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.
Acked-by: Jassi Brar <jassi.brar@samsung.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: SMDK6410: Register IISv4 device
2010-02-18 1:07 ` jassi brar
@ 2010-02-18 9:32 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2010-02-18 9:32 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Feb 18, 2010 at 10:07:53AM +0900, jassi brar wrote:
> On Thu, Feb 18, 2010 at 4:03 AM, Mark Brown
> > + ? ? ? &s3c64xx_device_iisv4,
> Since, we now compile dev-audio.c unconditionally, I think this should be ok.
> Acked-by: Jassi Brar <jassi.brar@samsung.com>
This is actually a revised version of the patch, rather than the
original (I've been carrying it for over a release now...).
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-02-18 9:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-17 19:03 [PATCH 1/2] ARM: S3C64XX: Declare IISv4 PCLK for S3C6410 Mark Brown
2010-02-17 19:03 ` [PATCH 2/2] ARM: SMDK6410: Register IISv4 device Mark Brown
2010-02-18 1:07 ` jassi brar
2010-02-18 9:32 ` Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).