Merge branch 'clk-fixes' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Wed, 16 Nov 2016 19:15:58 +0000 (11:15 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Wed, 16 Nov 2016 19:15:58 +0000 (11:15 -0800)
commit977f0ab0581d61b2b46cc08857818c425cd24f55
treebb096d90acab001d80bd88b2f0cfbe30789447d6
parent9a881bc55d7b2cb4093005391613a2c517f09516
parentc8616671af913ed2c5fb5b45f09c28599458ba1a
Merge branch 'clk-fixes' into clk-next

* clk-fixes:
  clk: efm32gg: Pass correct type to hw provider registration
  clk: berlin: Pass correct type to hw provider registration
  clk: sunxi: Fix M factor computation for APB1
  clk: sunxi-ng: sun6i-a31: Force AHB1 clock to use PLL6 as parent