From: kfx <kfx@rock-chips.com>
Date: Tue, 10 Jul 2012 06:55:11 +0000 (+0800)
Subject: i2c: 'move rk30_i2c_platform_data from mach-rk30 to plat-rk' and 'disable i2c4 select... 
X-Git-Tag: firefly_0821_release~9020
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fdf7df16f38c549b5dc3c806b8e7374ecf14182c;p=firefly-linux-kernel-4.4.55.git

i2c: 'move rk30_i2c_platform_data from mach-rk30 to plat-rk' and 'disable i2c4 select on rk2928'
---

diff --git a/arch/arm/mach-rk30/include/mach/board.h b/arch/arm/mach-rk30/include/mach/board.h
index c7f000810aa2..f4f1c358352d 100755
--- a/arch/arm/mach-rk30/include/mach/board.h
+++ b/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);
diff --git a/arch/arm/plat-rk/include/plat/board.h b/arch/arm/plat-rk/include/plat/board.h
index 331f65ff395e..26eb6e49e573 100755
--- a/arch/arm/plat-rk/include/plat/board.h
+++ b/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;
diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 018fad3a83d3..b7a8fd398960 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/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.