| Message ID | 20220914142256.28775-5-ansuelsmth@gmail.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | Krait Documentation conversion | expand |
On 14/09/2022 16:22, 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 | 7 +++++-- > 5 files changed, 13 insertions(+), 7 deletions(-) warning: 1 line adds whitespace errors. error: patch failed: arch/arm/boot/dts/qcom-apq8064.dtsi:845 error: arch/arm/boot/dts/qcom-apq8064.dtsi: patch does not apply error: patch failed: arch/arm/boot/dts/qcom-ipq8064.dtsi:917 error: arch/arm/boot/dts/qcom-ipq8064.dtsi: patch does not apply error: patch failed: arch/arm/boot/dts/qcom-msm8960.dtsi:63 error: arch/arm/boot/dts/qcom-msm8960.dtsi: patch does not apply hint: Use 'git am --show-current-patch=diff' to see the failed patch Best regards, Krzysztof
On 23/12/2022 11:17, Krzysztof Kozlowski wrote: > On 14/09/2022 16:22, 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 | 7 +++++-- >> 5 files changed, 13 insertions(+), 7 deletions(-) > > > warning: 1 line adds whitespace errors. Only this is relevant (rest of non-applying is not important) Best regards, Krzysztof
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 257fcd497f86..ecf28260fd8c 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -845,8 +845,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@108000 { diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi index a9bf2596a417..82c1483cd6ea 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -917,11 +917,11 @@ tcsr: syscon@1a400000 { }; l2cc: clock-controller@2011000 { - compatible = "qcom,kpss-gcc", "syscon"; + compatible = "qcom,kpss-gcc-ipq8064", "qcom,kpss-gcc", "syscon"; reg = <0x2011000 0x1000>; clocks = <&gcc PLL8_VOTE>, <&pxo_board>; clock-names = "pll8_vote", "pxo"; - clock-output-names = "acpu_l2_aux"; + #clock-cells = <0>; }; lcc: clock-controller@28000000 { diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi index b47c86412de2..3a6bbe8a649c 100644 --- a/arch/arm/boot/dts/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi @@ -152,7 +152,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 fd7751d4d886..7796f0e4746e 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -443,7 +443,7 @@ vibrator@4a { }; 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 a5f1eda707b5..98246e1b4f3f 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -63,7 +63,7 @@ cxo_board { clock-output-names = "cxo_board"; }; - pxo_board { + pxo_board: pxo_board { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <27000000>; @@ -148,8 +148,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 | 7 +++++-- 5 files changed, 13 insertions(+), 7 deletions(-)