diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-03 03:03:08 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-03 03:03:08 +0300 |
commit | 51de8760fb1d4dcfb52dec5aa85b2eb6471808a3 (patch) | |
tree | 1c4db35c028aaa5de6dc00c2df3cc78ecc7567dc /drivers/clk/sunxi/clk-sun9i-mmc.c | |
parent | 5bc753249719e88c195e84bbf8eca6530507d403 (diff) | |
parent | ff2bb89335daec6053b5ac778369f7f72b931142 (diff) | |
download | linux-51de8760fb1d4dcfb52dec5aa85b2eb6471808a3.tar.xz |
Merge tag 'sunxi-clocks-for-4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into clk-next
Pull Allwinner clock driver updates from Maxime Ripard:
As usual, a bunch of clocks patches for 4.7, mostly fixes and cleanups, and
display-related clocks.
* tag 'sunxi-clocks-for-4.7' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
clk: sunxi: Let divs clocks read the base factor clock name from devicetree
clk: sunxi: Add TCON channel1 clock
clk: sunxi: Add PLL3 clock
dt-bindings: clk: sun5i: add DRAM gates compatible
clk: sunxi: Use resource_size
clk: sunxi: Add sun6i/8i display support
clk: sunxi: mod1 clock should modify it's parent
Diffstat (limited to 'drivers/clk/sunxi/clk-sun9i-mmc.c')
-rw-r--r-- | drivers/clk/sunxi/clk-sun9i-mmc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c index 028dd832a39f..716737388b7d 100644 --- a/drivers/clk/sunxi/clk-sun9i-mmc.c +++ b/drivers/clk/sunxi/clk-sun9i-mmc.c @@ -106,7 +106,7 @@ static int sun9i_a80_mmc_config_clk_probe(struct platform_device *pdev) r = platform_get_resource(pdev, IORESOURCE_MEM, 0); /* one clock/reset pair per word */ - count = DIV_ROUND_UP((r->end - r->start + 1), SUN9I_MMC_WIDTH); + count = DIV_ROUND_UP((resource_size(r)), SUN9I_MMC_WIDTH); data->membase = devm_ioremap_resource(&pdev->dev, r); if (IS_ERR(data->membase)) return PTR_ERR(data->membase); |