Merge branch 'master' of git://git.denx.de/u-boot-i2c

arch/powerpc/cpu/mpc85xx/speed.c

@@ -399,7 +399,8 @@ int get_clocks (void)
 	 * AN2919.
 	 */
 #if defined(CONFIG_MPC8540) || defined(CONFIG_MPC8541) || \
-	defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555)
+	defined(CONFIG_MPC8560) || defined(CONFIG_MPC8555) || \
+	defined(CONFIG_P1022)
 	gd->arch.i2c1_clk = sys_info.freq_systembus;
 #elif defined(CONFIG_MPC8544)
 	/*

arch/powerpc/cpu/mpc85xx/u-boot-spl.lds

@@ -44,6 +44,11 @@ SECTIONS
 	}
 	_edata  =  .;
 
+	. = ALIGN(4);
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
+	}
+
 	. = .;
 	__start___ex_table = .;
 	__ex_table : { *(__ex_table) }

board/freescale/p1022ds/spl.c

@@ -102,7 +102,11 @@ void board_init_r(gd_t *gd, ulong dest_addr)
 	env_relocate();
 #endif
 
-	i2c_init(CONFIG_SYS_FSL_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#ifdef CONFIG_SYS_I2C
+	i2c_init_all();
+#else
+	i2c_init(CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE);
+#endif
 
 	gd->ram_size = initdram(0);
 #ifdef CONFIG_SPL_NAND_BOOT