s3c64xx: Add SYNCMUX codes for selection source of HCLKx2
Subsystems (3)
PATCH 3/3 s3c64xx: Add SYNCMUX codes for selection source of HCLKx2
This patch adds SYNCMUX codes for selection source of HCLKx2. According to 'Fig 3-2. The block diagram of clock generator' of 6400/6410 UM, the source of HCLKx2 is DOUT_APLL or MOUT_MPLL that is decided by SYNCMUX. If synchronous mode, it is DOUT_APLL and if asynchronous mode, it is MOUT_MPLL.
--- arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 4 ++++ arch/arm/plat-s3c64xx/s3c6400-clock.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletions(-)
arch/arm/plat-s3c64xx/include/plat/regs-clock.h +4 -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 S3C_OTHERS S3C_CLKREG(0x900)/* CLKDIV0 */ #define S3C6400_CLKDIV0_MFC_MASK (0xf << 28)
@@ -182,6 +183,9 @@#define S3C_CLKCON_SCLK_CAM (1<<2)#define S3C_CLKCON_SCLK_JPEG (1<<1) +/* OTHERS */ +#define S3C_OTHERS_SYNCMUXSEL_SYNC (1<<6) +/* CLKSRC */ #define S3C6400_CLKSRC_APLL_MOUT (1 << 0)
arch/arm/plat-s3c64xx/s3c6400-clock.c +7 -1
@@ -689,7 +689,13 @@ void __init_or_cpufreq s3c6400_setup_clocks(void)printk (KERN_INFO "S3C64XX: PLL settings, A=%ld, M=%ld, E=%ld\n" , apll, mpll, epll); - hclk2 = mpll /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK2 ); +if (__raw_readl (S3C_OTHERS ) &S3C_OTHERS_SYNCMUXSEL_SYNC ) { +/* Synchronous mode */ + hclk2 = apll /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK2 ); + }else { +/* Asynchronous mode */ + hclk2 = mpll /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK2 ); + } hclk = hclk2 /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK ); pclk = hclk2 /GET_DIV (clkdiv0,S3C6400_CLKDIV0_PCLK );
Signature · 1 line
1.5.3.4
PATCH 3/3 s3c64xx: Add SYNCMUX codes for selection source of HCLKx2
Quoted 4 lines · Kukjin Kim
This patch adds SYNCMUX codes for selection source of HCLKx2. According to 'Fig 3-2. The block diagram of clock generator' of 6400/6410 UM, the source of HCLKx2 is
DOUT_APLLorMOUT_MPLLthat is decided by SYNCMUX. If synchronous mode, it isDOUT_APLLand if asynchronous mode, it isMOUT_MPLL.
Please make sure these descriptions wrap at or before 77 characters.
Quoted 36 lines
Signed-off-by Kukjin Kim <[email protected]>--- arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 4 ++++ arch/arm/plat-s3c64xx/s3c6400-clock.c | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletions(-)arch/arm/plat-s3c64xx/include/plat/regs-clock.h +4
-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 S3C_OTHERS S3C_CLKREG(0x900)/* CLKDIV0 */ #define S3C6400_CLKDIV0_MFC_MASK (0xf << 28)@@ -182,6 +183,9 @@#define S3C_CLKCON_SCLK_CAM (1<<2)#define S3C_CLKCON_SCLK_JPEG (1<<1) +/* OTHERS */ +#define S3C_OTHERS_SYNCMUXSEL_SYNC (1<<6) +/* CLKSRC */ #define S3C6400_CLKSRC_APLL_MOUT (1 << 0)arch/arm/plat-s3c64xx/s3c6400-clock.c +0
-0@@ -689,7 +689,13 @@ void __init_or_cpufreq s3c6400_setup_clocks(void)printk (KERN_INFO "S3C64XX: PLL settings, A=%ld, M=%ld, E=%ld\n" , apll, mpll, epll);
arch/arm/plat-s3c64xx/s3c6400-clock.c void __init_or_cpufreq s3c6400_setup_clocks(void) · line 700
Quoted 10 lines
arch/arm/plat-s3c64xx/s3c6400-clock.c +7
-1- hclk2 = mpll /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK2 ); +if (__raw_readl (S3C_OTHERS ) &S3C_OTHERS_SYNCMUXSEL_SYNC ) { +/* Synchronous mode */ + hclk2 = apll /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK2 ); + }else { +/* Asynchronous mode */ + hclk2 = mpll /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK2 ); + } hclk = hclk2 /GET_DIV (clkdiv0,S3C6400_CLKDIV0_HCLK ); pclk = hclk2 /GET_DIV (clkdiv0,S3C6400_CLKDIV0_PCLK );
It should also be noted that the clk->parent of hclk2 should also be correctly setup and any necessary changes to the clock code be made to reflect this.
Signature · 4 lines
Ben Q: What's a light-year? A: One-third less calories than a regular year.