From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 35FD324A06D; Wed, 25 Feb 2026 01:29:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771982983; cv=none; b=SEwyW/KS9Bda5AcONOxwHG12G18U6sblc1d7TvhvJjjw1L5CJBwan0NpvOmStcBkoCRLR/3ivqbHYUb+Cb2RH+Sb4I3GgGFsv/6OI2izp42wgwfPQowq9+dVY1zAMdp1O2GGc6qu+EI+EDH25PpNAyLVOdBRTE6gs4VMmYAVeF4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771982983; c=relaxed/simple; bh=2iPUfU4+NcgkRkG848MzbsF0MTQSZpAIPq3cqxTXAW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hMohHMKUeQZEkC55e0YOsNRRJTpcISFveBhySN2e3zDr2/EN1eZJ2SIu5HiMNc9cjolySauN3KkVi6Z6nSiCHjCu5EE+/Dl08D16Dh/O8bI4NtYhi5fKWe2NtpW9boWzl6KRuJCtvZ8+z+FAS9TyX+SoaBAPENjdCVT7AUMHA8o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=PmLZkq9E; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="PmLZkq9E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF1F5C116D0; Wed, 25 Feb 2026 01:29:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771982983; bh=2iPUfU4+NcgkRkG848MzbsF0MTQSZpAIPq3cqxTXAW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PmLZkq9EMUfVaY8pQWxIyBBTa9Pr7vJDWZCekpVIxECAcpXxzWsNCtIoO/maRND86 /UIGmNc0qd2EOxu0xO7kAGkjIuc+bXoBu57aa1oeP59/AcMmWAUkWY1V473q7Ct+oJ BbKF33fGAPoBJlXOBFxyb4m1RSVOZbFUw0TyDnis= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jingzhou Zhu , Dmitry Baryshkov , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.19 153/781] arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Remove duplicate reserved-memroy nodes Date: Tue, 24 Feb 2026 17:14:22 -0800 Message-ID: <20260225012403.412381388@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012359.695468795@linuxfoundation.org> References: <20260225012359.695468795@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jingzhou Zhu [ Upstream commit a499c40ccd8e748ef363e2d13fb7a5c0ed6a788a ] The adsp_mem and slpi_mem defined in sdm845.dtsi work well. Remove these nodes here to avoid redefinition. Signed-off-by: Jingzhou Zhu Reviewed-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20251208031511.3284-2-newwheatzjz@zohomail.com Signed-off-by: Bjorn Andersson Stable-dep-of: bc11f6f1d247 ("arm64: dts: qcom: sdm850-huawei-matebook-e-2019: Correct ipa_fw_mem for the driver to load successfully") Signed-off-by: Sasha Levin --- .../boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts index 0ef9ea38a424a..a5f025ae7dbe6 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-huawei-matebook-e-2019.dts @@ -30,9 +30,7 @@ /delete-node/ &ipa_fw_mem; /delete-node/ &ipa_gsi_mem; /delete-node/ &gpu_mem; -/delete-node/ &adsp_mem; /delete-node/ &wlan_msa_mem; -/delete-node/ &slpi_mem; / { model = "Huawei MateBook E 2019"; @@ -145,20 +143,11 @@ wlan_msa_mem: wlan-msa@8c400000 { no-map; }; - adsp_mem: adsp@8c500000 { - reg = <0 0x8c500000 0 0x1a00000>; - no-map; - }; - ipa_fw_mem: ipa-fw@8df00000 { reg = <0 0x8df00000 0 0x100000>; no-map; }; - slpi_mem: slpi@96700000 { - reg = <0 0x96700000 0 0x1200000>; - }; - gpu_mem: gpu@97900000 { reg = <0 0x97900000 0 0x5000>; no-map; -- 2.51.0