diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 22:58:30 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-08-14 22:58:30 -0700 |
commit | 5ef7748ba37e0b1667ae973c1162fa60c0248f49 (patch) | |
tree | 120040a2e625b0bdf2b5561042dfea5b9e9e7d39 /mm/memcontrol.c | |
parent | 04cdd5af51c610ddc7ff4881790a830a6a97d3fd (diff) | |
parent | 9461f7b33d11cbbf5ce79c3c03d0da9d42dfce92 (diff) | |
parent | 9fba738a53dda20e748d6ee240b6c017c8146b4b (diff) | |
parent | e8f127caf63ad29e2b4cb01894b97730384ad1ab (diff) | |
parent | 4a2eaa8e2567297d4dc6e2709841a874927c83aa (diff) |
Merge branches 'clk-qcom-set-rate-gate', 'clk-core-set-rate-gate', 'clk-core-duty-cycle', 'clk-si-prepare' and 'clk-imx-gpio-gates' into clk-next
* clk-qcom-set-rate-gate:
clk: qcom: drop CLK_SET_RATE_GATE from sdc clocks
* clk-core-set-rate-gate:
clk: fix CLK_SET_RATE_GATE with clock rate protection
* clk-core-duty-cycle:
clk: add duty cycle support
* clk-si-prepare:
: - SI544/SI514 clk on/off support
clk-si514, clk-si544: Implement prepare/unprepare/is_prepared operations
* clk-imx-gpio-gates:
: - i.MX6UL GPIO clock gates in CCM CCGR
clk: imx6ul: remove clks_init_on array
clk: imx6ul: add GPIO clock gates
dt-bindings: clock: imx6ul: Do not change the clock definition order