diff options
author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2017-12-19 00:57:59 +0300 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2018-01-15 19:58:56 +0300 |
commit | 023c22fd82ce0c62d7490ace6388191375ef4133 (patch) | |
tree | cc43842419b0f3b5ffba8db30c5b722e8f406505 /drivers/i2c/busses/i2c-sh_mobile.c | |
parent | b3750b6278b2f37618931352df8de6e7ddbecd1e (diff) | |
download | linux-023c22fd82ce0c62d7490ace6388191375ef4133.tar.xz |
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>
Diffstat (limited to 'drivers/i2c/busses/i2c-sh_mobile.c')
-rw-r--r-- | drivers/i2c/busses/i2c-sh_mobile.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index 88af45225003..f1a9b971e2c1 100644 --- 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); |