i2c: sh_mobile: let RuntimePM do the clock handling

Start RuntimePM a bit earlier, so we can use it to enable the clock
during probe for frequency calculations. Make sure it is enabled before
calling setup().

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c
index 88af45225003a5e6df5776a309295ffc446aa24c..f1a9b971e2c14a63678f99a3e84ea1a004eabb80 100644 (file)
--- a/drivers/i2c/busses/i2c-sh_mobile.c
+++ b/drivers/i2c/busses/i2c-sh_mobile.c
@@ -252,11 +252,7 @@ static int sh_mobile_i2c_init(struct sh_mobile_i2c_data *pd)
        u32 tHIGH, tLOW, tf;
        uint16_t max_val;
 
-       /* Get clock rate after clock is enabled */
-       clk_prepare_enable(pd->clk);
-       i2c_clk_khz = clk_get_rate(pd->clk) / 1000;
-       clk_disable_unprepare(pd->clk);
-       i2c_clk_khz /= pd->clks_per_count;
+       i2c_clk_khz = clk_get_rate(pd->clk) / 1000 / pd->clks_per_count;
 
        if (pd->bus_speed == STANDARD_MODE) {
                tLOW    = 47;   /* tLOW = 4.7 us */
@@ -881,6 +877,20 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
        if (resource_size(res) > 0x17)
                pd->flags |= IIC_FLAG_HAS_ICIC67;
 
+       /* Enable Runtime PM for this device.
+        *
+        * Also tell the Runtime PM core to ignore children
+        * for this device since it is valid for us to suspend
+        * this I2C master driver even though the slave devices
+        * on the I2C bus may not be suspended.
+        *
+        * The state of the I2C hardware bus is unaffected by
+        * the Runtime PM state.
+        */
+       pm_suspend_ignore_children(&dev->dev, true);
+       pm_runtime_enable(&dev->dev);
+       pm_runtime_get_sync(&dev->dev);
+
        config = of_device_get_match_data(&dev->dev);
        if (config) {
                pd->clks_per_count = config->clks_per_count;
@@ -888,6 +898,8 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
        } else {
                ret = sh_mobile_i2c_init(pd);
        }
+
+       pm_runtime_put_sync(&dev->dev);
        if (ret)
                return ret;
 
@@ -896,19 +908,6 @@ static int sh_mobile_i2c_probe(struct platform_device *dev)
        pd->dma_direction = DMA_NONE;
        pd->dma_rx = pd->dma_tx = ERR_PTR(-EPROBE_DEFER);
 
-       /* Enable Runtime PM for this device.
-        *
-        * Also tell the Runtime PM core to ignore children
-        * for this device since it is valid for us to suspend
-        * this I2C master driver even though the slave devices
-        * on the I2C bus may not be suspended.
-        *
-        * The state of the I2C hardware bus is unaffected by
-        * the Runtime PM state.
-        */
-       pm_suspend_ignore_children(&dev->dev, true);
-       pm_runtime_enable(&dev->dev);
-
        /* setup the private data */
        adap = &pd->adap;
        i2c_set_adapdata(adap, pd);