Merge tag 'docs-4.9-2' of git://git.lwn.net/linux

[karo-tx-linux.git] / drivers / i2c / busses / i2c-designware-platdrv.c

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index cb846cb5051250c3653541eb218a7a1c5b434bf4..0b42a12171f3a146ddc61ac6e2ed6d9d9cacf12e 100644 (file)
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -157,7 +157,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
        struct i2c_adapter *adap;
        struct resource *mem;
        int irq, r;
-       u32 ht = 0;
+       u32 acpi_speed, ht = 0;
 
        irq = platform_get_irq(pdev, 0);
        if (irq < 0)
@@ -192,6 +192,10 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
                                         &dev->clk_freq);
        }
 
+       acpi_speed = i2c_acpi_find_bus_speed(&pdev->dev);
+       if (acpi_speed)
+               dev->clk_freq = acpi_speed;
+
        if (has_acpi_companion(&pdev->dev))
                dw_i2c_acpi_configure(pdev);