diff options
author | Stephen Boyd <sboyd@kernel.org> | 2019-07-12 11:11:06 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2019-07-12 11:11:06 -0700 |
commit | dfe1d3a2830d607bbd66bae8bb86ae7ffde04f38 (patch) | |
tree | 53a3d300bc847c4800dda36334d756ab069aa2da /include | |
parent | e02cb1f5934053acfa72b7def8bef9b20e7ab818 (diff) | |
parent | 179175d389c7aad4c7b7276f772d04cfc92864b1 (diff) | |
parent | 88aa7af9c180381d9612ebbb5c8b0b3f96514373 (diff) | |
parent | 16e3c572cdc91d7e26489f3be8338da936c08495 (diff) | |
parent | 65e2218d10064d1143572584251f8599dd09290a (diff) |
Merge branches 'clk-bulk-optional', 'clk-kirkwood', 'clk-socfpga' and 'clk-docs' into clk-next
- Add a clk_bulk_get_optional() API (with devm too)
- Support for Marvell 98DX1135 SoCs
* clk-bulk-optional:
clk: Document some devm_clk_bulk*() APIs
clk: Add devm_clk_bulk_get_optional() function
clk: Add clk_bulk_get_optional() function
* clk-kirkwood:
clk: kirkwood: Add support for MV98DX1135
dt-bindings: clock: mvebu: Add compatible string for 98dx1135 core clock
* clk-socfpga:
clk: socfpga: stratix10: fix divider entry for the emac clocks
clk: socfpga: stratix10: add additional clocks needed for the NAND IP
* clk-docs:
clk: Grammar missing "and", Spelling s/statisfied/satisfied/