MIPS: xburst: fix broken access to global_data
PATCH 1/1 MIPS: xburst: fix broken access to global_data
From: Daniel Schwierzeck <[email protected]>
Fix access to global_data which is broken since commits:
commit 035cbe99cd2fd4adf9d7fd95aeebb5f814e37eb9
Author: Simon Glass <[email protected]> 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 <[email protected]>
commit 582601da2f90b1850aa19f7820b1623c79b3dac6
Author: Simon Glass <[email protected]> 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 <[email protected]>
commit 66ee69234795c0596f84b25f06b7fbc2e8ed214c
Author: Simon Glass <[email protected]> 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 <[email protected]>
Signed-off-by Daniel Schwierzeck <[email protected]>
Cc Xiangfu Liu <[email protected]>
--- arch/mips/cpu/xburst/jz4740.c | 6 +++--- arch/mips/include/asm/global_data.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-)
arch/mips/cpu/xburst/jz4740.c +3 -3
@@ -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 )
arch/mips/include/asm/global_data.h +3 -0
@@ -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 };
Signature · 1 line
1.8.1.1