diff options
author | Stephen Boyd <sboyd@kernel.org> | 2020-01-31 13:12:00 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2020-01-31 13:12:00 -0800 |
commit | 36bf7a5bdd349dd150b9c6bc8d5601bd1069ce9f (patch) | |
tree | a4034dc5f473ab491da0612ed938a9982444c3a8 /drivers | |
parent | 28db9a8c82a81efb8c2548104a5416bb8d101176 (diff) | |
parent | 1ec09a2ec67a0baa46a3ccac041dbcdbc6db2cb9 (diff) | |
parent | 2d2699926143624ef0fce3bbb5a0f089d674d12c (diff) | |
parent | 248fdcc77a35dfe66f2f8771017e71385527ceff (diff) | |
parent | 333d2d19df09bfa7363ad051e8557031abafee21 (diff) | |
parent | 66d9f5214c9ba1c151478f99520b6817302d50dc (diff) | |
download | linux-36bf7a5bdd349dd150b9c6bc8d5601bd1069ce9f.tar.bz2 |
Merge branches 'clk-uniphier', 'clk-warn-critical', 'clk-ux500', 'clk-kconfig' and 'clk-at91' into clk-next
- Warn about critical clks that fail to enable or prepare
- Detect more PRMCU variants in ux500 driver
* clk-uniphier:
clk: uniphier: Add SCSSI clock gate for each channel
* clk-warn-critical:
clk: Warn about critical clks that fail to enable
clk: Don't try to enable critical clocks if prepare failed
clk: tegra: Fix double-free in tegra_clk_init()
clk: samsung: exynos5420: Keep top G3D clocks enabled
clk: qcom: Avoid SMMU/cx gdsc corner cases
clk: qcom: gcc-sc7180: Fix setting flag for votable GDSCs
clk: Move clk_core_reparent_orphans() under CONFIG_OF
clk: at91: fix possible deadlock
clk: walk orphan list on clock provider registration
clk: imx: pll14xx: fix clk_pll14xx_wait_lock
clk: imx: clk-imx7ulp: Add missing sentinel of ulp_div_table
clk: imx: clk-composite-8m: add lock to gate/mux
* clk-ux500:
clk: ux500: Fix up the SGA clock for some variants
* clk-kconfig:
clk: Fix Kconfig indentation
* clk-at91:
clk: at91: sam9x60: fix programmable clock prescaler
clk: at91: sam9x60-pll: adapt PMC_PLL_ACR default value