11 files changed, 57 insertions, 18 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 6d94e2ec5b4f..d252276feadf 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -79,12 +79,12 @@ config I2C_AMD8111
 
 config I2C_HIX5HD2
         tristate "Hix5hd2 high-speed I2C driver"
-        depends on ARCH_HIX5HD2 || COMPILE_TEST
+        depends on ARCH_HISI || ARCH_HIX5HD2 || COMPILE_TEST
         help
-          Say Y here to include support for high-speed I2C controller in the
-          Hisilicon based hix5hd2 SoCs.
+          Say Y here to include support for the high-speed I2C controller
+          used in HiSilicon hix5hd2 SoCs.
 
-          This driver can also be built as a module.  If so, the module
+          This driver can also be built as a module. If so, the module
           will be called i2c-hix5hd2.
 
 config I2C_I801
@@ -589,10 +589,10 @@ config I2C_IMG
 
 config I2C_IMX
         tristate "IMX I2C interface"
-        depends on ARCH_MXC || ARCH_LAYERSCAPE
+        depends on ARCH_MXC || ARCH_LAYERSCAPE || COLDFIRE
         help
           Say Y here if you want to use the IIC bus controller on
-          the Freescale i.MX/MXC or Layerscape processors.
+          the Freescale i.MX/MXC, Layerscape or ColdFire processors.
 
           This driver can also be built as a module.  If so, the module
           will be called i2c-imx.
diff --git a/drivers/i2c/busses/i2c-designware-core.c b/drivers/i2c/busses/i2c-designware-core.c
index 1fe93c43215c..11e866d05368 100644
--- a/drivers/i2c/busses/i2c-designware-core.c
+++ b/drivers/i2c/busses/i2c-designware-core.c
@@ -95,6 +95,9 @@
 #define DW_IC_STATUS_TFE                BIT(2)
 #define DW_IC_STATUS_MST_ACTIVITY       BIT(5)
 
+#define DW_IC_SDA_HOLD_RX_SHIFT         16
+#define DW_IC_SDA_HOLD_RX_MASK          GENMASK(23, DW_IC_SDA_HOLD_RX_SHIFT)
+
 #define DW_IC_ERR_TX_ABRT       0x1
 
 #define DW_IC_TAR_10BITADDR_MASTER BIT(12)
@@ -420,12 +423,20 @@ int i2c_dw_init(struct dw_i2c_dev *dev)
         /* Configure SDA Hold Time if required */
         reg = dw_readl(dev, DW_IC_COMP_VERSION);
         if (reg >= DW_IC_SDA_HOLD_MIN_VERS) {
-                if (dev->sda_hold_time) {
-                        dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD);
-                } else {
+                if (!dev->sda_hold_time) {
                         /* Keep previous hold time setting if no one set it */
                         dev->sda_hold_time = dw_readl(dev, DW_IC_SDA_HOLD);
                 }
+                /*
+                 * Workaround for avoiding TX arbitration lost in case I2C
+                 * slave pulls SDA down "too quickly" after falling egde of
+                 * SCL by enabling non-zero SDA RX hold. Specification says it
+                 * extends incoming SDA low to high transition while SCL is
+                 * high but it apprears to help also above issue.
+                 */
+                if (!(dev->sda_hold_time & DW_IC_SDA_HOLD_RX_MASK))
+                        dev->sda_hold_time |= 1 << DW_IC_SDA_HOLD_RX_SHIFT;
+                dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD);
         } else {
                 dev_warn(dev->dev,
                         "Hardware too old to adjust SDA hold time.\n");
diff --git a/drivers/i2c/busses/i2c-digicolor.c b/drivers/i2c/busses/i2c-digicolor.c
index 9604024e0eb0..49f2084f7bb5 100644
--- a/drivers/i2c/busses/i2c-digicolor.c
+++ b/drivers/i2c/busses/i2c-digicolor.c
@@ -368,6 +368,7 @@ static const struct of_device_id dc_i2c_match[] = {
         { .compatible = "cnxt,cx92755-i2c" },
         { },
 };
+MODULE_DEVICE_TABLE(of, dc_i2c_match);
 
 static struct platform_driver dc_i2c_driver = {
         .probe   = dc_i2c_probe,
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c
index 08847e8b8998..eb3627f35d12 100644
--- a/drivers/i2c/busses/i2c-i801.c
+++ b/drivers/i2c/busses/i2c-i801.c
@@ -146,6 +146,7 @@
 #define SMBHSTCFG_HST_EN        1
 #define SMBHSTCFG_SMB_SMI_EN    2
 #define SMBHSTCFG_I2C_EN        4
+#define SMBHSTCFG_SPD_WD        0x10
 
 /* TCO configuration bits for TCOCTL */
 #define TCOCTL_EN               0x0100
@@ -865,9 +866,16 @@ static s32 i801_access(struct i2c_adapter *adap, u16 addr,
                 block = 1;
                 break;
         case I2C_SMBUS_I2C_BLOCK_DATA:
-                /* NB: page 240 of ICH5 datasheet shows that the R/#W
-                 * bit should be cleared here, even when reading */
-                outb_p((addr & 0x7f) << 1, SMBHSTADD(priv));
+                /*
+                 * NB: page 240 of ICH5 datasheet shows that the R/#W
+                 * bit should be cleared here, even when reading.
+                 * However if SPD Write Disable is set (Lynx Point and later),
+                 * the read will fail if we don't set the R/#W bit.
+                 */
+                outb_p(((addr & 0x7f) << 1) |
+                       ((priv->original_hstcfg & SMBHSTCFG_SPD_WD) ?
+                        (read_write & 0x01) : 0),
+                       SMBHSTADD(priv));
                 if (read_write == I2C_SMBUS_READ) {
                         /* NB: page 240 of ICH5 datasheet also shows
                          * that DATA1 is the cmd field when reading */
@@ -1573,6 +1581,8 @@ static int i801_probe(struct pci_dev *dev, const struct pci_device_id *id)
                 /* Disable SMBus interrupt feature if SMBus using SMI# */
                 priv->features &= ~FEATURE_IRQ;
         }
+        if (temp & SMBHSTCFG_SPD_WD)
+                dev_info(&dev->dev, "SPD Write Disable is set\n");
 
         /* Clear special mode bits */
         if (priv->features & (FEATURE_SMBUS_PEC | FEATURE_BLOCK_BUFFER))
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
index 592a8f26a708..47fc1f1acff7 100644
--- a/drivers/i2c/busses/i2c-imx.c
+++ b/drivers/i2c/busses/i2c-imx.c
@@ -1009,10 +1009,13 @@ static int i2c_imx_init_recovery_info(struct imx_i2c_struct *i2c_imx,
         rinfo->sda_gpio = of_get_named_gpio(pdev->dev.of_node, "sda-gpios", 0);
         rinfo->scl_gpio = of_get_named_gpio(pdev->dev.of_node, "scl-gpios", 0);
 
-        if (!gpio_is_valid(rinfo->sda_gpio) ||
-            !gpio_is_valid(rinfo->scl_gpio) ||
-            IS_ERR(i2c_imx->pinctrl_pins_default) ||
-            IS_ERR(i2c_imx->pinctrl_pins_gpio)) {
+        if (rinfo->sda_gpio == -EPROBE_DEFER ||
+            rinfo->scl_gpio == -EPROBE_DEFER) {
+                return -EPROBE_DEFER;
+        } else if (!gpio_is_valid(rinfo->sda_gpio) ||
+                   !gpio_is_valid(rinfo->scl_gpio) ||
+                   IS_ERR(i2c_imx->pinctrl_pins_default) ||
+                   IS_ERR(i2c_imx->pinctrl_pins_gpio)) {
                 dev_dbg(&pdev->dev, "recovery information incomplete\n");
                 return 0;
         }
diff --git a/drivers/i2c/busses/i2c-jz4780.c b/drivers/i2c/busses/i2c-jz4780.c
index b8ea62105f42..30132c3957cd 100644
--- a/drivers/i2c/busses/i2c-jz4780.c
+++ b/drivers/i2c/busses/i2c-jz4780.c
@@ -729,6 +729,7 @@ static const struct of_device_id jz4780_i2c_of_matches[] = {
         { .compatible = "ingenic,jz4780-i2c", },
         { /* sentinel */ }
 };
+MODULE_DEVICE_TABLE(of, jz4780_i2c_of_matches);
 
 static int jz4780_i2c_probe(struct platform_device *pdev)
 {
diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index 50702c7bb244..df220666d627 100644
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -694,6 +694,8 @@ static int rk3x_i2c_v0_calc_timings(unsigned long clk_rate,
         t_calc->div_low--;
         t_calc->div_high--;
 
+        /* Give the tuning value 0, that would not update con register */
+        t_calc->tuning = 0;
         /* Maximum divider supported by hw is 0xffff */
         if (t_calc->div_low > 0xffff) {
                 t_calc->div_low = 0xffff;
diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c
index 263685c7a512..05cf192ef1ac 100644
--- a/drivers/i2c/busses/i2c-xgene-slimpro.c
+++ b/drivers/i2c/busses/i2c-xgene-slimpro.c
@@ -105,7 +105,7 @@ struct slimpro_i2c_dev {
         struct mbox_chan *mbox_chan;
         struct mbox_client mbox_client;
         struct completion rd_complete;
-        u8 dma_buffer[I2C_SMBUS_BLOCK_MAX];
+        u8 dma_buffer[I2C_SMBUS_BLOCK_MAX + 1]; /* dma_buffer[0] is used for length */
         u32 *resp_msg;
 };
 
diff --git a/drivers/i2c/busses/i2c-xlp9xx.c b/drivers/i2c/busses/i2c-xlp9xx.c
index 2a972ed7aa0d..e29ff37a43bd 100644
--- a/drivers/i2c/busses/i2c-xlp9xx.c
+++ b/drivers/i2c/busses/i2c-xlp9xx.c
@@ -426,6 +426,7 @@ static const struct of_device_id xlp9xx_i2c_of_match[] = {
         { .compatible = "netlogic,xlp980-i2c", },
         { /* sentinel */ },
 };
+MODULE_DEVICE_TABLE(of, xlp9xx_i2c_of_match);
 
 #ifdef CONFIG_ACPI
 static const struct acpi_device_id xlp9xx_i2c_acpi_ids[] = {
diff --git a/drivers/i2c/busses/i2c-xlr.c b/drivers/i2c/busses/i2c-xlr.c
index 0968f59b6df5..ad17d88d8573 100644
--- a/drivers/i2c/busses/i2c-xlr.c
+++ b/drivers/i2c/busses/i2c-xlr.c
@@ -358,6 +358,7 @@ static const struct of_device_id xlr_i2c_dt_ids[] = {
         },
         { }
 };
+MODULE_DEVICE_TABLE(of, xlr_i2c_dt_ids);
 
 static int xlr_i2c_probe(struct platform_device *pdev)
 {
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 5ab67219f71e..1704fc84d647 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1681,6 +1681,7 @@ static struct i2c_client *of_i2c_register_device(struct i2c_adapter *adap,
 static void of_i2c_register_devices(struct i2c_adapter *adap)
 {
         struct device_node *bus, *node;
+        struct i2c_client *client;
 
         /* Only register child devices if the adapter has a node pointer set */
         if (!adap->dev.of_node)
@@ -1695,7 +1696,14 @@ static void of_i2c_register_devices(struct i2c_adapter *adap)
         for_each_available_child_of_node(bus, node) {
                 if (of_node_test_and_set_flag(node, OF_POPULATED))
                         continue;
-                of_i2c_register_device(adap, node);
+
+                client = of_i2c_register_device(adap, node);
+                if (IS_ERR(client)) {
+                        dev_warn(&adap->dev,
+                                 "Failed to create I2C device for %s\n",
+                                 node->full_name);
+                        of_node_clear_flag(node, OF_POPULATED);
+                }
         }
 
         of_node_put(bus);
@@ -2299,6 +2307,7 @@ static int of_i2c_notify(struct notifier_block *nb, unsigned long action,
                 if (IS_ERR(client)) {
                         dev_err(&adap->dev, "failed to create client for '%s'\n",
                                  rd->dn->full_name);
+                        of_node_clear_flag(rd->dn, OF_POPULATED);
                         return notifier_from_errno(PTR_ERR(client));
                 }
                 break;