| Message ID | 20220819083209.50844-17-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | c752d491cd599b3205800678708e8b1f45844774 |
| Headers | show |
| Series | arm64: dts: qcom: improvements to TCSR mutex in DTS | expand |
On 19.08.2022 10:32, 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/sm8150-mtp.dtb: hwlock: 'reg' is a required property > qcom/sm8150-mtp.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+' > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@somainline.org> Konrad > arch/arm64/boot/dts/qcom/sm8150.dtsi | 11 +++-------- > 1 file changed, 3 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi > index 6df2e6828282..da737ba54490 100644 > --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi > @@ -585,12 +585,6 @@ scm: scm { > }; > }; > > - tcsr_mutex: hwlock { > - compatible = "qcom,tcsr-mutex"; > - syscon = <&tcsr_mutex_regs 0 0x1000>; > - #hwlock-cells = <1>; > - }; > - > memory@80000000 { > device_type = "memory"; > /* We expect the bootloader to fill in the size */ > @@ -2054,9 +2048,10 @@ ipa_virt: interconnect@1e00000 { > qcom,bcm-voters = <&apps_bcm_voter>; > }; > > - tcsr_mutex_regs: syscon@1f40000 { > - compatible = "syscon"; > + tcsr_mutex: hwlock@1f40000 { > + compatible = "qcom,tcsr-mutex"; > reg = <0x0 0x01f40000 0x0 0x20000>; > + #hwlock-cells = <1>; > }; > > tcsr_regs_1: sycon@1f60000 {
diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi index 6df2e6828282..da737ba54490 100644 --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi @@ -585,12 +585,6 @@ scm: scm { }; }; - tcsr_mutex: hwlock { - compatible = "qcom,tcsr-mutex"; - syscon = <&tcsr_mutex_regs 0 0x1000>; - #hwlock-cells = <1>; - }; - memory@80000000 { device_type = "memory"; /* We expect the bootloader to fill in the size */ @@ -2054,9 +2048,10 @@ ipa_virt: interconnect@1e00000 { qcom,bcm-voters = <&apps_bcm_voter>; }; - tcsr_mutex_regs: syscon@1f40000 { - compatible = "syscon"; + tcsr_mutex: hwlock@1f40000 { + compatible = "qcom,tcsr-mutex"; reg = <0x0 0x01f40000 0x0 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/sm8150-mtp.dtb: hwlock: 'reg' is a required property qcom/sm8150-mtp.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/sm8150.dtsi | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)