commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=3d6f021cb8e08a9b00c26284f75ce6986ee094f3 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Sonic Zhang <[email protected]> --- arch/blackfin/include/asm/mem_init.h | 3 ++- arch/blackfin/mach-common/clocks-init.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/blackfin/include/asm/mem_init.h b/arch/blackfin/include/asm/mem_init.h index cbbbda4..df481b0 100644 --- a/arch/blackfin/include/asm/mem_init.h +++ b/arch/blackfin/include/asm/mem_init.h @@ -326,7 +326,8 @@ #define CLKSALGN 0x8 /* CGU Control bits */ -#define VCO_MULT_MASK 0x7F00 +#define MSEL_MASK 0x7F00 +#define DF_MASK 0x1 #define CGU_CTL_VAL ((CONFIG_VCO_MULT << 8) | CLKIN_HALF) #define CGU_DIV_VAL \ diff --git a/arch/blackfin/mach-common/clocks-init.c b/arch/blackfin/mach-common/clocks-init.c index 18e2d15..780fc19 100644 --- a/arch/blackfin/mach-common/clocks-init.c +++ b/arch/blackfin/mach-common/clocks-init.c @@ -40,7 +40,7 @@ void init_clocks(void) } /* Don't set the same value of MSEL and DF to CGU_CTL */ - if ((bfin_read32(CGU0_CTL) & (VCO_MULT_MASK | CLKIN_HALF)) + if ((bfin_read32(CGU0_CTL) & (MSEL_MASK | DF_MASK)) != CGU_CTL_VAL) { bfin_write32(CGU0_DIV, CGU_DIV_VAL); bfin_write32(CGU0_CTL, CGU_CTL_VAL);
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
