| Message ID | 20220817130342.568396-6-krzysztof.kozlowski@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: dts: qcom: improvements to TCSR mutex in DTS | expand |
On 17.08.2022 15:03, Krzysztof Kozlowski wrote: > The TCSR mutex bindings allow device to be described only with address > space (so it uses MMIO, not syscon regmap). This seems reasonable as > TCSR mutex is actually a dedicated IO address space and it also fixes DT > schema checks: > > qcom/msm8998-asus-novago-tp370ql.dtb: hwlock: 'reg' is a required property > qcom/msm8998-asus-novago-tp370ql.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Not tested on a device, but looks good to the eye: Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org> Konrad > arch/arm64/boot/dts/qcom/msm8998.dtsi | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi > index f0806ed103f1..22b2da74d105 100644 > --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi > @@ -308,12 +308,6 @@ scm { > }; > }; > > - tcsr_mutex: hwlock { > - compatible = "qcom,tcsr-mutex"; > - syscon = <&tcsr_mutex_regs 0 0x1000>; > - #hwlock-cells = <1>; > - }; > - > psci { > compatible = "arm,psci-1.0"; > method = "smc"; > @@ -1047,9 +1041,10 @@ ufsphy_lanes: phy@1da7400 { > }; > }; > > - tcsr_mutex_regs: syscon@1f40000 { > - compatible = "syscon"; > + tcsr_mutex: hwlock@1f40000 { > + compatible = "qcom,tcsr-mutex"; > reg = <0x01f40000 0x20000>; > + #hwlock-cells = <1>; > }; > > tcsr_regs_1: sycon@1f60000 {
diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi index f0806ed103f1..22b2da74d105 100644 --- a/arch/arm64/boot/dts/qcom/msm8998.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi @@ -308,12 +308,6 @@ scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - psci { compatible = "arm,psci-1.0"; method = "smc"; @@ -1047,9 +1041,10 @@ ufsphy_lanes: phy@1da7400 { }; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0x01f40000 0x20000>; + #hwlock-cells = <1>; }; tcsr_regs_1: sycon@1f60000 {
The TCSR mutex bindings allow device to be described only with address space (so it uses MMIO, not syscon regmap). This seems reasonable as TCSR mutex is actually a dedicated IO address space and it also fixes DT schema checks: qcom/msm8998-asus-novago-tp370ql.dtb: hwlock: 'reg' is a required property qcom/msm8998-asus-novago-tp370ql.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm64/boot/dts/qcom/msm8998.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)