GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 19:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mx31ads: fix 32kHz clock handling

Browse source 
According to schematics and to RedBoot sources, the MX31ADS uses a 32768Hz
oscillator as a SKIL source. Fix previously wrongly assumed 32000Hz value.
Also fix a typo when verifying a jumper configuration. While at it, make
two needlessly global functions static.

Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
This commit is contained in:
Guennadi Liakhovetski 2008-05-08 10:09:27 +02:00 • committed by Wolfgang Denk
parent f3f3175746
commit 2ab02fd456
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
board/mx31ads/lowlevel_init.S
View file

@ -220,7 +220,7 @@ lowlevel_init:
mov r1, #CS4_BASE mov r1, #CS4_BASE
ldrh r1, [r1, #0x2] ldrh r1, [r1, #0x2]
/* Is 27MHz switch set? */ /* Is 27MHz switch set? */
ands r1, r1, #0x16 ands r1, r1, #0x10
/* 532-133-66.5 */ /* 532-133-66.5 */
ldr r0, =CCM_BASE ldr r0, =CCM_BASE

4
cpu/arm1136/mx31/generic.c
View file

@ -39,7 +39,7 @@ static u32 mx31_decode_pll(u32 reg, u32 infreq)
(mfd * pd)) << 10; (mfd * pd)) << 10;
} }
u32 mx31_get_mpl_dpdgck_clk(void) static u32 mx31_get_mpl_dpdgck_clk(void)
{ {
u32 infreq; u32 infreq;
@ -51,7 +51,7 @@ u32 mx31_get_mpl_dpdgck_clk(void)
return mx31_decode_pll(__REG(CCM_MPCTL), infreq); return mx31_decode_pll(__REG(CCM_MPCTL), infreq);
} }
u32 mx31_get_mcu_main_clk(void) static u32 mx31_get_mcu_main_clk(void)
{ {
/* For now we assume mpl_dpdgck_clk == mcu_main_clk /* For now we assume mpl_dpdgck_clk == mcu_main_clk
* which should be correct for most boards * which should be correct for most boards

6
include/asm-arm/arch-mx31/mx31.h
View file

@ -24,9 +24,7 @@
#ifndef __ASM_ARCH_MX31_H #ifndef __ASM_ARCH_MX31_H
#define __ASM_ARCH_MX31_H #define __ASM_ARCH_MX31_H
u32 mx31_get_mpl_dpdgck_clk(void); extern u32 mx31_get_ipg_clk(void);
u32 mx31_get_mcu_main_clk(void); extern void mx31_gpio_mux(unsigned long mode);
u32 mx31_get_ipg_clk(void);
void mx31_gpio_mux(unsigned long mode);
#endif /* __ASM_ARCH_MX31_H */ #endif /* __ASM_ARCH_MX31_H */

4
include/configs/mx31ads.h
View file

@ -28,7 +28,7 @@
#define CONFIG_ARM1136 1 /* This is an arm1136 CPU core */ #define CONFIG_ARM1136 1 /* This is an arm1136 CPU core */
#define CONFIG_MX31 1 /* in a mx31 */ #define CONFIG_MX31 1 /* in a mx31 */
#define CONFIG_MX31_HCLK_FREQ 26000000 /* RedBoot says 26MHz */ #define CONFIG_MX31_HCLK_FREQ 26000000 /* RedBoot says 26MHz */
#define CONFIG_MX31_CLK32 32000 #define CONFIG_MX31_CLK32 32768
#define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_CPUINFO
#define CONFIG_DISPLAY_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO
@ -139,7 +139,7 @@
#define CFG_LOAD_ADDR CONFIG_LOADADDR #define CFG_LOAD_ADDR CONFIG_LOADADDR
#define CFG_HZ 32000 #define CFG_HZ CONFIG_MX31_CLK32 /* use 32kHz clock as source */
#define CONFIG_CMDLINE_EDITING 1 #define CONFIG_CMDLINE_EDITING 1