drivers: i2c: mxc: Fix compiler error when using i2c dm mode

[oweals/u-boot.git] / drivers / i2c / rk_i2c.c

diff --git a/drivers/i2c/rk_i2c.c b/drivers/i2c/rk_i2c.c
index 68e66536e4e3af6ae759b461ee072b73ff9c4191..cdd94bb05a9009c07e278667f086163e97597516 100644 (file)
--- a/drivers/i2c/rk_i2c.c
+++ b/drivers/i2c/rk_i2c.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2015 Google, Inc
  *
  * (C) Copyright 2008-2014 Rockchip Electronics
  * Peter, Software Engineering, <superpeter.cai@gmail.com>.
- *
- * SPDX-License-Identifier:     GPL-2.0+
  */
 
 #include <common.h>
@@ -13,14 +12,12 @@
 #include <errno.h>
 #include <i2c.h>
 #include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/i2c.h>
-#include <asm/arch/periph.h>
+#include <asm/arch-rockchip/clock.h>
+#include <asm/arch-rockchip/i2c.h>
+#include <asm/arch-rockchip/periph.h>
 #include <dm/pinctrl.h>
 #include <linux/sizes.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /* i2c timerout */
 #define I2C_TIMEOUT_MS         100
 #define I2C_RETRY_COUNT                3
@@ -34,6 +31,18 @@ struct rk_i2c {
        unsigned int speed;
 };
 
+enum {
+       RK_I2C_LEGACY,
+       RK_I2C_NEW,
+};
+
+/**
+ * @controller_type: i2c controller type
+ */
+struct rk_i2c_soc_data {
+       int controller_type;
+};
+
 static inline void rk_i2c_get_div(int div, int *divh, int *divl)
 {
        *divl = div / 2;
@@ -381,8 +390,37 @@ static int rockchip_i2c_ofdata_to_platdata(struct udevice *bus)
 static int rockchip_i2c_probe(struct udevice *bus)
 {
        struct rk_i2c *priv = dev_get_priv(bus);
+       struct rk_i2c_soc_data *soc_data;
+       struct udevice *pinctrl;
+       int bus_nr;
+       int ret;
+
+       priv->regs = dev_read_addr_ptr(bus);
+
+       soc_data = (struct rk_i2c_soc_data*)dev_get_driver_data(bus);
+
+       if (soc_data->controller_type == RK_I2C_LEGACY) {
+               ret = dev_read_alias_seq(bus, &bus_nr);
+               if (ret < 0) {
+                       debug("%s: Could not get alias for %s: %d\n",
+                        __func__, bus->name, ret);
+                       return ret;
+               }
+
+               ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
+               if (ret) {
+                       debug("%s: Cannot find pinctrl device\n", __func__);
+                       return ret;
+               }
 
-       priv->regs = (void *)devfdt_get_addr(bus);
+               /* pinctrl will switch I2C to new type */
+               ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_I2C0 + bus_nr);
+               if (ret) {
+                       debug("%s: Failed to switch I2C to new type %s: %d\n",
+                               __func__, bus->name, ret);
+                       return ret;
+               }
+       }
 
        return 0;
 }
@@ -392,11 +430,55 @@ static const struct dm_i2c_ops rockchip_i2c_ops = {
        .set_bus_speed  = rockchip_i2c_set_bus_speed,
 };
 
+static const struct rk_i2c_soc_data rk3066_soc_data = {
+       .controller_type = RK_I2C_LEGACY,
+};
+
+static const struct rk_i2c_soc_data rk3188_soc_data = {
+       .controller_type = RK_I2C_LEGACY,
+};
+
+static const struct rk_i2c_soc_data rk3228_soc_data = {
+       .controller_type = RK_I2C_NEW,
+};
+
+static const struct rk_i2c_soc_data rk3288_soc_data = {
+       .controller_type = RK_I2C_NEW,
+};
+
+static const struct rk_i2c_soc_data rk3328_soc_data = {
+       .controller_type = RK_I2C_NEW,
+};
+
+static const struct rk_i2c_soc_data rk3399_soc_data = {
+       .controller_type = RK_I2C_NEW,
+};
+
 static const struct udevice_id rockchip_i2c_ids[] = {
-       { .compatible = "rockchip,rk3066-i2c" },
-       { .compatible = "rockchip,rk3188-i2c" },
-       { .compatible = "rockchip,rk3288-i2c" },
-       { .compatible = "rockchip,rk3399-i2c" },
+       {
+               .compatible = "rockchip,rk3066-i2c",
+               .data = (ulong)&rk3066_soc_data,
+       },
+       {
+               .compatible = "rockchip,rk3188-i2c",
+               .data = (ulong)&rk3188_soc_data,
+       },
+       {
+               .compatible = "rockchip,rk3228-i2c",
+               .data = (ulong)&rk3228_soc_data,
+       },
+       {
+               .compatible = "rockchip,rk3288-i2c",
+               .data = (ulong)&rk3288_soc_data,
+       },
+       {
+               .compatible = "rockchip,rk3328-i2c",
+               .data = (ulong)&rk3328_soc_data,
+       },
+       {
+               .compatible = "rockchip,rk3399-i2c",
+               .data = (ulong)&rk3399_soc_data,
+       },
        { }
 };