diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 15:44:01 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 15:44:01 -0700 |
commit | 1578968f77e6759afe4882dc20882639eacb2977 (patch) | |
tree | 562f076e013cbe8a9ea4f683ae1a756bbc5ebd5e /drivers/clk/clk-s2mps11.c | |
parent | 1fe7c040b61ebcc72a6b3c29136937f1b9191988 (diff) | |
parent | 341ce3563e52d6adc69095f65d57d2c9b8c68a65 (diff) | |
parent | 77612720a2362230af726baa4149c40ec7a7fb05 (diff) | |
parent | 1b4d990b19d2de186b188da5b033110949c118fe (diff) | |
parent | 9c940bbe2bb47e03ca5e937d30b6a50bf9c0e671 (diff) |
Merge branches 'clk-imx6-mmdc', 'clk-qcom-krait', 'clk-rockchip' and 'clk-smp2s11-match' into clk-next
- iMX6 MMDC clks
- Qualcomm Krait CPU clk support
* clk-imx6-mmdc:
clk: imx6q: add mmdc0 ipg clock
clk: imx6sl: add mmdc ipg clocks
clk: imx6sll: add mmdc1 ipg clock
clk: imx6sx: add mmdc1 ipg clock
clk: imx6ul: add mmdc1 ipg clock
* clk-qcom-krait:
clk: qcom: Add safe switch hook for krait mux clocks
dt-bindings: clock: Document qcom,krait-cc
clk: qcom: Add Krait clock controller driver
dt-bindings: arm: Document qcom,kpss-gcc
clk: qcom: Add KPSS ACC/GCC driver
clk: qcom: Add support for Krait clocks
clk: qcom: Add IPQ806X's HFPLLs
clk: qcom: Add MSM8960/APQ8064's HFPLLs
dt-bindings: clock: Document qcom,hfpll
clk: qcom: Add HFPLL driver
clk: qcom: Add support for High-Frequency PLLs (HFPLLs)
ARM: Add Krait L2 register accessor functions
* clk-rockchip:
clk: rockchip: Fix static checker warning in rockchip_ddrclk_get_parent call
clk: rockchip: use the newly added clock-id for hdmi on RK3066
clk: rockchip: add clock-id for HCLK_HDMI on rk3066
clk: rockchip: fix wrong mmc sample phase shift for rk3328
clk: rockchip: improve rk3288 pll rates for better hdmi output
* clk-smp2s11-match:
clk: s2mps11: Add used attribute to s2mps11_dt_match
clk: s2mps11: Fix matching when built as module and DT node contains compatible