From e7670f6c1e52ae6d2a43ff75a8bcfa7a5c86e47b Mon Sep 17 00:00:00 2001 From: Wolfgang Denk Date: Thu, 14 Feb 2008 22:43:22 +0100 Subject: PPC: Use r2 instead of r29 as global data pointer R29 was an unlucky choice as with recent toolchains (gcc-4.2.x) gcc will refuse to use load/store multiple insns; instead, it issues a list of simple load/store instructions upon function entry and exit, resulting in bigger code size, which in turn makes the build for a few boards fail. Use r2 instead. Signed-off-by: Wolfgang Denk --- include/asm-ppc/global_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/asm-ppc/global_data.h') diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index aa6384c..bacd02d 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -163,7 +163,7 @@ typedef struct global_data { #define GD_FLG_SILENT 0x00004 /* Silent mode */ #if 1 -#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r29") +#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r2") #else /* We could use plain global data, but the resulting code is bigger */ #define XTRN_DECLARE_GLOBAL_DATA_PTR extern #define DECLARE_GLOBAL_DATA_PTR XTRN_DECLARE_GLOBAL_DATA_PTR \ -- cgit v1.1 From 943afa229cf5bf70ef917c7eb6bd0db59a1ba602 Mon Sep 17 00:00:00 2001 From: Timur Tabi Date: Wed, 9 Jan 2008 14:35:26 -0600 Subject: 85xx, 86xx: Determine I2C clock frequencies and store in global_data Update global_data to define i2c1_clk and i2c2_clk to 85xx and 86xx. Update the get_clocks() function in 85xx and 86xx to determine the I2C clock frequency and store it in gd->i2c1_clk and gd->i2c2_clk. Signed-off-by: Timur Tabi --- include/asm-ppc/global_data.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'include/asm-ppc/global_data.h') diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h index bacd02d..f9a3d92 100644 --- a/include/asm-ppc/global_data.h +++ b/include/asm-ppc/global_data.h @@ -70,8 +70,6 @@ typedef struct global_data { u32 sdhc_clk; #endif u32 core_clk; - u32 i2c1_clk; - u32 i2c2_clk; u32 enc_clk; u32 lbiu_clk; u32 lclk_clk; @@ -88,6 +86,10 @@ typedef struct global_data { u32 ddr_sec_clk; #endif /* CONFIG_MPC8360 */ #endif +#if defined(CONFIG_MPC83XX) || defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) + u32 i2c1_clk; + u32 i2c2_clk; +#endif #if defined(CONFIG_QE) u32 qe_clk; u32 brg_clk; -- cgit v1.1