Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-rk2928

arch/arm/mach-rk30/include/mach/board.h

@@ -12,18 +12,6 @@
 #include <mach/sram.h>
 #include <linux/i2c-gpio.h>
 
-struct rk30_i2c_platform_data {
-	char *name;
-	int bus_num;
-#define I2C_RK29_ADAP   0
-#define I2C_RK30_ADAP   1
-	int adap_type;
-	int is_div_from_arm;
-	u32 flags;
-	int (*io_init)(void);
-	int (*io_deinit)(void);
-};
-
 /* adc battery */
 struct rk30_adc_battery_platform_data {
         int (*io_init)(void);

arch/arm/plat-rk/include/plat/board.h

@@ -6,6 +6,18 @@
 #include <linux/device.h>
 #include <linux/rk_screen.h>
 
+struct rk30_i2c_platform_data {
+	char *name;
+	int bus_num;
+#define I2C_RK29_ADAP   0
+#define I2C_RK30_ADAP   1
+	int adap_type;
+	int is_div_from_arm;
+	u32 flags;
+	int (*io_init)(void);
+	int (*io_deinit)(void);
+};
+
 struct spi_cs_gpio {
 	const char *name;
 	unsigned int cs_gpio;

drivers/i2c/busses/Kconfig

@@ -907,6 +907,7 @@ if I2C_RK30
 		endif
 	config I2C4_RK30
 		bool "I2C4 Channel Support"
+	        depends on !ARCH_RK2928
 		default y
 		help
 			This supports the use of the I2C4 channel on RK Soc.