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: 705388 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 A6A4BEB64DA for ; Thu, 20 Jul 2023 07:20:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231150AbjGTHU5 (ORCPT ); Thu, 20 Jul 2023 03:20:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229746AbjGTHU4 (ORCPT ); Thu, 20 Jul 2023 03:20:56 -0400 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E1A519A6 for ; Thu, 20 Jul 2023 00:20:54 -0700 (PDT) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-314313f127fso365583f8f.1 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=jUMmrGTk/EV2keUUkOnPXduaBWEAO16JOl30X93anEpyqSItZL+bw83dUt1tkt0OLG O5EigGPQF2pB/s0BpcqqPN2atFBfJEC1ICx00WUkHonX4h3vHtpu42yGRMrlamY+8nMq JI2Ds7aS7e1IjVovy+50ExroxyeVPohNddftF4CBBxosl8fq2JwBIBL1Dg7DitluBoSi 1Ucg/fTOPeylM3U65HnJu9OXeM6iMro3iMre1i3oH/6iCcOFU+GDVZl+d3cFwI54f7Rx EPuLqjazZ9oJR3oM0G/eUauq1AzCCJ9GdDYqviICuKGA736koOepzxnzHZETsrMkRfmr Ff9w== X-Gm-Message-State: ABy/qLbvVMYiQwefQ/OZ8RGwUC06iLXPN6jGoCxgNhxoSEPJn/NNZzDJ JAY8Q2vXqp6lGKhjANCsZkWdug== X-Google-Smtp-Source: APBJJlEKt/pVw48GgiNZDrcBVhhom8ZjwJ/RpQ4cRWBf6FTiaULsbPWBd5IeXXmMuch+RQsWF5iYrQ== 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 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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; }; From patchwork Thu Jul 20 07:20:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 704619 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 A0106C001DE for ; Thu, 20 Jul 2023 07:21:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229746AbjGTHU7 (ORCPT ); Thu, 20 Jul 2023 03:20:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231394AbjGTHU5 (ORCPT ); Thu, 20 Jul 2023 03:20:57 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E260F2128 for ; Thu, 20 Jul 2023 00:20:55 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-3fb4146e8ceso3428845e9.0 for ; Thu, 20 Jul 2023 00:20:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689837654; x=1692429654; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zkvq8PLrKRAViicQL2lp06qamZMGFRuRLh5USoc58vw=; b=wnJnPobhUpvmppz0hmMpMdvG9c9qcJ/ca6mAvL1othcTqlsFruzm527lnbmmH4ksaK v2JE9+28IuaUsuNW3dVhX7EHwLcBBIVj/wUGo+6ch7GYbXChNJqRaTNwzL8ZGGwG0Df7 7bJNW7g0oVK5kVlLmC5WEBJZHaAo+Lhyc0q2rpXbEQMMBTHMwqxHLYtJ4cj8LKK4whPu sm0e354nwlCjBjvH5SxCN6P9Uu8pLuQh3JFuDsD9+LxCwCWOsxANSyHQyRrm3Gg1YbGl E6z4XczhLwKmSu/2bSdY05IzZwqF8R9ce9ZH7wGjiy3vUNmHKbxMY3y+RwLz7UesSSO3 QWHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689837654; x=1692429654; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zkvq8PLrKRAViicQL2lp06qamZMGFRuRLh5USoc58vw=; b=LvWP5+ljdnHMugg0pyuITw+ErYuxmuLxSo0K4aUiWsI12AIEXxb+1fC7fFMimgcy7S IV1NagvFfrV2r2vxWxntwykTfsr3fy/Qg/uyGTZ1Fd2ok1l9kkDp49uURImtCTAAxW+m tUJgkgPJ5WTfafVRO3rY4Gsr0vcV4WAvlI/255ZN6qr/JKIrQp/UU7swEf7896gODrh/ TnxYhcoxaTbAK59vUGCmTyJhpUMv+wkVHGDjtK4n+zu0TNqpltczXM75C7DhadA9tNil MiCahmyjrkwbDphIK+TXU92yMpTMkzgkQx4tyZ9ZLVPoAPpTwJ71HJNMLBpssy/WJFpB hzag== X-Gm-Message-State: ABy/qLa/a7lJIDso6s85GwTlpkZTd/NAeewaEL0TUCHpUphd+ZJv3o3Y zyzos4fKvTwv63ks3wSQO8e0rw== X-Google-Smtp-Source: APBJJlE/7M5tGfJ/bv8zqoEC6d/nfpK99w6SC9TQP0/TEykqSrrfD/lk4A3aQHRzuHvI0jKAlXWV/Q== X-Received: by 2002:a5d:4524:0:b0:314:268b:21f1 with SMTP id j4-20020a5d4524000000b00314268b21f1mr1325029wra.18.1689837654072; Thu, 20 Jul 2023 00:20:54 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 00:20:53 -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 2/2] arm64: dts: qcom: msm8992-libra: drop duplicated reserved memory Date: Thu, 20 Jul 2023 09:20:48 +0200 Message-Id: <20230720072048.10093-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230720072048.10093-1-krzysztof.kozlowski@linaro.org> References: <20230720072048.10093-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org There are two entries for similar reserved memory: qseecom@cb400000 and audio@cb400000. Keep the qseecom as it is longer. Warning (unique_unit_address_if_enabled): /reserved-memory/audio@cb400000: duplicate unit-address (also used in node /reserved-memory/qseecom@cb400000) Fixes: 69876bc6fd4d ("arm64: dts: qcom: msm8992-libra: Fix the memory map") Signed-off-by: Krzysztof Kozlowski --- Maybe the original intention was to use different address for audio res. memory? --- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts index 501e05efbef4..133f9c2540bc 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts @@ -110,11 +110,6 @@ rmtfs_mem: rmtfs@ca100000 { qcom,client-id = <1>; }; - audio_mem: audio@cb400000 { - reg = <0 0xcb000000 0 0x400000>; - no-mem; - }; - qseecom_mem: qseecom@cb400000 { reg = <0 0xcb400000 0 0x1c00000>; no-mem;