ppc: Clean up calling of misc_init_r() during init

[platform/kernel/u-boot.git] / include / 4xx_i2c.h

diff --git a/include/4xx_i2c.h b/include/4xx_i2c.h
index 66b7997..f0e772c 100644 (file)
--- a/include/4xx_i2c.h
+++ b/include/4xx_i2c.h
@@ -41,11 +41,12 @@
 #endif /* CONFIG_I2C_MULTI_BUS */
 
 #if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
-    defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
-#define I2C_BASE_ADDR  (CFG_PERIPHERAL_BASE + 0x00000700 + I2C_BUS_OFFS)
-#elif defined(CONFIG_440)
+    defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
+    defined(CONFIG_460EX) || defined(CONFIG_460GT)
+#define I2C_BASE_ADDR  (CONFIG_SYS_PERIPHERAL_BASE + 0x00000700 + I2C_BUS_OFFS)
+#elif defined(CONFIG_440) || defined(CONFIG_405EX)
 /* all remaining 440 variants */
-#define I2C_BASE_ADDR  (CFG_PERIPHERAL_BASE + 0x00000400 + I2C_BUS_OFFS)
+#define I2C_BASE_ADDR  (CONFIG_SYS_PERIPHERAL_BASE + 0x00000400 + I2C_BUS_OFFS)
 #else
 /* all 405 variants */
 #define I2C_BASE_ADDR  (0xEF600500 + I2C_BUS_OFFS)