| Message ID | 20220817130342.568396-9-krzysztof.kozlowski@linaro.org |
|---|---|
| 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/sc7180-trogdor-wormdingler-rev1-inx.dtb: hwlock: 'reg' is a required property > qcom/sc7180-trogdor-wormdingler-rev1-inx.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/sc7180.dtsi | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index 5d2dd21da79c..e8debb0da411 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -555,12 +555,6 @@ scm { > }; > }; > > - tcsr_mutex: hwlock { > - compatible = "qcom,tcsr-mutex"; > - syscon = <&tcsr_mutex_regs 0 0x1000>; > - #hwlock-cells = <1>; > - }; > - > smem { > compatible = "qcom,smem"; > memory-region = <&smem_mem>; > @@ -1462,9 +1456,10 @@ ipa: ipa@1e40000 { > status = "disabled"; > }; > > - tcsr_mutex_regs: syscon@1f40000 { > - compatible = "syscon"; > + tcsr_mutex: hwlock@1f40000 { > + compatible = "qcom,tcsr-mutex"; > reg = <0 0x01f40000 0 0x20000>; > + #hwlock-cells = <1>; > }; > > tcsr_regs_1: sycon@1f60000 {
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 5d2dd21da79c..e8debb0da411 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -555,12 +555,6 @@ scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - smem { compatible = "qcom,smem"; memory-region = <&smem_mem>; @@ -1462,9 +1456,10 @@ ipa: ipa@1e40000 { status = "disabled"; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0 0x01f40000 0 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/sc7180-trogdor-wormdingler-rev1-inx.dtb: hwlock: 'reg' is a required property qcom/sc7180-trogdor-wormdingler-rev1-inx.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/sc7180.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)