2022-08-17 13:06:50

by Krzysztof Kozlowski

Subject: [RFT PATCH v2 07/14] arm64: dts: qcom: sc7180: split TCSR halt regs out of mutex

The TCSR halt regs are next to TCSR mutex, so before converting the TCSR
mutex into device with address space, we need to split the halt regs to
its own syscon device. This also describes more accurately the devices
and their IO address space.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
arch/arm64/boot/dts/qcom/sc7180.dtsi | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 49f28cb531f6..5d2dd21da79c 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -1464,10 +1464,15 @@ ipa: ipa@1e40000 {

tcsr_mutex_regs: syscon@1f40000 {
compatible = "syscon";
- reg = <0 0x01f40000 0 0x40000>;
+ reg = <0 0x01f40000 0 0x20000>;
};

- tcsr_regs: syscon@1fc0000 {
+ tcsr_regs_1: sycon@1f60000 {
+ compatible = "qcom,sc7180-tcsr", "syscon";
+ reg = <0 0x01f60000 0 0x20000>;
+ };
+
+ tcsr_regs_2: syscon@1fc0000 {
compatible = "qcom,sc7180-tcsr", "syscon";
reg = <0 0x01fc0000 0 0x40000>;
};
@@ -1932,8 +1937,8 @@ remoteproc_mpss: remoteproc@4080000 {
<&pdc_reset PDC_MODEM_SYNC_RESET>;
reset-names = "mss_restart", "pdc_reset";

- qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>;
- qcom,spare-regs = <&tcsr_regs 0xb3e4>;
+ qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>;
+ qcom,spare-regs = <&tcsr_regs_2 0xb3e4>;

status = "disabled";

--
2.34.1

2022-08-17 21:05:37

by Konrad Dybcio

Subject: Re: [RFT PATCH v2 07/14] arm64: dts: qcom: sc7180: split TCSR halt regs out of mutex

On 17.08.2022 15:03, Krzysztof Kozlowski wrote:
> The TCSR halt regs are next to TCSR mutex, so before converting the TCSR
> mutex into device with address space, we need to split the halt regs to
> its own syscon device. This also describes more accurately the devices
> and their IO address space.
>
> 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/sc7180.dtsi | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 49f28cb531f6..5d2dd21da79c 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -1464,10 +1464,15 @@ ipa: ipa@1e40000 {
>
> tcsr_mutex_regs: syscon@1f40000 {
> compatible = "syscon";
> - reg = <0 0x01f40000 0 0x40000>;
> + reg = <0 0x01f40000 0 0x20000>;
> };
>
> - tcsr_regs: syscon@1fc0000 {
> + tcsr_regs_1: sycon@1f60000 {
> + compatible = "qcom,sc7180-tcsr", "syscon";
> + reg = <0 0x01f60000 0 0x20000>;
> + };
> +
> + tcsr_regs_2: syscon@1fc0000 {
> compatible = "qcom,sc7180-tcsr", "syscon";
> reg = <0 0x01fc0000 0 0x40000>;
> };
> @@ -1932,8 +1937,8 @@ remoteproc_mpss: remoteproc@4080000 {
> <&pdc_reset PDC_MODEM_SYNC_RESET>;
> reset-names = "mss_restart", "pdc_reset";
>
> - qcom,halt-regs = <&tcsr_mutex_regs 0x23000 0x25000 0x24000>;
> - qcom,spare-regs = <&tcsr_regs 0xb3e4>;
> + qcom,halt-regs = <&tcsr_regs_1 0x3000 0x5000 0x4000>;
> + qcom,spare-regs = <&tcsr_regs_2 0xb3e4>;
>
> status = "disabled";
>