diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2019-11-27 08:15:13 -0800 | 
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2019-11-27 08:15:13 -0800 | 
| commit | ec16ffe36d80b18a1f98d126a865d5557ab27c30 (patch) | |
| tree | 611fa23ce8bbec4335545181148f48a8d7a56a3a /drivers/fpga/of-fpga-region.c | |
| parent | dabedfede32435ccb7cba4a8e527248d6aed6a39 (diff) | |
| parent | cd94eade0b2ab7673a97223d09406abf668b7f73 (diff) | |
| parent | 564f86d384755e3fbb5c00703d3695df89c1e049 (diff) | |
| parent | 8f39f22f73b3066623d488d3a54dd669575b56dc (diff) | |
| parent | 1e4fb2c0cb3443bf7d2606b6d571bd75879d098e (diff) | |
Merge branches 'clk-ingenic', 'clk-init-leak', 'clk-ux500' and 'clk-bitmain' into clk-next
 - Support CGU in Ingenix X1000
 - Support Bitmain BM1880 clks
* clk-ingenic:
  clk: ingenic: Allow drivers to be built with COMPILE_TEST
  clk: Ingenic: Add CGU driver for X1000.
  dt-bindings: clock: Add X1000 bindings.
* clk-init-leak:
  clk: mark clk_disable_unused() as __init
  clk: Fix memory leak in clk_unregister()
* clk-ux500:
  MAINTAINERS: Update section for Ux500 clock drivers
* clk-bitmain:
  MAINTAINERS: Add entry for BM1880 SoC clock driver
  clk: Add common clock driver for BM1880 SoC
  dt-bindings: clock: Add devicetree binding for BM1880 SoC
  clk: Add clk_hw_unregister_composite helper function definition
  clk: Zero init clk_init_data in helpers
