* [PATCH 1/4] ARM: S3C6410: Define clk_src2 register @ 2010-03-09 6:10 jassisinghbrar at gmail.com 2010-03-09 6:10 ` [PATCH 2/4] ARM: S3C6410: Declare IISCDCLK_V4 Clock jassisinghbrar at gmail.com 2010-03-31 1:26 ` [PATCH 1/4] ARM: S3C6410: Define clk_src2 register Ben Dooks 0 siblings, 2 replies; 7+ messages in thread From: jassisinghbrar at gmail.com @ 2010-03-09 6:10 UTC (permalink / raw) To: linux-arm-kernel From: Jassi Brar <jassi.brar@samsung.com> Define S3C6410 specific register - CLK_SRC2 Signed-off-by: Jassi Brar <jassi.brar@samsung.com> --- arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-clock.h b/arch/arm/mach-s3c64xx/include/mach/regs-clock.h index 3ef6274..0114eb0 100644 --- a/arch/arm/mach-s3c64xx/include/mach/regs-clock.h +++ b/arch/arm/mach-s3c64xx/include/mach/regs-clock.h @@ -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) -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/4] ARM: S3C6410: Declare IISCDCLK_V4 Clock 2010-03-09 6:10 [PATCH 1/4] ARM: S3C6410: Define clk_src2 register jassisinghbrar at gmail.com @ 2010-03-09 6:10 ` jassisinghbrar at gmail.com 2010-03-09 6:10 ` [PATCH 3/4] ARM: S3C6410: Declare possible sources of audio-bus2 jassisinghbrar at gmail.com 2010-03-31 1:26 ` [PATCH 1/4] ARM: S3C6410: Define clk_src2 register Ben Dooks 1 sibling, 1 reply; 7+ messages in thread From: jassisinghbrar at gmail.com @ 2010-03-09 6:10 UTC (permalink / raw) To: linux-arm-kernel From: Jassi Brar <jassi.brar@samsung.com> Declare the source of clock provided at Xi2sCDCLK2 pin for IISv4 controller. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> --- arch/arm/mach-s3c64xx/clock.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 2ac2e7d..c0041eb 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -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, -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/4] ARM: S3C6410: Declare possible sources of audio-bus2 2010-03-09 6:10 ` [PATCH 2/4] ARM: S3C6410: Declare IISCDCLK_V4 Clock jassisinghbrar at gmail.com @ 2010-03-09 6:10 ` jassisinghbrar at gmail.com 2010-03-09 6:10 ` [PATCH 4/4] ARM: S3C6410: Declare IISv4 audio-bus clock jassisinghbrar at gmail.com 0 siblings, 1 reply; 7+ messages in thread From: jassisinghbrar at gmail.com @ 2010-03-09 6:10 UTC (permalink / raw) To: linux-arm-kernel From: Jassi Brar <jassi.brar@samsung.com> Declare possible sources of CLKAUDIO[2]/audio-bus for IISv4 controller. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> --- arch/arm/mach-s3c64xx/clock.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index c0041eb..6c286d5 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -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, }; -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] ARM: S3C6410: Declare IISv4 audio-bus clock 2010-03-09 6:10 ` [PATCH 3/4] ARM: S3C6410: Declare possible sources of audio-bus2 jassisinghbrar at gmail.com @ 2010-03-09 6:10 ` jassisinghbrar at gmail.com 2010-03-31 1:26 ` Ben Dooks 2010-05-11 1:10 ` Ben Dooks 0 siblings, 2 replies; 7+ messages in thread From: jassisinghbrar at gmail.com @ 2010-03-09 6:10 UTC (permalink / raw) To: linux-arm-kernel From: Jassi Brar <jassi.brar@samsung.com> 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. Signed-off-by: Jassi Brar <jassi.brar@samsung.com> --- arch/arm/mach-s3c64xx/clock.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c index 6c286d5..da83595 100644 --- a/arch/arm/mach-s3c64xx/clock.c +++ b/arch/arm/mach-s3c64xx/clock.c @@ -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, -- 1.6.2.5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/4] ARM: S3C6410: Declare IISv4 audio-bus clock 2010-03-09 6:10 ` [PATCH 4/4] ARM: S3C6410: Declare IISv4 audio-bus clock jassisinghbrar at gmail.com @ 2010-03-31 1:26 ` Ben Dooks 2010-05-11 1:10 ` Ben Dooks 1 sibling, 0 replies; 7+ messages in thread From: Ben Dooks @ 2010-03-31 1:26 UTC (permalink / raw) To: linux-arm-kernel On Tue, Mar 09, 2010 at 03:10:34PM +0900, jassisinghbrar at gmail.com wrote: > From: Jassi Brar <jassi.brar@samsung.com> > > 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. > Signed-off-by: Jassi Brar <jassi.brar@samsung.com> > --- > arch/arm/mach-s3c64xx/clock.c | 10 ++++++++++ > 1 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c > index 6c286d5..da83595 100644 > --- a/arch/arm/mach-s3c64xx/clock.c > +++ b/arch/arm/mach-s3c64xx/clock.c > @@ -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, > -- > 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 -- -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 4/4] ARM: S3C6410: Declare IISv4 audio-bus clock 2010-03-09 6:10 ` [PATCH 4/4] ARM: S3C6410: Declare IISv4 audio-bus clock jassisinghbrar at gmail.com 2010-03-31 1:26 ` Ben Dooks @ 2010-05-11 1:10 ` Ben Dooks 1 sibling, 0 replies; 7+ messages in thread From: Ben Dooks @ 2010-05-11 1:10 UTC (permalink / raw) To: linux-arm-kernel On Tue, Mar 09, 2010 at 03:10:34PM +0900, jassisinghbrar at gmail.com wrote: > From: Jassi Brar <jassi.brar@samsung.com> > > 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. > Signed-off-by: Jassi Brar <jassi.brar@samsung.com> > --- > arch/arm/mach-s3c64xx/clock.c | 10 ++++++++++ > 1 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c > index 6c286d5..da83595 100644 > --- a/arch/arm/mach-s3c64xx/clock.c > +++ b/arch/arm/mach-s3c64xx/clock.c > @@ -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, > -- > 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 -- -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/4] ARM: S3C6410: Define clk_src2 register 2010-03-09 6:10 [PATCH 1/4] ARM: S3C6410: Define clk_src2 register jassisinghbrar at gmail.com 2010-03-09 6:10 ` [PATCH 2/4] ARM: S3C6410: Declare IISCDCLK_V4 Clock jassisinghbrar at gmail.com @ 2010-03-31 1:26 ` Ben Dooks 1 sibling, 0 replies; 7+ messages in thread From: Ben Dooks @ 2010-03-31 1:26 UTC (permalink / raw) To: linux-arm-kernel On Tue, Mar 09, 2010 at 03:10:31PM +0900, jassisinghbrar at gmail.com wrote: > From: Jassi Brar <jassi.brar@samsung.com> > > Define S3C6410 specific register - CLK_SRC2 Will sort out a new -next series before the end of the week. > Signed-off-by: Jassi Brar <jassi.brar@samsung.com> > --- > arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-clock.h b/arch/arm/mach-s3c64xx/include/mach/regs-clock.h > index 3ef6274..0114eb0 100644 > --- a/arch/arm/mach-s3c64xx/include/mach/regs-clock.h > +++ b/arch/arm/mach-s3c64xx/include/mach/regs-clock.h > @@ -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) > -- > 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 -- -- Ben Q: What's a light-year? A: One-third less calories than a regular year. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-05-11 1:10 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-03-09 6:10 [PATCH 1/4] ARM: S3C6410: Define clk_src2 register jassisinghbrar at gmail.com 2010-03-09 6:10 ` [PATCH 2/4] ARM: S3C6410: Declare IISCDCLK_V4 Clock jassisinghbrar at gmail.com 2010-03-09 6:10 ` [PATCH 3/4] ARM: S3C6410: Declare possible sources of audio-bus2 jassisinghbrar at gmail.com 2010-03-09 6:10 ` [PATCH 4/4] ARM: S3C6410: Declare IISv4 audio-bus clock jassisinghbrar at gmail.com 2010-03-31 1:26 ` Ben Dooks 2010-05-11 1:10 ` Ben Dooks 2010-03-31 1:26 ` [PATCH 1/4] ARM: S3C6410: Define clk_src2 register Ben Dooks
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.