From patchwork Thu Apr 20 18:07:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 85997 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp533541vqo; Thu, 20 Apr 2023 11:28:38 -0700 (PDT) X-Google-Smtp-Source: AKy350bQ+OnvqG1qTS9eAYCzAxA1m0LmNgNq1enIMnPxZWI6pfuBXpSzBKHdL+8d01POqjcUqnyE X-Received: by 2002:a05:6a20:4323:b0:ef:bf77:f76f with SMTP id h35-20020a056a20432300b000efbf77f76fmr3892146pzk.4.1682015318619; Thu, 20 Apr 2023 11:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682015318; cv=none; d=google.com; s=arc-20160816; b=A9oICl1q1a78SKaz0hjyAFdGHppBNuzAKTzmpaGJ7CdtGtmFTlSa7m4vL22gBCbrNh 72xF1R+hbBOA3O/W7PdAV1U5va679T8jWRf2XHCSukHyA5cawFqIcrrbtLHEIukuTn1a hTvHJKIQ5gYVtfVnovDVQ+kgrNm33tOYs4VvifRPVsELwNxqqMHnuD8/a2H8nmdS2kO5 7RuVanqT0uPAm09kmajOSmmO4XytlETIIEF/v7NykciaQY6aceYLbZ5d9K8fExqG1Dds 2KTLXZjfby5hADnsTQtxwGLf21Eh5e/b2DRVg+a1n3DTyyWYgsq3TmEcamXyF3fPp5FP OvfA== 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=Zkvq8PLrKRAViicQL2lp06qamZMGFRuRLh5USoc58vw=; b=mDEzDkSUsHfAz+Zj1D5QMVxXMrdwpd/nfZNCtEg5Vhh+iVkZ5e6/Wfv9Rh0bH2JOUv 0Kp2ssJ/yFkGgJyIodDR16Csm6eU6BcuTn2d8GBx6JLkIeWef8EIKqDaS3L5BbuiqQpe 1F1RI3bHKa+zuY8/CgOurEwZFQadD2rmZGmuy8yxxvjaQqBpoekk0S/8P6UdFunz32UE nOxyOy6e+IlkXJ7dm4YrOApsOV0BgqCfSyzoYLVE5C/vEqLfDIMgOn/0j5nJQocK5Ffi aZQL9QTTVrAA1KxtXgiO03DZNPRb58c/iE9/yoDn1AM0MVP9Kj6NdwyDNMeYYC0T6Cr8 OB2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JaTTF2w2; 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 i4-20020a654d04000000b0050bfa82c244si2081159pgt.440.2023.04.20.11.28.23; Thu, 20 Apr 2023 11:28:38 -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=JaTTF2w2; 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 S231786AbjDTSIB (ORCPT + 99 others); Thu, 20 Apr 2023 14:08:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57966 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231292AbjDTSHy (ORCPT ); Thu, 20 Apr 2023 14:07:54 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A71903AA4 for ; Thu, 20 Apr 2023 11:07:53 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id b16so8376827ejz.3 for ; Thu, 20 Apr 2023 11:07:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682014072; x=1684606072; 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=JaTTF2w2Psv6RPFeqUB56LHAC2C7PSqi/9UvCGBsarZT60O63zt4XJy3cv8zLIqXs8 W1kATanqEfuq0YD0dEgT1Py2DoE6MMAIAdUmkI8xH30qeaIQlLJmuafKfacUKWGHJ6WN ilje8homFQdJjJspGnVFSIfwI6X7s9Bq6XAnlE0W25mpyE32Q0YOrLl8p8w2ulGO+E3m Azlv51Vlr3qnZizlqm5NIb2gORq5Oxeihw2UaY6/Ww0J60lkqVHjwAx47kI20pUppNri RD12G8F2v3SyF1IB+fSe9D5pCEsOBJxSRLm1QSQEok6fWj++4fAQyPognMXc5pOe+jXZ 0/3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682014072; x=1684606072; 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=MxdfzvfBqmxfcgqZvCQ2287Yfc7jdQJ2SLc3b4e5fu1wZlxcNHRmQWkBrfrvhuY4z4 5hExWvbmJj5g78MLt+6C7bHMWNSsdFRLMXA9aNkNiF4oeSDa0VPLxUYHTdciC+MDuFGT LUaTQwRhe6WxpqdhdlKe5pdiOgMVGg038DrGsqZ7TXpBlut0Yvo2nCVq0h39SeyLPiRa QqYogknHO0EXVHpG/ULOilp4J4SNGdSs1l6dQhF8n4LjmssNfBFXzn2ilGJRfGGXqxab Azv3Bp0rqVTQvkDPBql4S5upH/oFyE43hz4fOoFSn6VvRAMtgOOC5NEBoH7voCw5CBBH zi6g== X-Gm-Message-State: AAQBX9cIDlEBlu5gbQRdVrQWlTKeNEBHnSmSvYqme1SiKqkj8Xzy+hVs zm5J6Btw1y9KxLgrF3Cv+lyZGg== X-Received: by 2002:a17:906:e082:b0:953:4987:4b8 with SMTP id gh2-20020a170906e08200b00953498704b8mr2233004ejb.47.1682014071871; Thu, 20 Apr 2023 11:07:51 -0700 (PDT) Received: from krzk-bin.. ([2a02:810d:15c0:828:bcb8:77e6:8f45:4771]) by smtp.gmail.com with ESMTPSA id v8-20020a17090610c800b0093313f4fc3csm984778ejv.70.2023.04.20.11.07.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Apr 2023 11:07:51 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/3] arm64: dts: qcom: msm8992-libra: drop duplicated reserved memory Date: Thu, 20 Apr 2023 20:07:46 +0200 Message-Id: <20230420180746.860934-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230420180746.860934-1-krzysztof.kozlowski@linaro.org> References: <20230420180746.860934-1-krzysztof.kozlowski@linaro.org> 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_NONE, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763720894953930941?= X-GMAIL-MSGID: =?utf-8?q?1763720894953930941?= 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;