3 files changed, 7 insertions, 6 deletions

diff --git a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
index 928656e241dd..c58e093b6032 100644
--- a/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+++ b/drivers/i2c/muxes/i2c-arb-gpio-challenge.c
@@ -238,7 +238,7 @@ static struct platform_driver i2c_arbitrator_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "i2c-arb-gpio-challenge",
-                .of_match_table = of_match_ptr(i2c_arbitrator_of_match),
+                .of_match_table = i2c_arbitrator_of_match,
         },
 };
 
diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c
index a764da777f08..8a8c56f4b026 100644
--- a/drivers/i2c/muxes/i2c-mux-gpio.c
+++ b/drivers/i2c/muxes/i2c-mux-gpio.c
@@ -30,15 +30,15 @@ static void i2c_mux_gpio_set(const struct gpiomux *mux, unsigned val)
         int i;
 
         for (i = 0; i < mux->data.n_gpios; i++)
-                gpio_set_value(mux->gpio_base + mux->data.gpios[i],
-                               val & (1 << i));
+                gpio_set_value_cansleep(mux->gpio_base + mux->data.gpios[i],
+                                        val & (1 << i));
 }
 
 static int i2c_mux_gpio_select(struct i2c_adapter *adap, void *data, u32 chan)
 {
         struct gpiomux *mux = data;
 
-        i2c_mux_gpio_set(mux, mux->data.values[chan]);
+        i2c_mux_gpio_set(mux, chan);
 
         return 0;
 }
@@ -228,7 +228,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
                 unsigned int class = mux->data.classes ? mux->data.classes[i] : 0;
 
                 mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux, nr,
-                                                   i, class,
+                                                   mux->data.values[i], class,
                                                    i2c_mux_gpio_select, deselect);
                 if (!mux->adap[i]) {
                         ret = -ENODEV;
@@ -283,7 +283,7 @@ static struct platform_driver i2c_mux_gpio_driver = {
         .driver = {
                 .owner  = THIS_MODULE,
                 .name   = "i2c-mux-gpio",
-                .of_match_table = of_match_ptr(i2c_mux_gpio_of_match),
+                .of_match_table = i2c_mux_gpio_of_match,
         },
 };
 
diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c
index 68a37157377d..d7978dc4ad0b 100644
--- a/drivers/i2c/muxes/i2c-mux-pinctrl.c
+++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c
@@ -24,6 +24,7 @@
 #include <linux/i2c-mux-pinctrl.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 struct i2c_mux_pinctrl {
         struct device *dev;