OSDN Git Service

Merge branches 'clk-ingenic', 'clk-init-leak', 'clk-ux500' and 'clk-bitmain' into...
authorStephen Boyd <sboyd@kernel.org>
Wed, 27 Nov 2019 16:15:13 +0000 (08:15 -0800)
committerStephen Boyd <sboyd@kernel.org>
Wed, 27 Nov 2019 16:15:13 +0000 (08:15 -0800)
commitec16ffe36d80b18a1f98d126a865d5557ab27c30
tree611fa23ce8bbec4335545181148f48a8d7a56a3a
parentdabedfede32435ccb7cba4a8e527248d6aed6a39
parentcd94eade0b2ab7673a97223d09406abf668b7f73
parent564f86d384755e3fbb5c00703d3695df89c1e049
parent8f39f22f73b3066623d488d3a54dd669575b56dc
parent1e4fb2c0cb3443bf7d2606b6d571bd75879d098e
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
MAINTAINERS
drivers/clk/clk.c