2022-08-17 13:06:51

by Krzysztof Kozlowski

Subject: [RFT PATCH v2 03/14] arm64: dts: qcom: msm8996: switch TCSR mutex to MMIO

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/msm8996-xiaomi-natrium.dtb: hwlock: 'reg' is a required property
qcom/msm8996-xiaomi-natrium.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+'

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/msm8996.dtsi | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index 3411ced96db6..166374566a49 100644
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -363,12 +363,6 @@ 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 reg */
@@ -838,9 +832,10 @@ pnoc: interconnect@5c0000 {
<&rpmcc RPM_SMD_PCNOC_A_CLK>;
};

- tcsr_mutex_regs: syscon@740000 {
- compatible = "syscon";
+ tcsr_mutex: hwlock@740000 {
+ compatible = "qcom,tcsr-mutex";
reg = <0x00740000 0x20000>;
+ #hwlock-cells = <1>;
};

tcsr_1: sycon@760000 {
--
2.34.1

2022-08-17 21:14:42

by Konrad Dybcio

Subject: Re: [RFT PATCH v2 03/14] arm64: dts: qcom: msm8996: switch TCSR mutex to MMIO

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/msm8996-xiaomi-natrium.dtb: hwlock: 'reg' is a required property
> qcom/msm8996-xiaomi-natrium.dtb: hwlock: 'syscon' does not match any of the regexes: 'pinctrl-[0-9]+'
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Not tested on a device, but looks good to the eye:
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> arch/arm64/boot/dts/qcom/msm8996.dtsi | 11 +++--------
> 1 file changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> index 3411ced96db6..166374566a49 100644
> --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> @@ -363,12 +363,6 @@ 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 reg */
> @@ -838,9 +832,10 @@ pnoc: interconnect@5c0000 {
> <&rpmcc RPM_SMD_PCNOC_A_CLK>;
> };
>
> - tcsr_mutex_regs: syscon@740000 {
> - compatible = "syscon";
> + tcsr_mutex: hwlock@740000 {
> + compatible = "qcom,tcsr-mutex";
> reg = <0x00740000 0x20000>;
> + #hwlock-cells = <1>;
> };
>
> tcsr_1: sycon@760000 {