From patchwork Thu Jul 20 07:20:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 123063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2958589vqt; Thu, 20 Jul 2023 01:05:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlEGBAt9zTEYqTdnNXl06wXTK0GpJj/ae5i3sUFE1vU9jsUppTwLwx3vJ1PMy45/YjoNAYc+ X-Received: by 2002:aa7:c2d5:0:b0:51d:95f2:ee76 with SMTP id m21-20020aa7c2d5000000b0051d95f2ee76mr3986495edp.27.1689840330474; Thu, 20 Jul 2023 01:05:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689840330; cv=none; d=google.com; s=arc-20160816; b=uhBbGEJpYSmKI1+vuts5qauKkXllOiSnC9lMhVJrQ+3WrKsjjCut1rdP4rFYBdryAK AOGFGxEa2bQSlitvayvk7W7fNKPxnmvcPYATHHKcdwO/LEni8T9YyfJxcj7LBAMo7s7A zvWJDv/jP/IPcF7karieajTOiiZcXbXwELenA2AkLxZ4c7BxRlcbIUBOpt9EEHhNh9To 86n48ogDb+dW64AYXm+VWPpyb2TK6mWCIfCa4Kw3UrTXmIKYPRgyU8SAzMf2xnhld4mk LCvgRqJ3l95dde1q5rlWJS2/txackqhlLHZZRM1KPnaibYmTrLicJvfBwofQMjr7FVVM ESpQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=2fbCfe+Jexyxfwxcv5jmJWYFscoFzXBWfr2MIt+Bdx0=; fh=5E2Y1i/9a0bTrwzwTVautnGcqzM7uDTaeN5sxZKbav8=; b=KOi79kaQxzOq1rRbGtJHqjSPfAw26YnzYunIAjkAvqZndrc7onosC9sjvn+vvduIpw OQ+f46kzgwdnKbycju2Sr6egQ7bugLT7mX/jPifIH2GZzRa8zy0KENieF8IniUeIFJYY udFzagIrseuHO/lC0J7xF7nOXztywBJhfjOVfKKYbjWjifWlLeZZGQNSvqpr+HrG4Rvt pSDklg1dLkvMokAbJPpDDZT2+Mnqh1wQVbonHU0hYB9NlbnHHicLad37f3TwN2e9avpH pdBMW3ruVHMQLBkQx7rcRG2OgEuOfrTvohxTpKlnVWgQuZnxGRqF1d+OisBuLLhLWwq/ b5PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PRW8dbua; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v26-20020aa7d65a000000b0051debcc0476si519766edr.152.2023.07.20.01.05.05; Thu, 20 Jul 2023 01:05:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PRW8dbua; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-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 S231359AbjGTHVA (ORCPT + 99 others); Thu, 20 Jul 2023 03:21:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230421AbjGTHU4 (ORCPT ); Thu, 20 Jul 2023 03:20:56 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B38E19A4 for ; Thu, 20 Jul 2023 00:20:54 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3141c3a7547so357127f8f.2 for ; Thu, 20 Jul 2023 00:20:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689837652; x=1692429652; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=2fbCfe+Jexyxfwxcv5jmJWYFscoFzXBWfr2MIt+Bdx0=; b=PRW8dbua98J5/F75JrNUCJ+pUMEcV/dyaNVQwx+0rJuN4Vvwpp6nodcpUChTlV/ezo dFZ9RCQEQQX46AAfsQgSbt5VBVgEB9YFc4YFd4k0KQHlESbbo9FcBKv8sLxw/G4mpPh6 q6yC5mK7cBO9sNu34Gqm+SpZiDmNF21Y5fYSiacwpNrPoDeJJxQl4FtdGuUb55AFplKG At/ttEohUBDkLaSZuMS/sH2v8xxJ77wynntf40GPdKwNcn95C7KqbRxPgzAZOCp/h5Va 6F4Gjg0SVkbnAnwlYIzUIneuRsS//2pPiJDA5roXTVgWl6R+a0r03HcQYmkrKoxrlz/U ALuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689837652; x=1692429652; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=2fbCfe+Jexyxfwxcv5jmJWYFscoFzXBWfr2MIt+Bdx0=; b=hv54Pd3IBbMDK6Zj3KyNz/Z5iBDrAR4S6JI4d+UHB7zyrR9fyYC0j5sw60gd0MLMF9 kG1CHNtSWiLUzADQjt+xym6aV7q2dXbvUSjDLRb+8daGUBmUYnbjHt8nIEcU5ROaFXVq n9dZXGEv/KkUY3xKeesrL9ey+gnjzUK+ECcrYtwxs2jUc+C2/8ezyjLI0wXBZ7pNgPEA kP/b7YJQoxzUvK8tolezYjQP4KC09QQgk7DUe4xRNGw2Crq/19XcPUdeod1q0y6wIVK+ yLb/H34WQmtz17ohUX6wMk2GirdBPc9WtoXdJgVPvQcTzBv9/X0LKE23D7SOGvmxT7AN q1ig== X-Gm-Message-State: ABy/qLa11iXg7BsKXu+F8bZzz6/v9vxTUQ2bMJ+L/0StE1y3y80OT28S FJtRatBehbQ+BggTV19VHsqbzQ== X-Received: by 2002:adf:f248:0:b0:316:e249:c285 with SMTP id b8-20020adff248000000b00316e249c285mr1299138wrp.71.1689837652478; Thu, 20 Jul 2023 00:20:52 -0700 (PDT) Received: from krzk-bin.. ([178.197.223.104]) by smtp.gmail.com with ESMTPSA id v1-20020a5d6781000000b0031434c08bb7sm399767wru.105.2023.07.20.00.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 00:20:52 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [RESEND PATCH 1/2] arm64: dts: qcom: msm8994: fix duplicated @6c00000 reserved memory Date: Thu, 20 Jul 2023 09:20:47 +0200 Message-Id: <20230720072048.10093-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771926014339929895 X-GMAIL-MSGID: 1771926014339929895 Reserved memory @6c00000 is defined in MSM8994 DTSI and few boards: Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/hole2@6c00000) Warning (unique_unit_address_if_enabled): /reserved-memory/reserved@6c00000: duplicate unit-address (also used in node /reserved-memory/memory@6c00000) Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 1 + arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 1 + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts index fcca1ba94da6..501e05efbef4 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts @@ -15,6 +15,7 @@ /delete-node/ &audio_mem; /delete-node/ &mpss_mem; /delete-node/ &peripheral_region; +/delete-node/ &res_hyp_mem; /delete-node/ &rmtfs_mem; / { diff --git a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi index 2861bcdf87b7..cbc84459a5ae 100644 --- a/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi @@ -23,6 +23,7 @@ /delete-node/ &mba_mem; /delete-node/ &mpss_mem; /delete-node/ &peripheral_region; +/delete-node/ &res_hyp_mem; /delete-node/ &rmtfs_mem; /delete-node/ &smem_mem; diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi index c374fba5d8f9..4324bd2bfe76 100644 --- a/arch/arm64/boot/dts/qcom/msm8994.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi @@ -281,7 +281,7 @@ adsp_mem: memory@c9400000 { no-map; }; - reserved@6c00000 { + res_hyp_mem: reserved@6c00000 { reg = <0 0x06c00000 0 0x400000>; no-map; };