i2c: fix rk change for i2c gpio

diff --git a/drivers/i2c/algos/Makefile b/drivers/i2c/algos/Makefile
index 6a15fa1e131817e8712a7abb1a79d9cb4ee57c06..215303f60d61d66ee81a9653c9459ad5d9edf313 100644 (file)
--- a/drivers/i2c/algos/Makefile
+++ b/drivers/i2c/algos/Makefile
@@ -2,8 +2,7 @@
 # Makefile for the i2c algorithms
 #
 
-#obj-$(CONFIG_I2C_ALGOBIT)     += i2c-algo-bit.o
-obj-y                                          += i2c-algo-bit.o
+obj-$(CONFIG_I2C_ALGOBIT)      += i2c-algo-bit.o
 obj-$(CONFIG_I2C_ALGOPCF)      += i2c-algo-pcf.o
 obj-$(CONFIG_I2C_ALGOPCA)      += i2c-algo-pca.o
 

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 2d7e414c40709f96a59807fd8b1fab5d914a574d..8c8b36f2b2169106a1f5d56667ae44d877fa3b53 100644 (file)
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -942,6 +942,7 @@ if I2C_RK29
                                config RK29_I2C0_CONTROLLER
                                        bool "With i2c controller"
                                config RK29_I2C0_GPIO
+                                       select I2C_GPIO
                                        bool "Simulation with GPIO"
                        endchoice
                endif
@@ -957,6 +958,7 @@ if I2C_RK29
                                config RK29_I2C1_CONTROLLER
                                        bool "With i2c controller"
                                config RK29_I2C1_GPIO
+                                       select I2C_GPIO
                                        bool "Simulation with GPIO"
                        endchoice
                endif
@@ -973,6 +975,7 @@ if I2C_RK29
                                config RK29_I2C2_CONTROLLER
                                        bool "With i2c controller"
                                config RK29_I2C2_GPIO
+                                       select I2C_GPIO
                                        bool "Simulation with GPIO"
                        endchoice
                endif
@@ -989,6 +992,7 @@ if I2C_RK29
                                config RK29_I2C3_CONTROLLER
                                        bool "With i2c controller"
                                config RK29_I2C3_GPIO
+                                       select I2C_GPIO
                                        bool "Simulation with GPIO"
                        endchoice
                endif

diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
index 3948ba06a19c6720595aff1dd8ec54137d42f8db..7a0151b443c760b7e8e7d670eba9ee1b5b256c2f 100644 (file)
--- a/drivers/i2c/busses/Makefile
+++ b/drivers/i2c/busses/Makefile
@@ -4,7 +4,6 @@
 obj-$(CONFIG_I2C_RK29)         += i2c-rk29.o
 obj-$(CONFIG_I2C_DEV_RK29)     += i2c-dev-rk29.o
 obj-$(CONFIG_I2C_RK30)         += i2c-rk30.o i2c-rk29-adapter.o i2c-rk30-adapter.o i2c-rk30-test.o
-obj-y                          += i2c-gpio.o
 
 # ACPI drivers
 obj-$(CONFIG_I2C_SCMI)         += i2c-scmi.o