diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-06-04 12:27:29 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-06-04 12:27:29 -0700 |
commit | 872e47f75fc5e96d987ad96b2c9b22bdfddf6835 (patch) | |
tree | bde8f749166158cfe316d2c485467f9d13693c52 /drivers | |
parent | 43705f52946bba973eeba75f1e92cf034e0ad03c (diff) | |
parent | 1f8777a45ac03b3db104a7d7d55926292bf0a7c2 (diff) | |
parent | 1646337b866753681148db3a8878c4a062b484c5 (diff) | |
parent | 10e3a88b29eeb839eeb38bb96ebd43866ba87e73 (diff) | |
parent | c7d2a0eb6c028ba064bfe92d7667977418142c7c (diff) |
Merge branches 'clk-qcom-rpmh', 'clk-npcm7xx', 'clk-of-parent-count' and 'clk-qcom-rcg-fix' into clk-next
* clk-qcom-rpmh:
dt-bindings: clock: Introduce QCOM RPMh clock bindings
* clk-npcm7xx:
clk: npcm7xx: fix return value check in npcm7xx_clk_init()
clk: npcm7xx: add clock controller
dt-binding: clk: npcm750: Add binding for Nuvoton NPCM7XX Clock
* clk-of-parent-count:
pinctrl: sunxi: Use of_clk_get_parent_count() instead of open coding
soc/tegra: pmc: Use of_clk_get_parent_count() instead of open coding
soc: rockchip: power-domain: Use of_clk_get_parent_count() instead of open coding
ARM: timer-sp: Use of_clk_get_parent_count() instead of open coding
clk: Extract OF clock helpers in <linux/of_clk.h>
* clk-qcom-rcg-fix:
clk: qcom: Base rcg parent rate off plan frequency