diff options
author | Stephen Boyd <sboyd@kernel.org> | 2020-06-01 13:00:21 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2020-06-01 13:00:21 -0700 |
commit | b6f3162d0e9ab499e8912c7255596bfd8b9e94f7 (patch) | |
tree | 39ae2cd3447874847ed7a715fb7bae60c315b383 /drivers/clk | |
parent | 8c88e568b54ad92d21b5897f758a80c58df657e6 (diff) | |
parent | 2c1c9696450ff6743f01dc6ae29aecf7b1f8bc54 (diff) | |
parent | 6f4d3c13b71c6ebd4d04d0adca53859131c595eb (diff) | |
parent | dc543267c7adcad139a439230052b4e609f7018b (diff) | |
parent | a403bbab1a73d798728d76931cab3ff0399b9560 (diff) | |
parent | 2d491066ccd4286538450c227fc5094ceb04b494 (diff) | |
download | linux-b6f3162d0e9ab499e8912c7255596bfd8b9e94f7.tar.bz2 |
Merge branches 'clk-unisoc', 'clk-trivial', 'clk-bcm', 'clk-st' and 'clk-ast2600' into clk-next
* clk-unisoc:
clk: sprd: add mipi_csi_xx gate clocks
clk: sprd: add dt-bindings include for mipi_csi_xx clocks
dt-bindings: clk: sprd: add mipi_csi_xx clocks for SC9863A
clk: sprd: check its parent status before reading gate clock
clk: sprd: return correct type of value for _sprd_pll_recalc_rate
clk: sprd: mark the local clock symbols static
* clk-trivial:
clk: versatile: remove redundant assignment to pointer clk
clk: clk-xgene: Fix a typo in Kconfig
clk: Remove unused inline function clk_debug_reparent
* clk-bcm:
clk: bcm2835: Constify struct debugfs_reg32
clk: bcm2835: Remove casting to bcm2835_clk_register
clk: bcm2835: Fix return type of bcm2835_register_gate
* clk-st:
clk: clk-flexgen: fix clock-critical handling
* clk-ast2600:
clk: ast2600: Fix AHB clock divider for A1