| Message ID | 20230110183259.19142-5-ansuelsmth@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Krait Documentation conversion | expand |
On 10/01/2023 20:32, Christian Marangi wrote: > Fix dtbs_check warning now that we have a correct kpss-gcc yaml > schema. Add additional qcom,kpss-gcc compatible to differentiate > devices where kpss-gcc should provide a clk and where kpss-gcc should > just provide the registers and the syscon phandle. > Add missing #clock-cells and remove useless clock-output-names for > ipq806x. > Add missing bindings for msm8960 and apq8064 kpss-gcc node. > > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> > --- > arch/arm/boot/dts/qcom-apq8064.dtsi | 5 ++++- > arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- > arch/arm/boot/dts/qcom-mdm9615.dtsi | 2 +- > arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +- > arch/arm/boot/dts/qcom-msm8960.dtsi | 5 ++++- > 5 files changed, 12 insertions(+), 6 deletions(-) Please split this commit into two commits: - one adding per-SoC compatibles. Mention that they are not (yet) used by the driver, but can serve further customisation. - another one adding and fixing clock configuration. My notes to patch 5/6 applies here too. > > diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi > index 1f3e0aa9ab0c..1e68b42acb91 100644 > --- a/arch/arm/boot/dts/qcom-apq8064.dtsi > +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi > @@ -880,8 +880,11 @@ mmcc: clock-controller@4000000 { > }; > > l2cc: clock-controller@2011000 { > - compatible = "qcom,kpss-gcc", "syscon"; > + compatible = "qcom,kpss-gcc-apq8064", "qcom,kpss-gcc", "syscon"; > reg = <0x2011000 0x1000>; > + clocks = <&gcc PLL8_VOTE>, <&pxo_board>; > + clock-names = "pll8_vote", "pxo"; > + #clock-cells = <0>; > }; > > rpm: rpm@108000 { > diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi > index 7e784b0995da..de87fcaaa836 100644 > --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi > +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi > @@ -570,11 +570,11 @@ IRQ_TYPE_EDGE_RISING)>, > }; > > l2cc: clock-controller@2011000 { > - compatible = "qcom,kpss-gcc", "syscon"; > + compatible = "qcom,kpss-gcc-ipq8064", "qcom,kpss-gcc", "syscon"; > reg = <0x02011000 0x1000>; > clocks = <&gcc PLL8_VOTE>, <&pxo_board>; > clock-names = "pll8_vote", "pxo"; > - clock-output-names = "acpu_l2_aux"; > + #clock-cells = <0>; > }; > > acc0: clock-controller@2088000 { > diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi > index b0fe1d95d88f..61dfec3b9037 100644 > --- a/arch/arm/boot/dts/qcom-mdm9615.dtsi > +++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi > @@ -116,7 +116,7 @@ lcc: clock-controller@28000000 { > }; > > l2cc: clock-controller@2011000 { > - compatible = "qcom,kpss-gcc", "syscon"; > + compatible = "qcom,kpss-gcc-mdm9615", "qcom,kpss-gcc", "syscon"; > reg = <0x02011000 0x1000>; > }; > > diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi > index 86f76d0feff4..f601b40ebcf4 100644 > --- a/arch/arm/boot/dts/qcom-msm8660.dtsi > +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi > @@ -473,7 +473,7 @@ pm8058_led133: led@133 { > }; > > l2cc: clock-controller@2082000 { > - compatible = "qcom,kpss-gcc", "syscon"; > + compatible = "qcom,kpss-gcc-msm8660", "qcom,kpss-gcc", "syscon"; > reg = <0x02082000 0x1000>; > }; > > diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi > index 7debf9db7cb1..3bd07cac315b 100644 > --- a/arch/arm/boot/dts/qcom-msm8960.dtsi > +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi > @@ -183,8 +183,11 @@ clock-controller@4000000 { > }; > > l2cc: clock-controller@2011000 { > - compatible = "qcom,kpss-gcc", "syscon"; > + compatible = "qcom,kpss-gcc-msm8960", "qcom,kpss-gcc", "syscon"; > reg = <0x2011000 0x1000>; > + clocks = <&gcc PLL8_VOTE>, <&pxo_board>; > + clock-names = "pll8_vote", "pxo"; > + #clock-cells = <0>; > }; > > rpm: rpm@108000 {
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 1f3e0aa9ab0c..1e68b42acb91 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -880,8 +880,11 @@ mmcc: clock-controller@4000000 { }; l2cc: clock-controller@2011000 { - compatible = "qcom,kpss-gcc", "syscon"; + compatible = "qcom,kpss-gcc-apq8064", "qcom,kpss-gcc", "syscon"; reg = <0x2011000 0x1000>; + clocks = <&gcc PLL8_VOTE>, <&pxo_board>; + clock-names = "pll8_vote", "pxo"; + #clock-cells = <0>; }; rpm: rpm@108000 { diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi index 7e784b0995da..de87fcaaa836 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -570,11 +570,11 @@ IRQ_TYPE_EDGE_RISING)>, }; l2cc: clock-controller@2011000 { - compatible = "qcom,kpss-gcc", "syscon"; + compatible = "qcom,kpss-gcc-ipq8064", "qcom,kpss-gcc", "syscon"; reg = <0x02011000 0x1000>; clocks = <&gcc PLL8_VOTE>, <&pxo_board>; clock-names = "pll8_vote", "pxo"; - clock-output-names = "acpu_l2_aux"; + #clock-cells = <0>; }; acc0: clock-controller@2088000 { diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi index b0fe1d95d88f..61dfec3b9037 100644 --- a/arch/arm/boot/dts/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi @@ -116,7 +116,7 @@ lcc: clock-controller@28000000 { }; l2cc: clock-controller@2011000 { - compatible = "qcom,kpss-gcc", "syscon"; + compatible = "qcom,kpss-gcc-mdm9615", "qcom,kpss-gcc", "syscon"; reg = <0x02011000 0x1000>; }; diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi index 86f76d0feff4..f601b40ebcf4 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -473,7 +473,7 @@ pm8058_led133: led@133 { }; l2cc: clock-controller@2082000 { - compatible = "qcom,kpss-gcc", "syscon"; + compatible = "qcom,kpss-gcc-msm8660", "qcom,kpss-gcc", "syscon"; reg = <0x02082000 0x1000>; }; diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi index 7debf9db7cb1..3bd07cac315b 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -183,8 +183,11 @@ clock-controller@4000000 { }; l2cc: clock-controller@2011000 { - compatible = "qcom,kpss-gcc", "syscon"; + compatible = "qcom,kpss-gcc-msm8960", "qcom,kpss-gcc", "syscon"; reg = <0x2011000 0x1000>; + clocks = <&gcc PLL8_VOTE>, <&pxo_board>; + clock-names = "pll8_vote", "pxo"; + #clock-cells = <0>; }; rpm: rpm@108000 {
Fix dtbs_check warning now that we have a correct kpss-gcc yaml schema. Add additional qcom,kpss-gcc compatible to differentiate devices where kpss-gcc should provide a clk and where kpss-gcc should just provide the registers and the syscon phandle. Add missing #clock-cells and remove useless clock-output-names for ipq806x. Add missing bindings for msm8960 and apq8064 kpss-gcc node. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> --- arch/arm/boot/dts/qcom-apq8064.dtsi | 5 ++++- arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- arch/arm/boot/dts/qcom-mdm9615.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +- arch/arm/boot/dts/qcom-msm8960.dtsi | 5 ++++- 5 files changed, 12 insertions(+), 6 deletions(-)