x86/speculation/mds: Add mitigation control for MDS

[mirror_ubuntu-bionic-kernel.git] / drivers / i2c / busses / i2c-mv64xxx.c

diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index a832c45276a42008a0b1a9ebeac00ffb8144a519..b0fb97823d6a4006068d6105ecc7d83329575255 100644 (file)
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -844,12 +844,16 @@ mv64xxx_of_config(struct mv64xxx_i2c_data *drv_data,
         */
        if (of_device_is_compatible(np, "marvell,mv78230-i2c")) {
                drv_data->offload_enabled = true;
-               drv_data->errata_delay = true;
+               /* The delay is only needed in standard mode (100kHz) */
+               if (bus_freq <= 100000)
+                       drv_data->errata_delay = true;
        }
 
        if (of_device_is_compatible(np, "marvell,mv78230-a0-i2c")) {
                drv_data->offload_enabled = false;
-               drv_data->errata_delay = true;
+               /* The delay is only needed in standard mode (100kHz) */
+               if (bus_freq <= 100000)
+                       drv_data->errata_delay = true;
        }
 
        if (of_device_is_compatible(np, "allwinner,sun6i-a31-i2c"))