From patchwork Thu Sep 30 18:21:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 514969 Delivered-To: patch@linaro.org Received: by 2002:a02:606e:0:0:0:0:0 with SMTP id d46csp39536jaf; Thu, 30 Sep 2021 11:20:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9jLqYAsGJArJaqOUCAPXufQ6GeubbU3b9w/JEgQ+MqPI7L6LxCJ8eY9BMvJT9dMEEcSV5 X-Received: by 2002:a17:906:3ce2:: with SMTP id d2mr807455ejh.410.1633026003241; Thu, 30 Sep 2021 11:20:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633026003; cv=none; d=google.com; s=arc-20160816; b=oTlSIzt5HndGgcGZSMd5MHskZR2pwUUM737WcxFhYdnxaL9IESrA5QeoA/Kx8aqRGz 96UCf6tkG0Ws/ESHOwfb9816PYH5asWbj1CQFQNPeCjrIZDPvtGR/pEbFwbfZc22NFxk ymAF6N5iuaAb1PUNzAvA2vvG/VzLAMztY2oVEROfv8m8IjIq7i1lOkXVnrz900qDE3K+ X+3JcH2g1gD16rXqxG1sYqX8RQMma+nIQhFEiaTG2tF+93t8Rqc8V2rgo09xirGHJgLC Ho9wJgsivWX+dGa26seyO5qlItebgB6izPk7SNyLyl7ezbSEfDw7LdixxPxDRqT1Cm+K UyIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ssfSmhsMHjEW6hYVe4PjTHBi61zsb9noqUigbf2gVRo=; b=md6kVWOvB4U/s6yOviFp9NPYWevF6EXxLMp/icQbuszXU0t1nBtO1xfqCvEL282UeG 2ka219sb6cw6zXYgBQt/eL2xE9a0Rn9Z9qmccddY2Z7Nx4eNtQLmnSN3m8Dz/TfUPtYC lb0oUagchFZTtjp8FVJV8eU6kaa6q2Lee65xlnFTscEs+AtNBDJcS7gBCa1Wow/l41d5 87pDOZe8oZ1aknqufyYBkWGQraj8xA9Ua9qmXgO73KB4qtnVWlpsVyZTHxXXHyqf2EBg EH5078XgokOi8RrLaYb1tAuN5+8s55oMQ+eGefddMbJBthw66m0xIToaa7j+1yvkutS3 S/Vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gCZKuBk5; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p14si4062657edx.202.2021.09.30.11.20.03; Thu, 30 Sep 2021 11:20:03 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gCZKuBk5; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350891AbhI3SVN (ORCPT + 7 others); Thu, 30 Sep 2021 14:21:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33980 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350797AbhI3SVL (ORCPT ); Thu, 30 Sep 2021 14:21:11 -0400 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB93EC06176A for ; Thu, 30 Sep 2021 11:19:27 -0700 (PDT) Received: by mail-ot1-x333.google.com with SMTP id x33-20020a9d37a4000000b0054733a85462so8431215otb.10 for ; Thu, 30 Sep 2021 11:19:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ssfSmhsMHjEW6hYVe4PjTHBi61zsb9noqUigbf2gVRo=; b=gCZKuBk5M3O2d6AQ6j53Dgx+OE2D665B/f7BF3j+ZV++mhUC2OqzthPTuK+SO78db/ KtTB8wc45m6vgtkxkxgpJcRqlY+svn2wtwfqEgdA1ykfjqCcFPs/3MqaMXPOFuOsetxG cU7T/H8iXPjMWjJE4I+308Nw/WtO0Pex1uN7NlKCT/0Ip6CWTy8eIyj4CQgLgBTk9mb3 ASm+luD4b6PrECb7zs4GsbHNvpcfn4ECNZwwcOkHYjZVEsi0tQoBzJWRav+R+AXLgPRz SI6WUgvPh1T+K+nMAp+KoZkDRol3QIT65/17KNEY2bZmfw7gM87fW7AzIq+1DLOyVXi5 cKEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ssfSmhsMHjEW6hYVe4PjTHBi61zsb9noqUigbf2gVRo=; b=c92BZchokpVxeD64Z7fUcOYroack+L8/w+O/z3DdryYuKVghE63sqjJCC5ZLu3r9rP 0JOYtghgmkIeYJJZFGNwsD0L66RYk0PQykYPZIkXC5x5f9eruUqxo+nAaLGU6vTIg2Je oDdAYbmcEw/er5au7DfNDy+6P4+MfWEpsp3TV6HmxizCE/hf2JBGuP/cVX8zI5o5lf0E T4Ti05kzXaed+E3BomNjcJkYJU7YYbi8Yg3hqE+TB+ESA1KOZIYzwuc1NAiB0qAZp2LE 1jP3F9W87hD3p9fWGJFhDf8kzpwY2jf/hqCwrhjDHcThUtuZcnH88RPh2WhykF+QcK74 qHEA== X-Gm-Message-State: AOAM533xJdJtmadiYExIwBmywgg2BBbPliuGwUQniqGkCcrv8cD2qM+S x164/xnEfTB5FkIneyUorrhLjw== X-Received: by 2002:a9d:7053:: with SMTP id x19mr6729949otj.229.1633025967205; Thu, 30 Sep 2021 11:19:27 -0700 (PDT) Received: from localhost.localdomain (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id k6sm727416otf.80.2021.09.30.11.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Sep 2021 11:19:26 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , Bjorn Andersson , Rob Herring , Frank Rowand Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Lew , Deepak Kumar Singh Subject: [PATCH v2 4/4] arm64: dts: qcom: sdm845: Drop standalone smem node Date: Thu, 30 Sep 2021 11:21:11 -0700 Message-Id: <20210930182111.57353-5-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210930182111.57353-1-bjorn.andersson@linaro.org> References: <20210930182111.57353-1-bjorn.andersson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Now that the SMEM binding and driver allows the SMEM node to be described in the reserved-memory region directly, move the compatible and hwlock properties to the reserved-memory node and drop the standadlone node. Signed-off-by: Bjorn Andersson --- Changes since v1: - Node name is changed to "smem", as "memory" is reserved for memory nodes. arch/arm64/boot/dts/qcom/sdm845.dtsi | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) -- 2.29.2 diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index beee57087d05..64119d2efdcf 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -99,9 +99,11 @@ aop_cmd_db_mem: memory@85fe0000 { no-map; }; - smem_mem: memory@86000000 { + smem@86000000 { + compatible = "qcom,smem"; reg = <0x0 0x86000000 0 0x200000>; no-map; + hwlocks = <&tcsr_mutex 3>; }; tz_mem: memory@86200000 { @@ -941,12 +943,6 @@ tcsr_mutex: hwlock { #hwlock-cells = <1>; }; - smem { - compatible = "qcom,smem"; - memory-region = <&smem_mem>; - hwlocks = <&tcsr_mutex 3>; - }; - smp2p-cdsp { compatible = "qcom,smp2p"; qcom,smem = <94>, <432>;