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 4EB9D185B76; Wed, 5 Feb 2025 14:44:02 +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=1738766642; cv=none; b=A9N29RNvpux0XX70ZPIYKudJSvH9+FEPFgYi+ndsmmI0t/EMKRlpYA2efkrXRkJlD963s0lKawDcTriXL82pbwtnrUYXJTXMY4urpXMiABBMQPh6URn4XFJTnPL7+DyXnAqtClrbCaQ9O1ceDSCPzhmOqKpbPovQTJQOPwyQqjs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738766642; c=relaxed/simple; bh=XmTvcKe2sNhBREtFNculfeEBDYRIzW0JbWv61+g3yTc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ia4IziW+eZEyOU2I3DXE18m08YV62uQ+y4jQF1fZOqd9ehqh0Qu1Vxr0kw/eJlwnYNUpLaJ3uo7iSsof4okHfwJRtx5vpAPqpZo0e9Gg9dxOFIwRs144nfaw5eWeCHZjnIBDvP2j6g+SU9+BcuU4UkHiwA6KUL0bAJV12nVX9JA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1GEvG7dJ; 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="1GEvG7dJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A85FFC4CED1; Wed, 5 Feb 2025 14:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1738766642; bh=XmTvcKe2sNhBREtFNculfeEBDYRIzW0JbWv61+g3yTc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1GEvG7dJd5/SvyzFQkF6Bw0f1BBpKtmsFFeMuINYJVYdOtWMXmWeXJkRgm0iRKr/b U+wl+gpG23xPbGF9zrf1YOXVBX+0Vm7gEyCginoTWGy2ObWKyBKgnD9xifgmZlNvHh AutuyT1Mho9OvEc/kHTWo+yzpBZElw+PUgdoMqTo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Luca Weiss , Konrad Dybcio , Bjorn Andersson , Sasha Levin Subject: [PATCH 6.12 342/590] arm64: dts: qcom: sm7225-fairphone-fp4: Drop extra qcom,msm-id value Date: Wed, 5 Feb 2025 14:41:37 +0100 Message-ID: <20250205134508.356782282@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250205134455.220373560@linuxfoundation.org> References: <20250205134455.220373560@linuxfoundation.org> User-Agent: quilt/0.68 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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luca Weiss [ Upstream commit 7fb88e0d4dc1a40a29d49b603faa1484334c60f3 ] The ID 434 is for SM6350 while 459 is for SM7225. Fairphone 4 is only SM7225, so drop the unused 434 entry. Fixes: 4cbea668767d ("arm64: dts: qcom: sm7225: Add device tree for Fairphone 4") Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio Link: https://lore.kernel.org/r/20241220-fp4-msm-id-v1-1-2b75af02032a@fairphone.com Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts index 2ee2561b57b1d..52b16a4fdc432 100644 --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts @@ -32,7 +32,7 @@ chassis-type = "handset"; /* required for bootloader to select correct board */ - qcom,msm-id = <434 0x10000>, <459 0x10000>; + qcom,msm-id = <459 0x10000>; qcom,board-id = <8 32>; aliases { -- 2.39.5