i2c: designware: enable SLAVE in platform module

- Slave mode selected in platform module if the support is detected in
  the DT.

Signed-off-by: Luis Oliveira <lolivei@synopsys.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-designware-core.h b/drivers/i2c/busses/i2c-designware-core.h
index 64a39a9834103ca5ce54374f93b17ae43467fdbe..7bfbcc62f6c5172898e3e454c16365d52b4f73e0 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-core.h
+++ b/drivers/i2c/busses/i2c-designware-core.h
@@ -228,6 +228,7 @@
  * @disable: function to disable the controller
  * @disable_int: function to disable all interrupts
  * @init: function to initialize the I2C hardware
+ * @mode: operation mode - DW_IC_MASTER or DW_IC_SLAVE
  *
  * HCNT and LCNT parameters can be used if the platform knows more accurate
  * values than the one computed based only on the input clock frequency.
@@ -282,6 +283,7 @@ struct dw_i2c_dev {
        void                    (*disable)(struct dw_i2c_dev *dev);
        void                    (*disable_int)(struct dw_i2c_dev *dev);
        int                     (*init)(struct dw_i2c_dev *dev);
+       int                     mode;
 };
 
 #define ACCESS_SWAP            0x00000001

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 1f38c807be5f5fba82616cda850d8f40df4b3972..2ea6d0d25a01a33069bce293ab6858947a0cb01f 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -1,5 +1,5 @@
 /*
- * Synopsys DesignWare I2C adapter driver (master only).
+ * Synopsys DesignWare I2C adapter driver.
  *
  * Based on the TI DAVINCI I2C adapter driver.
  *
@@ -174,9 +174,13 @@ static inline int dw_i2c_acpi_configure(struct platform_device *pdev)
 
 static void i2c_dw_configure_master(struct dw_i2c_dev *dev)
 {
+       dev->functionality = I2C_FUNC_10BIT_ADDR | DW_IC_DEFAULT_FUNCTIONALITY;
+
        dev->master_cfg = DW_IC_CON_MASTER | DW_IC_CON_SLAVE_DISABLE |
                          DW_IC_CON_RESTART_EN;
 
+       dev->mode = DW_IC_MASTER;
+
        switch (dev->clk_freq) {
        case 100000:
                dev->master_cfg |= DW_IC_CON_SPEED_STD;
@@ -189,6 +193,28 @@ static void i2c_dw_configure_master(struct dw_i2c_dev *dev)
        }
 }
 
+static void i2c_dw_configure_slave(struct dw_i2c_dev *dev)
+{
+       dev->functionality = I2C_FUNC_SLAVE | DW_IC_DEFAULT_FUNCTIONALITY;
+
+       dev->slave_cfg = DW_IC_CON_RX_FIFO_FULL_HLD_CTRL |
+                        DW_IC_CON_RESTART_EN | DW_IC_CON_STOP_DET_IFADDRESSED |
+                        DW_IC_CON_SPEED_FAST;
+
+       dev->mode = DW_IC_SLAVE;
+
+       switch (dev->clk_freq) {
+       case 100000:
+               dev->slave_cfg |= DW_IC_CON_SPEED_STD;
+               break;
+       case 3400000:
+               dev->slave_cfg |= DW_IC_CON_SPEED_HIGH;
+               break;
+       default:
+               dev->slave_cfg |= DW_IC_CON_SPEED_FAST;
+       }
+}
+
 static int i2c_dw_plat_prepare_clk(struct dw_i2c_dev *i_dev, bool prepare)
 {
        if (IS_ERR(i_dev->clk))
@@ -302,9 +328,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
        if (ret)
                goto exit_reset;
 
-       dev->functionality = I2C_FUNC_10BIT_ADDR | DW_IC_DEFAULT_FUNCTIONALITY;
-
-       i2c_dw_configure_master(dev);
+       if (i2c_detect_slave_mode(&pdev->dev))
+               i2c_dw_configure_slave(dev);
+       else
+               i2c_dw_configure_master(dev);
 
        dev->clk = devm_clk_get(&pdev->dev, NULL);
        if (!i2c_dw_plat_prepare_clk(dev, true)) {
@@ -333,7 +360,11 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
                pm_runtime_enable(&pdev->dev);
        }
 
-       ret = i2c_dw_probe(dev);
+       if (dev->mode == DW_IC_SLAVE)
+               ret = i2c_dw_probe_slave(dev);
+       else
+               ret = i2c_dw_probe(dev);
+
        if (ret)
                goto exit_probe;