Skip to contentSkip to conversation

ARM: S3C6410: Define clk_src2 register

PATCH New jassisinghbrar at gmail.com 3 participants 7 messages Mar 9, 2010 – May 11, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/4 ARM: S3C6410: Define clk_src2 register

From: Jassi Brar <[email protected]>

Define S3C6410 specific register - CLK_SRC2

---
 arch/arm/mach-s3c64xx/include/mach/regs-clock.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/include/mach/regs-clock.h +1 -0
index 3ef6274..0114eb0 100644
@@ -33,6 +33,7 @@
 #define S3C_PCLK_GATE		S3C_CLKREG(0x34)
 #define S3C_SCLK_GATE		S3C_CLKREG(0x38)
 #define S3C_MEM0_GATE		S3C_CLKREG(0x3C)
+#define S3C6410_CLK_SRC2	S3C_CLKREG(0x10C)
 
 /* CLKDIV0 */
 #define S3C6400_CLKDIV0_PCLK_MASK	(0xf << 12)
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 2/4 ARM: S3C6410: Declare IISCDCLK_V4 Clock

From: Jassi Brar <[email protected]>

Declare the source of clock provided at Xi2sCDCLK2 pin for IISv4 controller.

---
 arch/arm/mach-s3c64xx/clock.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/clock.c +6 -0
index 2ac2e7d..c0041eb 100644
@@ -518,6 +518,11 @@ static struct clk clk_iis_cd1 = {
 	.id		= -1,
 };
 
+static struct clk clk_iisv4_cd = {
+	.name		= "iis_cdclk_v4",
+	.id		= -1,
+};
+
 static struct clk clk_pcm_cd = {
 	.name		= "pcm_cdclk",
 	.id		= -1,
@@ -749,6 +754,7 @@ static struct clk *clks1[] __initdata = {
 	&clk_ext_xtal_mux,
 	&clk_iis_cd0,
 	&clk_iis_cd1,
+	&clk_iisv4_cd,
 	&clk_pcm_cd,
 	&clk_mout_epll.clk,
 	&clk_mout_mpll.clk,
Signature · 1 line
1.6.2.5
#2 lore raw

PATCH 3/4 ARM: S3C6410: Declare possible sources of audio-bus2

From: Jassi Brar <[email protected]>

Declare possible sources of CLKAUDIO[2]/audio-bus for IISv4 controller.

---
 arch/arm/mach-s3c64xx/clock.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/clock.c +13 -0
index c0041eb..6c286d5 100644
@@ -554,6 +554,19 @@ static struct clksrc_sources clkset_audio1 = {
 	.nr_sources	= ARRAY_SIZE(clkset_audio1_list),
 };
 
+static struct clk *clkset_audio2_list[] = {
+	[0] = &clk_mout_epll.clk,
+	[1] = &clk_dout_mpll,
+	[2] = &clk_fin_epll,
+	[3] = &clk_iisv4_cd,
+	[4] = &clk_pcm_cd,
+};
+
+static struct clksrc_sources clkset_audio2 = {
+	.sources	= clkset_audio2_list,
+	.nr_sources	= ARRAY_SIZE(clkset_audio2_list),
+};
+
 static struct clk *clkset_camif_list[] = {
 	&clk_h2,
 };
Signature · 1 line
1.6.2.5
#3 lore raw

PATCH 4/4 ARM: S3C6410: Declare IISv4 audio-bus clock

From: Jassi Brar <[email protected]>

Declare 'audio-bus' clock for IISv4 controller of S3C6410. Even though the name is same as that for IISv3, the id is set to -1(just one instance of the controller is available) which helps always fetch the correct clock.

---
 arch/arm/mach-s3c64xx/clock.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/clock.c +10 -0
index 6c286d5..da83595 100644
@@ -670,6 +670,16 @@ static struct clksrc_clk clksrcs[] = {
 		.sources	= &clkset_audio1,
 	}, {
 		.clk	= {
+			.name		= "audio-bus",
+			.id		= -1,  /* There's only one IISv4 port */
+			.ctrlbit        = S3C6410_CLKCON_SCLK_AUDIO2,
+			.enable		= s3c64xx_sclk_ctrl,
+		},
+		.reg_src	= { .reg = S3C6410_CLK_SRC2, .shift = 0, .size = 3  },
+		.reg_div	= { .reg = S3C_CLK_DIV2, .shift = 24, .size = 4  },
+		.sources	= &clkset_audio2,
+	}, {
+		.clk	= {
 			.name		= "irda-bus",
 			.id		= 0,
 			.ctrlbit        = S3C_CLKCON_SCLK_IRDA,
Signature · 1 line
1.6.2.5
#4 lore raw

PATCH 4/4 ARM: S3C6410: Declare IISv4 audio-bus clock

Quoted 6 lines · jassisinghbrar at gmail.com

From: Jassi Brar <[email protected]>

Declare 'audio-bus' clock for IISv4 controller of S3C6410. Even though the name is same as that for IISv3, the id is set to -1(just one instance of the controller is available) which helps always fetch the correct clock.

ok, the series look fine.

Quoted 34 lines
---
 arch/arm/mach-s3c64xx/clock.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/clock.c +10 -0
index 6c286d5..da83595 100644
@@ -670,6 +670,16 @@ static struct clksrc_clk clksrcs[] = {
 		.sources	= &clkset_audio1,
 	}, {
 		.clk	= {
+			.name		= "audio-bus",
+			.id		= -1,  /* There's only one IISv4 port */
+			.ctrlbit        = S3C6410_CLKCON_SCLK_AUDIO2,
+			.enable		= s3c64xx_sclk_ctrl,
+		},
+		.reg_src	= { .reg = S3C6410_CLK_SRC2, .shift = 0, .size = 3  },
+		.reg_div	= { .reg = S3C_CLK_DIV2, .shift = 24, .size = 4  },
+		.sources	= &clkset_audio2,
+	}, {
+		.clk	= {
 			.name		= "irda-bus",
 			.id		= 0,
 			.ctrlbit        = S3C_CLKCON_SCLK_IRDA,
Signature · 7 lines
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
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#5 lore raw

PATCH 4/4 ARM: S3C6410: Declare IISv4 audio-bus clock

In reply to jassisinghbrar at gmail.com
Quoted 6 lines · jassisinghbrar at gmail.com

From: Jassi Brar <[email protected]>

Declare 'audio-bus' clock for IISv4 controller of S3C6410. Even though the name is same as that for IISv3, the id is set to -1(just one instance of the controller is available) which helps always fetch the correct clock.

merged onto for-2635/samsung-clock.

Quoted 34 lines
---
 arch/arm/mach-s3c64xx/clock.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/clock.c +10 -0
index 6c286d5..da83595 100644
@@ -670,6 +670,16 @@ static struct clksrc_clk clksrcs[] = {
 		.sources	= &clkset_audio1,
 	}, {
 		.clk	= {
+			.name		= "audio-bus",
+			.id		= -1,  /* There's only one IISv4 port */
+			.ctrlbit        = S3C6410_CLKCON_SCLK_AUDIO2,
+			.enable		= s3c64xx_sclk_ctrl,
+		},
+		.reg_src	= { .reg = S3C6410_CLK_SRC2, .shift = 0, .size = 3  },
+		.reg_div	= { .reg = S3C_CLK_DIV2, .shift = 24, .size = 4  },
+		.sources	= &clkset_audio2,
+	}, {
+		.clk	= {
 			.name		= "irda-bus",
 			.id		= 0,
 			.ctrlbit        = S3C_CLKCON_SCLK_IRDA,
Signature · 7 lines
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
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#6 lore raw

PATCH 1/4 ARM: S3C6410: Define clk_src2 register

In reply to jassisinghbrar at gmail.com
Quoted 3 lines · jassisinghbrar at gmail.com

From: Jassi Brar <[email protected]>

Define S3C6410 specific register - CLK_SRC2

Will sort out a new -next series before the end of the week.

Quoted 25 lines
---
 arch/arm/mach-s3c64xx/include/mach/regs-clock.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/include/mach/regs-clock.h +1 -0
index 3ef6274..0114eb0 100644
@@ -33,6 +33,7 @@
 #define S3C_PCLK_GATE		S3C_CLKREG(0x34)
 #define S3C_SCLK_GATE		S3C_CLKREG(0x38)
 #define S3C_MEM0_GATE		S3C_CLKREG(0x3C)
+#define S3C6410_CLK_SRC2	S3C_CLKREG(0x10C)
 
 /* CLKDIV0 */
 #define S3C6400_CLKDIV0_PCLK_MASK	(0xf << 12)
Signature · 7 lines
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
Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.