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, and allows to remove incorrect syscon
> compatible from TCSR mutex:
>
> qcom/sc7280-herobrine-crd.dtb: hwlock@1f40000: compatible: ['qcom,tcsr-mutex', 'syscon'] is too long
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
> ---
Not tested on a device, but looks good to the eye:
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxxxxxx>
Konrad
> arch/arm64/boot/dts/qcom/sc7280.dtsi | 19 ++++++++++++-------
> 1 file changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> index 13d7f267b289..89a8e6b9822a 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
> @@ -2155,12 +2155,17 @@ ipa: ipa@1e40000 {
> };
>
> tcsr_mutex: hwlock@1f40000 {
> - compatible = "qcom,tcsr-mutex", "syscon";
> - reg = <0 0x01f40000 0 0x40000>;
> + compatible = "qcom,tcsr-mutex";
> + reg = <0 0x01f40000 0 0x20000>;
> #hwlock-cells = <1>;
> };
>
> - tcsr: syscon@1fc0000 {
> + tcsr_1: sycon@1f60000 {
> + compatible = "qcom,sc7280-tcsr", "syscon";
> + reg = <0 0x01f60000 0 0x20000>;
> + };
> +
> + tcsr_2: syscon@1fc0000 {
> compatible = "qcom,sc7280-tcsr", "syscon";
> reg = <0 0x01fc0000 0 0x30000>;
> };
> @@ -2522,9 +2527,9 @@ remoteproc_mpss: remoteproc@4080000 {
> <&pdc_reset PDC_MODEM_SYNC_RESET>;
> reset-names = "mss_restart", "pdc_reset";
>
> - qcom,halt-regs = <&tcsr_mutex 0x23000 0x25000 0x28000 0x33000>;
> - qcom,ext-regs = <&tcsr 0x10000 0x10004 &tcsr_mutex 0x26004 0x26008>;
> - qcom,qaccept-regs = <&tcsr_mutex 0x23030 0x23040 0x23020>;
> + qcom,halt-regs = <&tcsr_1 0x3000 0x5000 0x8000 0x13000>;
> + qcom,ext-regs = <&tcsr_2 0x10000 0x10004 &tcsr_1 0x6004 0x6008>;
> + qcom,qaccept-regs = <&tcsr_1 0x3030 0x3040 0x3020>;
>
> status = "disabled";
>
> @@ -3259,7 +3264,7 @@ remoteproc_wpss: remoteproc@8a00000 {
> <&pdc_reset PDC_WPSS_SYNC_RESET>;
> reset-names = "restart", "pdc_sync";
>
> - qcom,halt-regs = <&tcsr_mutex 0x37000>;
> + qcom,halt-regs = <&tcsr_1 0x17000>;
>
> status = "disabled";
>
