more clk changes for the merge window
Stephen Boyd
maintainerThe following changes since commit fc6a15c853085f04c30e08bbba7d49cb611f7773:
dt/bindings: clk: fsl,plldig: Drop 'bindings' from schema id (2020-02-03 10:33:34 -0800)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-linus
for you to fetch changes up to 5df867145f8adad9e5cdf9d67db1fbc0f71351e9:
of: clk: Make <linux/of_clk.h> self-contained (2020-02-05 14:52:03 -0800)
----------------------------------------------------------------
A collection of fixes that would be good to get merged before -rc1.
- Make of_clk.h self contained
- Fix new qcom DT bindings that just merged to match the DTS files
- Fix qcom clk driver to properly detect DFS clk frequencies
- Fix the ls1028a driver to not deref a pointer before assigning it
There are some conflicts in the dt bindings files.
----------------------------------------------------------------
Colin Ian King (1):
clk: ls1028a: fix a dereference of pointer 'parent' before a null check
Douglas Anderson (12):
dt-bindings: clk: qcom: Fix self-validation, split, and clean cruft
clk: qcom: rcg2: Don't crash if our parent can't be found; return an error
dt-bindings: clock: Fix qcom,dispcc bindings for sdm845/sc7180
clk: qcom: Get rid of fallback global names for dispcc-sc7180
clk: qcom: Get rid of the test clock for dispcc-sc7180
clk: qcom: Use ARRAY_SIZE in dispcc-sc7180 for parent clocks
dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998
clk: qcom: Get rid of the test clock for gpucc-sc7180
clk: qcom: Use ARRAY_SIZE in gpucc-sc7180 for parent clocks
dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180
clk: qcom: Get rid of the test clock for videocc-sc7180
clk: qcom: Use ARRAY_SIZE in videocc-sc7180 for parent clocks
Geert Uytterhoeven (1):
of: clk: Make <linux/of_clk.h> self-contained
Stephen Boyd (1):
clk: qcom: Don't overwrite 'cfg' in clk_rcg2_dfs_populate_freq()
.../bindings/clock/qcom,gcc-apq8064.yaml | 83 ++++++++
.../bindings/clock/qcom,gcc-ipq8074.yaml | 51 +++++
.../bindings/clock/qcom,gcc-msm8996.yaml | 68 ++++++
.../bindings/clock/qcom,gcc-msm8998.yaml | 93 +++++++++
.../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 51 +++++
.../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 75 +++++++
.../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 72 +++++++
.../devicetree/bindings/clock/qcom,gcc.yaml | 230 ++++-----------------
.../devicetree/bindings/clock/qcom,gpucc.yaml | 72 -------
.../{qcom,dispcc.yaml => qcom,msm8998-gpucc.yaml} | 33 ++-
.../bindings/clock/qcom,sc7180-dispcc.yaml | 84 ++++++++
.../bindings/clock/qcom,sc7180-gpucc.yaml | 72 +++++++
.../bindings/clock/qcom,sc7180-videocc.yaml | 63 ++++++
.../bindings/clock/qcom,sdm845-dispcc.yaml | 99 +++++++++
.../bindings/clock/qcom,sdm845-gpucc.yaml | 72 +++++++
...{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} | 27 +--
drivers/clk/clk-plldig.c | 4 +-
drivers/clk/qcom/clk-rcg2.c | 11 +-
drivers/clk/qcom/dispcc-sc7180.c | 45 ++--
drivers/clk/qcom/gpucc-sc7180.c | 4 +-
drivers/clk/qcom/videocc-sc7180.c | 4 +-
include/linux/of_clk.h | 3 +
22 files changed, 979 insertions(+), 337 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-apq8064.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-ipq8074.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8996.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8998.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-qcs404.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sc7180.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-sm8150.yaml
delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.yaml
rename Documentation/devicetree/bindings/clock/{qcom,dispcc.yaml => qcom,msm8998-gpucc.yaml} (51%)
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-dispcc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-gpucc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-dispcc.yaml
create mode 100644 Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml
rename Documentation/devicetree/bindings/clock/{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} (61%)Signature · 1 line
Sent by a computer, using git, on the internet
The pull request you sent on Thu, 6 Feb 2020 10:44:05 -0800:
The pull request you sent on Thu, 6 Feb 2020 10:44:05 -0800:
Quoted 1 line
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git tags/clk-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/8bf5973a4ef0c996d805dc70c2122f08155d14ef
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker