From: Daniel Schwierzeck daniel.schwierzeck@gmail.com

Fix access to global_data which is broken since commits:

commit 035cbe99cd2fd4adf9d7fd95aeebb5f814e37eb9 Author: Simon Glass sjg@chromium.org Date: Thu Dec 13 20:49:08 2012 +0000

mips: Move per_clk and dev_clk to arch_global_data

Move these field into arch_global_data and tidy up. The other CONFIG_JZSOC fields are used by various architectures, so just remove the #ifdef bracketing for these.

Signed-off-by: Simon Glass sjg@chromium.org

commit 582601da2f90b1850aa19f7820b1623c79b3dac6 Author: Simon Glass sjg@chromium.org Date: Thu Dec 13 20:48:35 2012 +0000

arm: Move lastinc to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass sjg@chromium.org

commit 66ee69234795c0596f84b25f06b7fbc2e8ed214c Author: Simon Glass sjg@chromium.org Date: Thu Dec 13 20:48:34 2012 +0000

arm: Move tbl to arch_global_data

Move this field into arch_global_data and tidy up.

Signed-off-by: Simon Glass sjg@chromium.org

Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com Cc: Xiangfu Liu xiangfu@openmobilefree.net --- arch/mips/cpu/xburst/jz4740.c | 6 +++--- arch/mips/include/asm/global_data.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/mips/cpu/xburst/jz4740.c b/arch/mips/cpu/xburst/jz4740.c index c0b9817..b2d8f4d 100644 --- a/arch/mips/cpu/xburst/jz4740.c +++ b/arch/mips/cpu/xburst/jz4740.c @@ -201,10 +201,10 @@ void calc_clocks(void) pllout = __cpm_get_pllout();

gd->cpu_clk = pllout / div[__cpm_get_cdiv()]; - gd->sys_clk = pllout / div[__cpm_get_hdiv()]; - gd->per_clk = pllout / div[__cpm_get_pdiv()]; + gd->arch.sys_clk = pllout / div[__cpm_get_hdiv()]; + gd->arch.per_clk = pllout / div[__cpm_get_pdiv()]; gd->mem_clk = pllout / div[__cpm_get_mdiv()]; - gd->dev_clk = CONFIG_SYS_EXTAL; + gd->arch.dev_clk = CONFIG_SYS_EXTAL; }

void rtc_init(void) diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index b39737f..f912428 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -32,6 +32,9 @@ struct arch_global_data { /* There are other clocks in the jz4740 */ unsigned long per_clk; /* Peripheral bus clock */ unsigned long dev_clk; /* Device clock */ + unsigned long sys_clk; + unsigned long tbl; + unsigned long lastinc; #endif };