mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 23:51:33 +00:00
ppc/85xx: Fix LCRR_CLKDIV defines
For some reason the CLKDIV field varies between SoC in how it interprets the bit values. All 83xx and early (e500v1) PQ3 devices support: clk/2: CLKDIV = 2 clk/4: CLKDIV = 4 clk/8: CLKDIV = 8 Newer PQ3 (e500v2) and MPC86xx support: clk/4: CLKDIV = 2 clk/8: CLKDIV = 4 clk/16: CLKDIV = 8 Ensure that the MPC86xx and MPC85xx still get the same behavior and make the defines reflect their logical view (not the value of the field). Signed-off-by: Kumar Gala <galak@kernel.crashing.org> Acked-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
parent
30d7aae7e8
commit
202d94875c
4 changed files with 11 additions and 3 deletions
|
@ -311,9 +311,17 @@
|
|||
*/
|
||||
#define LCRR_CLKDIV 0x0000001F
|
||||
#define LCRR_CLKDIV_SHIFT 0
|
||||
#if defined(CONFIG_MPC83xx) || defined (CONFIG_MPC8540) || \
|
||||
defined(CONFIG_MPC8541) || defined (CONFIG_MPC8555) || \
|
||||
defined(CONFIG_MPC8560)
|
||||
#define LCRR_CLKDIV_2 0x00000002
|
||||
#define LCRR_CLKDIV_4 0x00000004
|
||||
#define LCRR_CLKDIV_8 0x00000008
|
||||
#else
|
||||
#define LCRR_CLKDIV_4 0x00000002
|
||||
#define LCRR_CLKDIV_8 0x00000004
|
||||
#define LCRR_CLKDIV_16 0x00000008
|
||||
#endif
|
||||
|
||||
/* LTEDR - Transfer Error Check Disable Register
|
||||
*/
|
||||
|
|
|
@ -122,7 +122,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
|
|||
* 0xf800_0000 0xffff_ffff NOR Flash 1 128M non-cacheable
|
||||
*/
|
||||
|
||||
#define CONFIG_SYS_LBC_LCRR (LCRR_CLKDIV_2 | LCRR_EADC_3)
|
||||
#define CONFIG_SYS_LBC_LCRR (LCRR_CLKDIV_4 | LCRR_EADC_3)
|
||||
|
||||
/*
|
||||
* NAND flash configuration
|
||||
|
|
|
@ -103,7 +103,7 @@
|
|||
* 0xfc00_0000 0xffff_ffff NOR Flash 1 64M non-cacheable
|
||||
*/
|
||||
|
||||
#define CONFIG_SYS_LBC_LCRR (LCRR_CLKDIV_4 | LCRR_EADC_3)
|
||||
#define CONFIG_SYS_LBC_LCRR (LCRR_CLKDIV_8 | LCRR_EADC_3)
|
||||
|
||||
/*
|
||||
* NAND flash configuration
|
||||
|
|
|
@ -116,7 +116,7 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
|
|||
* 0xf800_0000 0xffff_ffff NOR Flash 1 128M non-cacheable
|
||||
*/
|
||||
|
||||
#define CONFIG_SYS_LBC_LCRR (LCRR_CLKDIV_4 | LCRR_EADC_3)
|
||||
#define CONFIG_SYS_LBC_LCRR (LCRR_CLKDIV_8 | LCRR_EADC_3)
|
||||
|
||||
/*
|
||||
* NAND flash configuration
|
||||
|
|
Loading…
Reference in a new issue