diff options
author | Stephen Boyd | 2021-11-02 11:26:33 -0700 |
---|---|---|
committer | Stephen Boyd | 2021-11-02 11:26:33 -0700 |
commit | a379e16ab8ae8d912aa7aa842a983b7e0518303b (patch) | |
tree | e827432ef20f78e01e60523ff7dd2dcc10761af3 /drivers/clk | |
parent | 1b771839de054710e1e015b10e29a4d04c41f54b (diff) | |
parent | a8cd038cac0d5572312015c3512aa1113fa6bbd4 (diff) | |
parent | d4e15d4821e723a45ea9f0ddd56f7ac36b1c3cca (diff) | |
parent | 7d9e0b121640b4bcaf81ba458f4676345ca49942 (diff) |
Merge branches 'clk-qcom', 'clk-mtk', 'clk-versatile' and 'clk-doc' into clk-next
- Use ARRAY_SIZE in qcom clk drivers
- Remove some impractical fallback parent names in qcom clk drivers
- GCC and RPMcc support for Qualcomm QCM2290 SoCs
- GCC support for Qualcomm MSM8994/MSM8992 SoCs
- LPASSCC and CAMCC support for Qualcomm SC7280 SoCs
- Support for Mediatek MT8195 SoCs
- Make Mediatek clk drivers tristate
* clk-qcom: (44 commits)
clk: qcom: gdsc: enable optional power domain support
clk: qcom: videocc-sm8250: use runtime PM for the clock controller
clk: qcom: dispcc-sm8250: use runtime PM for the clock controller
dt-bindings: clock: qcom,videocc: add mmcx power domain
dt-bindings: clock: qcom,dispcc-sm8x50: add mmcx power domain
clk: qcom: gcc-sc7280: Drop unused array
clk: qcom: camcc: Add camera clock controller driver for SC7280
dt-bindings: clock: Add YAML schemas for CAMCC clocks on SC7280
clk: qcom: Add lpass clock controller driver for SC7280
dt-bindings: clock: Add YAML schemas for LPASS clocks on SC7280
clk: qcom: Kconfig: Sort the symbol for SC_LPASS_CORECC_7180
clk: qcom: mmcc-sdm660: Add hw_ctrl flag to venus_core0_gdsc
clk: qcom: mmcc-sdm660: Add necessary CXCs to venus_gdsc
clk: qcom: gcc-msm8994: Use ARRAY_SIZE() for num_parents
clk: qcom: gcc-msm8994: Add proper msm8992 support
clk: qcom: gcc-msm8994: Add modem reset
clk: qcom: gcc-msm8994: Remove the inexistent GDSC_PCIE
clk: qcom: gcc-msm8994: Add missing clocks
clk: qcom: gcc-msm8994: Add missing NoC clocks
clk: qcom: gcc-msm8994: Fix up SPI QUP clocks
...
* clk-mtk: (28 commits)
clk: mediatek: Export clk_ops structures to modules
clk: mediatek: support COMMON_CLK_MT6779 module build
clk: mediatek: support COMMON_CLK_MEDIATEK module build
clk: composite: export clk_register_composite
clk: mediatek: Add MT8195 apusys clock support
clk: mediatek: Add MT8195 imp i2c wrapper clock support
clk: mediatek: Add MT8195 wpesys clock support
clk: mediatek: Add MT8195 vppsys1 clock support
clk: mediatek: Add MT8195 vppsys0 clock support
clk: mediatek: Add MT8195 vencsys clock support
clk: mediatek: Add MT8195 vdosys1 clock support
clk: mediatek: Add MT8195 vdosys0 clock support
clk: mediatek: Add MT8195 vdecsys clock support
clk: mediatek: Add MT8195 scp adsp clock support
clk: mediatek: Add MT8195 mfgcfg clock support
clk: mediatek: Add MT8195 ipesys clock support
clk: mediatek: Add MT8195 imgsys clock support
clk: mediatek: Add MT8195 ccusys clock support
clk: mediatek: Add MT8195 camsys clock support
clk: mediatek: Add MT8195 infrastructure clock support
...
* clk-versatile:
clk: versatile: hide clock drivers from non-ARM users
clk: versatile: Rename ICST to CLK_ICST
clk: versatile: clk-icst: Support 'reg' in addition to 'vco-offset' for register address
dt-bindings: clock: arm,syscon-icst: Use 'reg' instead of 'vco-offset' for VCO register address
* clk-doc:
dt-bindings: clk: fixed-mmio-clock: Convert to YAML