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

diff --git a/arch/arm/mach-rk30/include/mach/board.h b/arch/arm/mach-rk30/include/mach/board.h
index c7f000810aa276f02aa8ce25abcfc811ba73005e..f4f1c358352d15e1daac1c139ef6f6bb79785807 100755 (executable)
--- 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 331f65ff395e2f78aedc48e242f0bef18ac7cbb1..26eb6e49e57302a01a64ddc7a3769d967d4ed090 100755 (executable)
--- 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 018fad3a83d362b955864c20fdf42246f4f7db96..b7a8fd39896090fb48f4b4089991c195e9531297 100644 (file)
--- 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.