Message ID | 20200130131220.v3.11.I27bbd90045f38cd3218c259526409d52a48efb35@changeid (mailing list archive) |
---|---|
State | Superseded, archived |
Headers | show |
Series | clk: qcom: Fix parenting for dispcc/gpucc/videocc | expand |
On Thu, Jan 30, 2020 at 3:13 PM Douglas Anderson <dianders@chromium.org> wrote: > > This makes the qcom,videocc bindings match the recent changes to the > dispcc and gpucc. > > 1. Switched to using "bi_tcxo" instead of "xo". > > 2. Adds a description for the XO clock. Not terribly important but > nice if it cleanly matches its cousins. > > 3. Updates the example to use the symbolic name for the RPMH clock and > also show that the real devices are currently using 2 address cells > / size cells and fixes the spacing on the closing brace. > > 4. Split into 2 files. In this case they could probably share one > file, but let's be consistent. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > > Changes in v3: > - Added include file to description. > - Split videocc bindings into 2 files. > - Unlike in v2, use internal name instead of purist name. > > Changes in v2: > - Patch ("dt-bindings: clock: Cleanup qcom,videocc") new for v2. > > .../bindings/clock/qcom,sc7180-videocc.yaml | 63 +++++++++++++++++++ > ...,videocc.yaml => qcom,sdm845-videocc.yaml} | 27 ++++---- > 2 files changed, 77 insertions(+), 13 deletions(-) > create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml > rename Documentation/devicetree/bindings/clock/{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} (60%) > > diff --git a/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml > new file mode 100644 > index 000000000000..f12ec56737e8 > --- /dev/null > +++ b/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml > @@ -0,0 +1,63 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/bindings/clock/qcom,sc7180-videocc.yaml# 'bindings/' should be removed here. I just found my check on this was inadequate. The clock bindings seem to have the most copy-n-paste of this. Otherwise, Reviewed-by: Rob Herring <robh@kernel.org> > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm Video Clock & Reset Controller Binding for SC7180 > + > +maintainers: > + - Taniya Das <tdas@codeaurora.org> > + > +description: | > + Qualcomm video clock control module which supports the clocks, resets and > + power domains on SC7180. > + > + See also dt-bindings/clock/qcom,videocc-sc7180.h. > + > +properties: > + compatible: > + const: qcom,sc7180-videocc > + > + clocks: > + items: > + - description: Board XO source > + > + clock-names: > + items: > + - const: bi_tcxo > + > + '#clock-cells': > + const: 1 > + > + '#reset-cells': > + const: 1 > + > + '#power-domain-cells': > + const: 1 > + > + reg: > + maxItems: 1 > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + - '#clock-cells' > + - '#reset-cells' > + - '#power-domain-cells' > + > +examples: > + - | > + #include <dt-bindings/clock/qcom,rpmh.h> > + clock-controller@ab00000 { > + compatible = "qcom,sc7180-videocc"; > + reg = <0 0x0ab00000 0 0x10000>; > + clocks = <&rpmhcc RPMH_CXO_CLK>; > + clock-names = "bi_tcxo"; > + #clock-cells = <1>; > + #reset-cells = <1>; > + #power-domain-cells = <1>; > + }; > +... > diff --git a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml > similarity index 60% > rename from Documentation/devicetree/bindings/clock/qcom,videocc.yaml > rename to Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml > index 43cfc893a8d1..60300f5ab307 100644 > --- a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml > +++ b/Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml > @@ -1,30 +1,31 @@ > # SPDX-License-Identifier: GPL-2.0-only > %YAML 1.2 > --- > -$id: http://devicetree.org/schemas/bindings/clock/qcom,videocc.yaml# > +$id: http://devicetree.org/schemas/bindings/clock/qcom,sdm845-videocc.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Qualcomm Video Clock & Reset Controller Binding > +title: Qualcomm Video Clock & Reset Controller Binding for SDM845 > > maintainers: > - Taniya Das <tdas@codeaurora.org> > > description: | > Qualcomm video clock control module which supports the clocks, resets and > - power domains. > + power domains on SDM845. > + > + See also dt-bindings/clock/qcom,videocc-sdm845.h. > > properties: > compatible: > - enum: > - - qcom,sc7180-videocc > - - qcom,sdm845-videocc > + const: qcom,sdm845-videocc > > clocks: > - maxItems: 1 > + items: > + - description: Board XO source > > clock-names: > items: > - - const: xo > + - const: bi_tcxo > > '#clock-cells': > const: 1 > @@ -48,15 +49,15 @@ required: > - '#power-domain-cells' > > examples: > - # Example of VIDEOCC with clock node properties for SDM845: > - | > + #include <dt-bindings/clock/qcom,rpmh.h> > clock-controller@ab00000 { > compatible = "qcom,sdm845-videocc"; > - reg = <0xab00000 0x10000>; > - clocks = <&rpmhcc 0>; > - clock-names = "xo"; > + reg = <0 0x0ab00000 0 0x10000>; > + clocks = <&rpmhcc RPMH_CXO_CLK>; > + clock-names = "bi_tcxo"; > #clock-cells = <1>; > #reset-cells = <1>; > #power-domain-cells = <1>; > - }; > + }; > ... > -- > 2.25.0.341.g760bfbb309-goog >
diff --git a/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml new file mode 100644 index 000000000000..f12ec56737e8 --- /dev/null +++ b/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml @@ -0,0 +1,63 @@ +# SPDX-License-Identifier: GPL-2.0-only +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/bindings/clock/qcom,sc7180-videocc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Video Clock & Reset Controller Binding for SC7180 + +maintainers: + - Taniya Das <tdas@codeaurora.org> + +description: | + Qualcomm video clock control module which supports the clocks, resets and + power domains on SC7180. + + See also dt-bindings/clock/qcom,videocc-sc7180.h. + +properties: + compatible: + const: qcom,sc7180-videocc + + clocks: + items: + - description: Board XO source + + clock-names: + items: + - const: bi_tcxo + + '#clock-cells': + const: 1 + + '#reset-cells': + const: 1 + + '#power-domain-cells': + const: 1 + + reg: + maxItems: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - '#clock-cells' + - '#reset-cells' + - '#power-domain-cells' + +examples: + - | + #include <dt-bindings/clock/qcom,rpmh.h> + clock-controller@ab00000 { + compatible = "qcom,sc7180-videocc"; + reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + }; +... diff --git a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml similarity index 60% rename from Documentation/devicetree/bindings/clock/qcom,videocc.yaml rename to Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml index 43cfc893a8d1..60300f5ab307 100644 --- a/Documentation/devicetree/bindings/clock/qcom,videocc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml @@ -1,30 +1,31 @@ # SPDX-License-Identifier: GPL-2.0-only %YAML 1.2 --- -$id: http://devicetree.org/schemas/bindings/clock/qcom,videocc.yaml# +$id: http://devicetree.org/schemas/bindings/clock/qcom,sdm845-videocc.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Video Clock & Reset Controller Binding +title: Qualcomm Video Clock & Reset Controller Binding for SDM845 maintainers: - Taniya Das <tdas@codeaurora.org> description: | Qualcomm video clock control module which supports the clocks, resets and - power domains. + power domains on SDM845. + + See also dt-bindings/clock/qcom,videocc-sdm845.h. properties: compatible: - enum: - - qcom,sc7180-videocc - - qcom,sdm845-videocc + const: qcom,sdm845-videocc clocks: - maxItems: 1 + items: + - description: Board XO source clock-names: items: - - const: xo + - const: bi_tcxo '#clock-cells': const: 1 @@ -48,15 +49,15 @@ required: - '#power-domain-cells' examples: - # Example of VIDEOCC with clock node properties for SDM845: - | + #include <dt-bindings/clock/qcom,rpmh.h> clock-controller@ab00000 { compatible = "qcom,sdm845-videocc"; - reg = <0xab00000 0x10000>; - clocks = <&rpmhcc 0>; - clock-names = "xo"; + reg = <0 0x0ab00000 0 0x10000>; + clocks = <&rpmhcc RPMH_CXO_CLK>; + clock-names = "bi_tcxo"; #clock-cells = <1>; #reset-cells = <1>; #power-domain-cells = <1>; - }; + }; ...
This makes the qcom,videocc bindings match the recent changes to the dispcc and gpucc. 1. Switched to using "bi_tcxo" instead of "xo". 2. Adds a description for the XO clock. Not terribly important but nice if it cleanly matches its cousins. 3. Updates the example to use the symbolic name for the RPMH clock and also show that the real devices are currently using 2 address cells / size cells and fixes the spacing on the closing brace. 4. Split into 2 files. In this case they could probably share one file, but let's be consistent. Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Changes in v3: - Added include file to description. - Split videocc bindings into 2 files. - Unlike in v2, use internal name instead of purist name. Changes in v2: - Patch ("dt-bindings: clock: Cleanup qcom,videocc") new for v2. .../bindings/clock/qcom,sc7180-videocc.yaml | 63 +++++++++++++++++++ ...,videocc.yaml => qcom,sdm845-videocc.yaml} | 27 ++++---- 2 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml rename Documentation/devicetree/bindings/clock/{qcom,videocc.yaml => qcom,sdm845-videocc.yaml} (60%)