| Message ID | 20220621160621.24415-6-y.oudjana@protonmail.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | clk: qcom: msm8996-cpu: Cleanup and migrate to parent_data | expand |
On Tue, 21 Jun 2022 at 19:07, Yassine Oudjana <yassine.oudjana@gmail.com> wrote: > > From: Yassine Oudjana <y.oudjana@protonmail.com> > > The clocks currently listed in clocks and clock-names are the ones > supplied by this clock controller, not the ones it consumes. Replace > them with the only clock it consumes - the on-board oscillator (XO), > and make the properties required. > > Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> > --- > .../bindings/clock/qcom,msm8996-apcc.yaml | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml > index a20cb10636dd..c4971234fef8 100644 > --- a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml > +++ b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml > @@ -26,22 +26,18 @@ properties: > > clocks: > items: > - - description: Primary PLL clock for power cluster (little) > - - description: Primary PLL clock for perf cluster (big) > - - description: Alternate PLL clock for power cluster (little) > - - description: Alternate PLL clock for perf cluster (big) > + - description: XO source > > clock-names: > items: > - - const: pwrcl_pll > - - const: perfcl_pll > - - const: pwrcl_alt_pll > - - const: perfcl_alt_pll > + - const: xo > > required: > - compatible > - reg > - '#clock-cells' > + - clocks > + - clock-names I think we can not list them as required, as then older DT files won't pass schema validation. But I'll leave this into the hands of Rob and Krzyshtof. > > additionalProperties: false > > @@ -51,4 +47,7 @@ examples: > compatible = "qcom,msm8996-apcc"; > reg = <0x6400000 0x90000>; > #clock-cells = <1>; > + > + clocks = <&xo_board>; > + clock-names = "xo"; > }; > -- > 2.36.1 >
On Tue, Jun 21 2022 at 20:07:50 +0300, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote: > On Tue, 21 Jun 2022 at 19:07, Yassine Oudjana > <yassine.oudjana@gmail.com> wrote: >> >> From: Yassine Oudjana <y.oudjana@protonmail.com> >> >> The clocks currently listed in clocks and clock-names are the ones >> supplied by this clock controller, not the ones it consumes. Replace >> them with the only clock it consumes - the on-board oscillator (XO), >> and make the properties required. >> >> Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> >> --- >> .../bindings/clock/qcom,msm8996-apcc.yaml | 15 >> +++++++-------- >> 1 file changed, 7 insertions(+), 8 deletions(-) >> >> diff --git >> a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >> b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >> index a20cb10636dd..c4971234fef8 100644 >> --- a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >> +++ b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >> @@ -26,22 +26,18 @@ properties: >> >> clocks: >> items: >> - - description: Primary PLL clock for power cluster (little) >> - - description: Primary PLL clock for perf cluster (big) >> - - description: Alternate PLL clock for power cluster (little) >> - - description: Alternate PLL clock for perf cluster (big) >> + - description: XO source >> >> clock-names: >> items: >> - - const: pwrcl_pll >> - - const: perfcl_pll >> - - const: pwrcl_alt_pll >> - - const: perfcl_alt_pll >> + - const: xo >> >> required: >> - compatible >> - reg >> - '#clock-cells' >> + - clocks >> + - clock-names > > I think we can not list them as required, as then older DT files won't > pass schema validation. But I'll leave this into the hands of Rob and > Krzyshtof. The old DT files that didn't have XO defined had a wrong compatible string to begin with (fixed in [1]), so I don't think it's a problem. >> additionalProperties: false >> >> @@ -51,4 +47,7 @@ examples: >> compatible = "qcom,msm8996-apcc"; >> reg = <0x6400000 0x90000>; >> #clock-cells = <1>; >> + >> + clocks = <&xo_board>; >> + clock-names = "xo"; >> }; >> -- >> 2.36.1 >> > > > -- > With best wishes > Dmitry [1] https://lore.kernel.org/linux-arm-msm/20210527192958.775434-1-konrad.dybcio@somainline.org/
On Tue, 21 Jun 2022 at 20:29, Yassine Oudjana <yassine.oudjana@gmail.com> wrote: > > > On Tue, Jun 21 2022 at 20:07:50 +0300, Dmitry Baryshkov > <dmitry.baryshkov@linaro.org> wrote: > > On Tue, 21 Jun 2022 at 19:07, Yassine Oudjana > > <yassine.oudjana@gmail.com> wrote: > >> > >> From: Yassine Oudjana <y.oudjana@protonmail.com> > >> > >> The clocks currently listed in clocks and clock-names are the ones > >> supplied by this clock controller, not the ones it consumes. Replace > >> them with the only clock it consumes - the on-board oscillator (XO), > >> and make the properties required. > >> > >> Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> > >> --- > >> .../bindings/clock/qcom,msm8996-apcc.yaml | 15 > >> +++++++-------- > >> 1 file changed, 7 insertions(+), 8 deletions(-) > >> > >> diff --git > >> a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml > >> b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml > >> index a20cb10636dd..c4971234fef8 100644 > >> --- a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml > >> +++ b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml > >> @@ -26,22 +26,18 @@ properties: > >> > >> clocks: > >> items: > >> - - description: Primary PLL clock for power cluster (little) > >> - - description: Primary PLL clock for perf cluster (big) > >> - - description: Alternate PLL clock for power cluster (little) > >> - - description: Alternate PLL clock for perf cluster (big) > >> + - description: XO source > >> > >> clock-names: > >> items: > >> - - const: pwrcl_pll > >> - - const: perfcl_pll > >> - - const: pwrcl_alt_pll > >> - - const: perfcl_alt_pll > >> + - const: xo > >> > >> required: > >> - compatible > >> - reg > >> - '#clock-cells' > >> + - clocks > >> + - clock-names > > > > I think we can not list them as required, as then older DT files won't > > pass schema validation. But I'll leave this into the hands of Rob and > > Krzyshtof. > > The old DT files that didn't have XO defined had a wrong > compatible string to begin with (fixed in [1]), so I don't > think it's a problem. Looks fine to me then. (Though Rob and Krzysztof have the deciding voice here). Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > >> additionalProperties: false > >> > >> @@ -51,4 +47,7 @@ examples: > >> compatible = "qcom,msm8996-apcc"; > >> reg = <0x6400000 0x90000>; > >> #clock-cells = <1>; > >> + > >> + clocks = <&xo_board>; > >> + clock-names = "xo"; > >> }; > >> -- > >> 2.36.1 > >> > > > > > > -- > > With best wishes > > Dmitry > > [1] > https://lore.kernel.org/linux-arm-msm/20210527192958.775434-1-konrad.dybcio@somainline.org/ > >
On 21/06/2022 19:28, Yassine Oudjana wrote: > > On Tue, Jun 21 2022 at 20:07:50 +0300, Dmitry Baryshkov > <dmitry.baryshkov@linaro.org> wrote: >> On Tue, 21 Jun 2022 at 19:07, Yassine Oudjana >> <yassine.oudjana@gmail.com> wrote: >>> >>> From: Yassine Oudjana <y.oudjana@protonmail.com> >>> >>> The clocks currently listed in clocks and clock-names are the ones >>> supplied by this clock controller, not the ones it consumes. Replace >>> them with the only clock it consumes - the on-board oscillator (XO), >>> and make the properties required. >>> >>> Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com> >>> --- >>> .../bindings/clock/qcom,msm8996-apcc.yaml | 15 >>> +++++++-------- >>> 1 file changed, 7 insertions(+), 8 deletions(-) >>> >>> diff --git >>> a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >>> b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >>> index a20cb10636dd..c4971234fef8 100644 >>> --- a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >>> +++ b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml >>> @@ -26,22 +26,18 @@ properties: >>> >>> clocks: >>> items: >>> - - description: Primary PLL clock for power cluster (little) >>> - - description: Primary PLL clock for perf cluster (big) >>> - - description: Alternate PLL clock for power cluster (little) >>> - - description: Alternate PLL clock for perf cluster (big) >>> + - description: XO source >>> >>> clock-names: >>> items: >>> - - const: pwrcl_pll >>> - - const: perfcl_pll >>> - - const: pwrcl_alt_pll >>> - - const: perfcl_alt_pll >>> + - const: xo >>> >>> required: >>> - compatible >>> - reg >>> - '#clock-cells' >>> + - clocks >>> + - clock-names >> >> I think we can not list them as required, as then older DT files won't >> pass schema validation. But I'll leave this into the hands of Rob and >> Krzyshtof. > > The old DT files that didn't have XO defined had a wrong > compatible string to begin with (fixed in [1]), so I don't > think it's a problem. > Reasonable. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml index a20cb10636dd..c4971234fef8 100644 --- a/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml +++ b/Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml @@ -26,22 +26,18 @@ properties: clocks: items: - - description: Primary PLL clock for power cluster (little) - - description: Primary PLL clock for perf cluster (big) - - description: Alternate PLL clock for power cluster (little) - - description: Alternate PLL clock for perf cluster (big) + - description: XO source clock-names: items: - - const: pwrcl_pll - - const: perfcl_pll - - const: pwrcl_alt_pll - - const: perfcl_alt_pll + - const: xo required: - compatible - reg - '#clock-cells' + - clocks + - clock-names additionalProperties: false @@ -51,4 +47,7 @@ examples: compatible = "qcom,msm8996-apcc"; reg = <0x6400000 0x90000>; #clock-cells = <1>; + + clocks = <&xo_board>; + clock-names = "xo"; };