diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 22:58:39 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 22:58:39 -0700 |
commit | ea4f7872c71adef8897f71bb6bb056856ccc8ed9 (patch) | |
tree | 61658737767f6f7ca4830b2bc2f8126a061e7458 | |
parent | b183c6887af3bba1835bd4c9ef2de119afab737b (diff) | |
parent | 2b555a4b9caecfcab1b2aade176df795ceceaefa (diff) | |
parent | 33f5104624b96c6514621e63909b5703276b4dac (diff) | |
parent | fc20654389364a55eeab837244b24f8da75009f6 (diff) | |
parent | cd88259a7215e0737f8ef2c2842f41922ae87d8d (diff) | |
parent | 9d8108f9f3cb996a9677223fcd1feeb1f3e05566 (diff) |
Merge branches 'clk-ingenic-fixes', 'clk-max9485', 'clk-pxa-32k-pll', 'clk-aspeed' and 'clk-imx6sll-gpio' into clk-next
* clk-ingenic-fixes:
: - Ingenic i2s bit update and allow UDC clk to gate
clk: ingenic: Add missing flag for UDC clock
clk: ingenic: Fix incorrect data for the i2s clock
* clk-max9485:
: - Maxim 9485 Programmable Clock Generator
clk: Add driver for MAX9485
dts: clk: add devicetree bindings for MAX9485
* clk-pxa-32k-pll:
: - Expose 32 kHz PLL on PXA SoCs
clk: pxa: export 32kHz PLL
* clk-aspeed:
: - Fix name of aspeed SDC clk define to have only one 'CLK'
clk: aspeed: Fix SDCLK name
* clk-imx6sll-gpio:
: - imx6sll GPIO clk gate support
clk: imx6sll: add GPIO LPCGs