From patchwork Wed Aug 17 12:03:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 598204 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EBE5EC25B08 for ; Wed, 17 Aug 2022 12:04:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239272AbiHQMEo (ORCPT ); Wed, 17 Aug 2022 08:04:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239245AbiHQMEh (ORCPT ); Wed, 17 Aug 2022 08:04:37 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B32DB4F661 for ; Wed, 17 Aug 2022 05:04:28 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id z6so18718462lfu.9 for ; Wed, 17 Aug 2022 05:04:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=QCMHKhkVunzbtGiMJ/wq/fYfBgDNCThjx88/COvHDls=; b=jMVMljrAXcYn6hVHQqGcd6DmXZC3bnx+dOnbvpw03W+hSQ1yLtV0yLSF4E0K/vW1PH oalzUaSW36/TGpx1jvmKYfJnOc4cgVr4qtZeIyKFcSEM2D+P81umCkxaU2W3uAXwr6uh ee/qbI/7n8m0SzL5Foh+yEM0axQYOjoy0oTPG1c65x8yk5pvaDFmBuBgJ5U6/X4Havsr mnSeAsv5VFRGZr88sBTI7F7D3sawGuq8j48d28YDpkyobzHE/kJrD/7xJmTB3MjKGsu6 ToSYcvWwkrQufRZReX2PNGrqdAhOI1W52Om5OJriqZj3FC7u++OGv1HXos0EixfwxHaD 2NGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=QCMHKhkVunzbtGiMJ/wq/fYfBgDNCThjx88/COvHDls=; b=nvqrB8NwZ9DjsXI465w2z5tiJMYLjCXWOJ+MnlxnB4oPER2/NeoeheOdpBZ5uVm0uH R9UBAK7Xz1OVDWoUgzix2FTz3WLSN8WtiMsf2T8DVYD4KjGbwvv4KqQWXsTkFCdVA8fE WeipbBaccQ/uSFzSGGCB6b9zeTQY9VoGiR+7re5ez14zCuYNN0sRl/HbwUlWp+851FmB oTDYNR4qBZfMrxxKnQpFi1Hp4zDBkiP9VE0tfIrg9goKBs+AqzbYiHjOtt//o0agM4kO aruTLUB2IuvRYAiZfgE/RxsEnxLhh3qkkpqq4d2Yj/09qNPZw1OOTZhKdXR2w7gofigx mijA== X-Gm-Message-State: ACgBeo0dijxKHWP/Am8sw6WIcjeJr9/Cr59kGODdl2LzFGktnRfkvSLg r08HkgxOEWCvepY4F7aAcGKs1Q== X-Google-Smtp-Source: AA6agR5S+APZgwcw+bIIDVGoAnuC/13B7ipF5b8+EdFoYAALnaA5p2FIyrCTjzHmbNXDwKwD1Go7xg== X-Received: by 2002:a05:6512:238c:b0:48b:132:8392 with SMTP id c12-20020a056512238c00b0048b01328392mr8117244lfv.658.1660737867059; Wed, 17 Aug 2022 05:04:27 -0700 (PDT) Received: from krzk-bin.. (d15l54h48cw7vbh-qr4-4.rev.dnainternet.fi. [2001:14bb:ae:539c:1b1c:14b7:109b:ed76]) by smtp.gmail.com with ESMTPSA id d15-20020a05651221cf00b0048a97042251sm1670496lft.22.2022.08.17.05.04.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 05:04:26 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Lee Jones , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RFT PATCH 09/14] arm64: dts: qcom: sc7280: split TCSR halt regs out of mutex Date: Wed, 17 Aug 2022 15:03:58 +0300 Message-Id: <20220817120403.458000-11-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220817120403.458000-1-krzysztof.kozlowski@linaro.org> References: <20220817120403.458000-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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 --- 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";