ARM: S3C6410: Add missing definitions for the IISv4 clock
Subsystems (3)
PATCH 1/1 ARM: S3C6410: Add missing definitions for the IISv4 clock
Commit 301176 ("Declare IISv4 audio-bus clock") requires both the register S3C6410_CLK_SRC2 and the clkset for the IISv4 audio bus but neither of those is defined in mainline. Add definitions, including the addition of the PCMCDCLK[1] and the CDCLK for the IISv4 block both of which are first used by this clock.
--- arch/arm/mach-s3c64xx/clock.c | 23 +++++++++++++++++++++++ arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 1 + 2 files changed, 24 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/clock.c +23 -0
@@ -518,11 +518,21 @@ static struct clk clk_iis_cd1 = { .id = -1, }; +static struct clk clk_iis_v40_cd = { + .name ="iis_v40_cdclk" , + .id =-1 , +}; +static struct clk clk_pcm_cd = { .name ="pcm_cdclk" , .id =-1 , }; +static struct clk clk_pcm_cd1 = { + .name ="pcm_cdclk1" , + .id =-1 , +}; +static struct clk *clkset_audio0_list[] = { [0 ] = &clk_mout_epll.clk, [1 ] = &clk_dout_mpll,
@@ -549,6 +559,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_iis_v40_cd, + [4 ] = &clk_pcm_cd1, +}; + +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, };
arch/arm/mach-s3c64xx/include/mach/regs-clock.h +1 -0
@@ -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.7.0.3
PATCH 1/1 ARM: S3C6410: Add missing definitions for the IISv4 clock
Quoted 5 lines · Mark Brown
Commit 301176 ("Declare IISv4 audio-bus clock") requires both the register
S3C6410_CLK_SRC2and the clkset for the IISv4 audio bus but neither of those is defined in mainline. ?Add definitions, including the addition of the PCMCDCLK[1] and the CDCLK for the IISv4 block both of which are first used by this clock.
Hi Ben,
Seems you missed the first three in the series?
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011036.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011039.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011038.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011037.html
I am ok with this Mark's single patch too though.
Thanks.
PATCH 1/1 ARM: S3C6410: Add missing definitions for the IISv4 clock
Quoted 8 lines · Jassi Brar
Seems you missed the first three in the series?
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011036.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011039.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011038.html
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-March/011037.htmlI am ok with this Mark's single patch too though.
Either way works for me, I don't mind so long as my kernels build and run.