diff options
author | Stephen Boyd | 2018-01-26 16:41:58 -0800 |
---|---|---|
committer | Stephen Boyd | 2018-01-26 16:41:58 -0800 |
commit | 0003046477a0c0038bab8c899181faa2e7d86d40 (patch) | |
tree | 0534e3c317e5879ea8a32a53639ae799661fef54 /drivers/clk/qcom/Makefile | |
parent | a2c09c12d4e1935807d02d58d2a338fa74554305 (diff) | |
parent | b33db49783763e1b2a63b12fbe0e91fb7147a987 (diff) | |
parent | 9713588f8cd96069716bd8daf720dc7ff921af89 (diff) | |
parent | 81ac38847a1d7fdd74a232cae195ff8f0fb4ab21 (diff) |
Merge branches 'clk-iproc', 'clk-mvebu' and 'clk-qcom-a53' into clk-next
* clk-iproc:
clk: iproc: Minor tidy up of iproc pll data structures
clk: iproc: Allow plls to do minor rate changes without reset
clk: iproc: Fix error in the pll post divider rate calculation
clk: iproc: Allow iproc pll to runtime calculate vco parameters
* clk-mvebu:
clk: mvebu: armada-37xx-periph: Use PTR_ERR_OR_ZERO()
* clk-qcom-a53:
clk: qcom: Add APCS clock controller support
clk: qcom: Add regmap mux-div clocks support
clk: qcom: Add A53 PLL support