diff options
author | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 15:07:08 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2020-08-03 15:07:08 -0700 |
commit | 1a91e318c09777f4708c38d6fb98f4da47d9e067 (patch) | |
tree | 05836b24229bd9305d9901e5bd990615181a028d /drivers | |
parent | 53e07424eca922fb7a15f34ad9767b73fced8a05 (diff) | |
parent | 7a346a37e46abd9bfe0e24aa2aabb68d832280b8 (diff) | |
parent | 810797c14508dae3c80eacaa483a900b03fdb780 (diff) | |
parent | fa64023763cf1a3da8bf3341df6c2a47e54fcead (diff) | |
parent | 12b90b40854a8461a02ef19f6f4474cc88d64b66 (diff) | |
parent | 92df3a9bf3fd975949122b1779c142c2d007a7dc (diff) | |
download | linux-stable-1a91e318c09777f4708c38d6fb98f4da47d9e067.tar.gz linux-stable-1a91e318c09777f4708c38d6fb98f4da47d9e067.tar.bz2 linux-stable-1a91e318c09777f4708c38d6fb98f4da47d9e067.zip |
Merge branches 'clk-fallthru', 'clk-ingenic', 'clk-tegra', 'clk-sirf' and 'clk-qoriq' into clk-next
- Add RTC related clks on Ingenic SoCs
- Support USB PHY clks on Ingenic SoCs
* clk-fallthru:
clk: davinci: Use fallthrough pseudo-keyword
clk: imx: Use fallthrough pseudo-keyword
* clk-ingenic:
clk: X1000: Add support for calculat REFCLK of USB PHY.
clk: JZ4780: Reformat the code to align it.
clk: JZ4780: Add functions for enable and disable USB PHY.
clk: Ingenic: Add RTC related clocks for Ingenic SoCs.
dt-bindings: clock: Add tabs to align code.
dt-bindings: clock: Add RTC related clocks for Ingenic SoCs.
* clk-tegra:
clk: tegra: pll: Improve PLLM enable-state detection
* clk-sirf:
clk: clk-atlas6: fix return value check in atlas6_clk_init()
* clk-qoriq:
clk: qoriq: add LS1021A core pll mux options