summaryrefslogtreecommitdiff
path: root/include/asm-ppc/global_data.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-ppc/global_data.h')
-rw-r--r--include/asm-ppc/global_data.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/include/asm-ppc/global_data.h b/include/asm-ppc/global_data.h
index aa6384c..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;
@@ -163,7 +165,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 \