| Message ID | 20200904030958.13325-2-jonathan@marek.ca |
|---|---|
| State | Accepted |
| Commit | 70d795d2d836e686e2fd4ed1d0abd8fb6ed3ae2a |
| Headers | show |
| Series | SM8150 and SM8250 videocc drivers | expand |
On Thu, 03 Sep 2020 23:09:50 -0400, Jonathan Marek wrote: > These two bindings are almost identical, so combine them into one. This > will make it easier to add the sm8150 and sm8250 videocc bindings. > > Signed-off-by: Jonathan Marek <jonathan@marek.ca> > --- > .../bindings/clock/qcom,sc7180-videocc.yaml | 65 ------------------- > ...,sdm845-videocc.yaml => qcom,videocc.yaml} | 14 ++-- > 2 files changed, 9 insertions(+), 70 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml > rename Documentation/devicetree/bindings/clock/{qcom,sdm845-videocc.yaml => qcom,videocc.yaml} (76%) > Reviewed-by: Rob Herring <robh@kernel.org>
Quoting Jonathan Marek (2020-09-03 20:09:50) > diff --git a/Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml > similarity index 76% > rename from Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml > rename to Documentation/devicetree/bindings/clock/qcom,videocc.yaml > index f7a0cf53d5f0..17666425476f 100644 > --- a/Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml > +++ b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml > @@ -1,23 +1,27 @@ > # SPDX-License-Identifier: GPL-2.0-only > %YAML 1.2 > --- > -$id: http://devicetree.org/schemas/clock/qcom,sdm845-videocc.yaml# > +$id: http://devicetree.org/schemas/clock/qcom,videocc.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Qualcomm Video Clock & Reset Controller Binding for SDM845 > +title: Qualcomm Video Clock & Reset Controller Binding > > maintainers: > - Taniya Das <tdas@codeaurora.org> > > description: | > Qualcomm video clock control module which supports the clocks, resets and > - power domains on SDM845. > + power domains on SDM845/SC7180. > > - See also dt-bindings/clock/qcom,videocc-sdm845.h. > + See also: > + dt-bindings/clock/qcom,videocc-sdm845.h > + dt-bindings/clock/qcom,videocc-sc7180.h Sort this alphabetically please. > > properties: > compatible: > - const: qcom,sdm845-videocc > + enum: > + - qcom,sdm845-videocc > + - qcom,sc7180-videocc Sort this alphabetically please. > > clocks: > items: > -- > 2.26.1 >
diff --git a/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml deleted file mode 100644 index 2feea2b91aa9..000000000000 --- a/Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml +++ /dev/null @@ -1,65 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -%YAML 1.2 ---- -$id: http://devicetree.org/schemas/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' - -additionalProperties: false - -examples: - - | - #include <dt-bindings/clock/qcom,rpmh.h> - clock-controller@ab00000 { - compatible = "qcom,sc7180-videocc"; - reg = <0x0ab00000 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,sdm845-videocc.yaml b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml similarity index 76% rename from Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml rename to Documentation/devicetree/bindings/clock/qcom,videocc.yaml index f7a0cf53d5f0..17666425476f 100644 --- a/Documentation/devicetree/bindings/clock/qcom,sdm845-videocc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,videocc.yaml @@ -1,23 +1,27 @@ # SPDX-License-Identifier: GPL-2.0-only %YAML 1.2 --- -$id: http://devicetree.org/schemas/clock/qcom,sdm845-videocc.yaml# +$id: http://devicetree.org/schemas/clock/qcom,videocc.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# -title: Qualcomm Video Clock & Reset Controller Binding for SDM845 +title: Qualcomm Video Clock & Reset Controller Binding maintainers: - Taniya Das <tdas@codeaurora.org> description: | Qualcomm video clock control module which supports the clocks, resets and - power domains on SDM845. + power domains on SDM845/SC7180. - See also dt-bindings/clock/qcom,videocc-sdm845.h. + See also: + dt-bindings/clock/qcom,videocc-sdm845.h + dt-bindings/clock/qcom,videocc-sc7180.h properties: compatible: - const: qcom,sdm845-videocc + enum: + - qcom,sdm845-videocc + - qcom,sc7180-videocc clocks: items:
These two bindings are almost identical, so combine them into one. This will make it easier to add the sm8150 and sm8250 videocc bindings. Signed-off-by: Jonathan Marek <jonathan@marek.ca> --- .../bindings/clock/qcom,sc7180-videocc.yaml | 65 ------------------- ...,sdm845-videocc.yaml => qcom,videocc.yaml} | 14 ++-- 2 files changed, 9 insertions(+), 70 deletions(-) delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sc7180-videocc.yaml rename Documentation/devicetree/bindings/clock/{qcom,sdm845-videocc.yaml => qcom,videocc.yaml} (76%)