From nobody Sun Oct 5 16:21:04 2025 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 CA1FD218ADE; Thu, 31 Jul 2025 21:02:45 +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=1753995765; cv=none; b=ewtbZkdDl5lMG7r/wS1jsHJhjZLGo25z1xDBuja9Qv1djogEEhO18b2bJtjI5YiyD0O1GWG9pQurhpq81Rb0+IECMltaTL9HMIAQ9R1STKzEGxD2nWQ5tKUJYJeYGDBEOL5VLL1+rYjunE0A7cxWH3JpNWXIt1ZmD4QT6lXyAlg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753995765; c=relaxed/simple; bh=5r3hRbz8FR0fxzEp2aiUib0VOidE2FH7mufxoX9GHf0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HJO82DrSjo7hFBD2oDoslsXxf5ndy8ZBf4oU4JhQcSlwvd9k+UbrsmekDfALBaZIcYJJ5B6DgmuVkra8O/UdsnjdV6kWdxHFgEPbPVIE+dfc8NW5S6UVu0funI3wlQ3IoVB0qLkzmvR8i0EygE3aUKzVDMlo0kS+uzyVd1kxM5Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Wl1Z6LqR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Wl1Z6LqR" Received: by smtp.kernel.org (Postfix) with ESMTPS id 61EFAC4CEF7; Thu, 31 Jul 2025 21:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753995765; bh=5r3hRbz8FR0fxzEp2aiUib0VOidE2FH7mufxoX9GHf0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Wl1Z6LqRpfxI17s3/1OfKTqpl9BMMOIj5ycEj/ecseA7kTUNR0yLHVy8XyKb12T8s FYJXewlzd2oZXN38DfvDEv8VkIXvqD5phYS+38REt32/hcCIL1LdU/fcon9u2M2JCy 7hw2GGM6OP9cGKaUuHK5oNdxmaJnk2SBlOEPTBeDHEbssWGg6NiO1pT6X8QvPXWuKe EggxabdKYbQ9G+mHb+pHQ6OmsPqxaP+BdJoR5tU/Bad1+0PiaQMFP744Y0G/VsX+qg l+BXzrtr0P6qtJZnMCkwlg0cQZzIIqf8vLczijgIvqTtEbI6qZbDVQlIQlZMe9Xxzp OaAcOe8arxE1w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C561C87FD2; Thu, 31 Jul 2025 21:02:45 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Thu, 31 Jul 2025 23:02:43 +0200 Subject: [PATCH 1/2] arm64: dts: qcom: sdm845*: Use definition for msm-id Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250731-sdm845-msmid-v1-1-98489ece786e@ixit.cz> References: <20250731-sdm845-msmid-v1-0-98489ece786e@ixit.cz> In-Reply-To: <20250731-sdm845-msmid-v1-0-98489ece786e@ixit.cz> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, David Heidelberg X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4695; i=david@ixit.cz; h=from:subject:message-id; bh=teEwdjDRl51VFNsa6G45tTJ9HtVMMKKWiVrCKkMUME4=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBoi9nzS5cInR+UQLJgvKhE57WUq3dibLHJK51rR oij1DX4zD6JAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCaIvZ8wAKCRBgAj/E00kg crbOD/49eVVV6SebGU/Db6NeMXkAnKRa64HYxpMFnq7sC6BUy0yYhn7Y0xuIMBenfLWGZTwJ7Mo Bjv6MqY8eku/Xem7SMhkpPaY3ENnfdw/u4cmKG6/GyDa1F+ivGM0ks6bRuirjlDo54dPM4lYLW7 snuk2bNLjVfp8trNUOkoURiT9qL7yMnes61C9o3J4lesRYtmBQFm975b4jdbZLrLGR3LfWFsVNu KW9/YdfTyQgsvEIcsBPNGC3vO4kfyW/gI2mZjeHMQHctQccU246oYkZprQVz9ADgHQzcclc8dGs sjD+ECPlcPNiAwckTHptCGu8ohKSkB/GJBxzAcFSxGQKLBWMUBRf2ZB9jd3VqfhaQx6eX9yfJJS gSVAxMJwzxKRQXbBwNrUPKbIKwFFLcMB0LUYaCIurCfvN9P+XnrLVpvRFC4V884HeJosZkaZsVb fWeWKgZXPeXCLyOymVjwyH4XBixH2K7xqaRa/TJ3Ob//pfsJM99m1I+kt4aULYoxPbKH0BfaUDL Hb82+8amTX6sEF8n3s/LAl+GPdzPh7OvmifVHykreH8lQgTW4L+BRGlyVUcuVXSwchU02TxsMOf 3nXApNVbpVrfYj4KBLdcRrGrzFBI0aNMlEKH8nQlb03fsdfLsOQzbZnxPtQ/khBRBkQzSc7t5JM z/CA/qxQr6FFNfA== X-Developer-Key: i=david@ixit.cz; a=openpgp; fpr=D77A09CFEEDC2BBD53A7047460023FC4D3492072 X-Endpoint-Received: by B4 Relay for david@ixit.cz/default with auth_id=355 X-Original-From: David Heidelberg Reply-To: david@ixit.cz From: David Heidelberg For all boards it's QCOM_ID_SDM845 except Dragonboard, where it's QCOM_ID_SDA845. Signed-off-by: David Heidelberg --- arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 +- arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts b/arch/arm64/boot/d= ts/qcom/sdm845-db845c.dts index b5c63fa0365d28fdc4a61dfe67ab6a184e748473..fa997a568f46ff54aa5ea60530c= 33f8bf6361ade 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-db845c.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-db845c.dts @@ -18,7 +18,7 @@ / { model =3D "Thundercomm Dragonboard 845c"; compatible =3D "thundercomm,db845c", "qcom,sdm845"; - qcom,msm-id =3D <341 0x20001>; + qcom,msm-id =3D ; qcom,board-id =3D <8 0>; =20 aliases { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts b/arch/a= rm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts index 4005e04d998a40d25a64d652a526bf93efc20332..474759ab61043005fcabadb5c06= 1bbd2eccb2447 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts @@ -11,7 +11,7 @@ / { model =3D "OnePlus 6"; compatible =3D "oneplus,enchilada", "qcom,sdm845"; chassis-type =3D "handset"; - qcom,msm-id =3D <0x141 0x20001>; + qcom,msm-id =3D ; qcom,board-id =3D <8 0 17819 22>; =20 battery: battery { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts b/arch/arm6= 4/boot/dts/qcom/sdm845-oneplus-fajita.dts index 9471ada0d6ad8bd44cc58a6efa07f7eb27921af9..a0affaa246fea5514a00b6c37ed= b30c6dceb2c59 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts @@ -11,7 +11,7 @@ / { model =3D "OnePlus 6T"; compatible =3D "oneplus,fajita", "qcom,sdm845"; chassis-type =3D "handset"; - qcom,msm-id =3D <0x141 0x20001>; + qcom,msm-id =3D ; qcom,board-id =3D <8 0 18801 41>; =20 battery: battery { diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64= /boot/dts/qcom/sdm845-shift-axolotl.dts index 2cf7b5e1243caca6a6a0b0beebf52d5f354fe56f..f1dcf69238d6682130238e775ca= 13e317f53052b 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts @@ -17,7 +17,7 @@ / { model =3D "SHIFT SHIFT6mq"; compatible =3D "shift,axolotl", "qcom,sdm845"; - qcom,msm-id =3D <321 0x20001>; + qcom,msm-id =3D ; qcom,board-id =3D <11 0>; =20 aliases { diff --git a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi b/arch/a= rm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi index a3a304e1ac8737ea2330bfe0ba92008e9fbba6af..8f1526fffd2a2ec10f880053cdf= 3d613b92ab4d9 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-sony-xperia-tama.dtsi @@ -12,7 +12,7 @@ #include "pmi8998.dtsi" =20 / { - qcom,msm-id =3D <321 0x20001>; /* SDM845 v2.1 */ + qcom,msm-id =3D ; /* SDM845 v2.1 */ qcom,board-id =3D <8 0>; =20 aliases { diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi b= /arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi index 7810b0ce7591ecc29e62116a859dcc6b93185b0c..3e1cea965c83d6757e586e36c46= 9d1cf4a603304 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-beryllium-common.dtsi @@ -32,7 +32,7 @@ / { =20 /* required for bootloader to select correct board */ qcom,board-id =3D <69 0>; - qcom,msm-id =3D <321 0x20001>; + qcom,msm-id =3D ; =20 aliases { serial1 =3D &uart6; diff --git a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts b/arch/arm6= 4/boot/dts/qcom/sdm845-xiaomi-polaris.dts index 63cf879a7a297e161c57ba5256d52c9d6cfe9767..ebbd550130137504db75c9337f2= 867b462cfe888 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts @@ -38,7 +38,7 @@ / { chassis-type =3D "handset"; =20 /* required for bootloader to select correct board */ - qcom,msm-id =3D <0x141 0x20001>; + qcom,msm-id =3D ; qcom,board-id =3D <0x2a 0x0>; =20 aliases { --=20 2.50.1 From nobody Sun Oct 5 16:21:04 2025 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 DF43C25A2BF; Thu, 31 Jul 2025 21:02:45 +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=1753995766; cv=none; b=q/Y6TfeWLAH+oCJhoyL7VElWv0KkP1UMn4iZ3P65wsSEe94OsasVqxr65NESgNmvnX5waxd5qosJlpX+7iOUMM1x9ShIKJaX3xDewE4Iwm/rnVfsp0ZN3PEbm5MM1NK1uMyBh/j91SeUVeGQuooaTZ81UHWI51jqEk2QF3pSjKI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753995766; c=relaxed/simple; bh=hj9hWNAP1TrLYfyYzpKkJ6R8bTlE27E/f3rPu9CInWU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NwKmpzyQx35H1AuVr0ImpltmO+KEq32BxPmd/tEOgDUh9ouAWFJbAFxRuHUT43wDmxqdijJEQo1PFDYhOUP2Z70K9uM1dYz9RbXfw2aNVwCxsaxZbFCjdUKeNRN1w4krzNZmE6FTdSpaent12kNIM53NLbko5VGDQZdCBXqjt/w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LCPhpJSj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="LCPhpJSj" Received: by smtp.kernel.org (Postfix) with ESMTPS id 70174C4CEFA; Thu, 31 Jul 2025 21:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1753995765; bh=hj9hWNAP1TrLYfyYzpKkJ6R8bTlE27E/f3rPu9CInWU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=LCPhpJSjpB7qzegQ51ZkBneMDqTQ/bAlDF0ib6xAVlLWyY5mbj4TLQcUwtySNy33W duC81rGScGSFzmNA99bWn0/etnuyHdZRKHqOXOLGDTuBLB4uA5cp9q1kHyZxja//A+ ZxFDLndZajKqyKbMdgIrPZjCyOGisdyvKR6OSP3nkRJJ/yPEoaboxEykwnM4Z0010z SBE25/NIPzR9gupU9Uas3UEc8/jH4VoVZRjmIfFQJ5TSzQiwVnarx93fUkJzz/CLVz yLuWbaKDYNEAvcBfdrP4imXsOmPmEijdYhf325V7oG13pZyZfq64rt3auBjR648YHF vm6P16mbsHNpQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61418C87FD3; Thu, 31 Jul 2025 21:02:45 +0000 (UTC) From: David Heidelberg via B4 Relay Date: Thu, 31 Jul 2025 23:02:44 +0200 Subject: [PATCH 2/2] arm64: dts: qcom: sdm845-oneplus: Deduplicate shared entries Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250731-sdm845-msmid-v1-2-98489ece786e@ixit.cz> References: <20250731-sdm845-msmid-v1-0-98489ece786e@ixit.cz> In-Reply-To: <20250731-sdm845-msmid-v1-0-98489ece786e@ixit.cz> To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, David Heidelberg X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2034; i=david@ixit.cz; h=from:subject:message-id; bh=NRxsP8lcA3q9aPxidLKbwvCT8KoWYD5PD4bDKiX1k74=; b=owEBbQKS/ZANAwAIAWACP8TTSSByAcsmYgBoi9nzluXWVab2ZF96AXlNNtZs5b0Jhd2wXvKAd 9MWu505peqJAjMEAAEIAB0WIQTXegnP7twrvVOnBHRgAj/E00kgcgUCaIvZ8wAKCRBgAj/E00kg coPdD/sEWR/Cbr7jiVyx9KDyE1/WOlKTyNv5c9dPixgDitOIbcmdjJuoxREsBRIfqqihzFvg2lW jXoZx3x86ZTM+PMrJiHJ+xA0u1WPiQ4urat2JBnUS9QpRHpnF6b48Ir63S3ux+aF/iFQiVjMCA7 +lgVux3KjxJdH1JvgUEU/J2zQNYj6UjUf66axJ5hLsVuJznxseZYHgOWRLYldhAD1TGFvWUCaSV A/cQ/ehiliUmHpzQYM9wNCnl2IYe9T1FByKD6vdFhksDhagtkarlh6c3N2s9iolhWfPsEf8wa5G Ej9umspUjNQu4unWec1Hq0EwY4g0qPDcjsV/9qdAR9F6asDF7GP3KxNXFA9Lgdc2fcLE95d4cUj hhDWGjyQ9ztVJZAAL0Q6+JxIizJcBPNhQHuZfEM1SdPOibMW4i58SgrXPBa8vTP4LGorEksG04n vZGcgNmryeMO+Kgt6T7Rzo3K0L6pPjMHB4oXtW1CScnGy7GIcJiUFPJvqHgIPMtCQPtlNhgB4JQ dfutXZthry8mzHc8HO5fpwcwhCq8XpBeUnaKTCrdllbz62uG9Z7BAf67Teq+mbQKvsNUz52wvgv Ww4MpXZGQjP/KvovXJNtKFnzek0mUm2oRZkFvR0F69K4h36fz2iif9n0UBiQE04CfoKWoyx6cTl TPL3QTK1Y/QdDrg== X-Developer-Key: i=david@ixit.cz; a=openpgp; fpr=D77A09CFEEDC2BBD53A7047460023FC4D3492072 X-Endpoint-Received: by B4 Relay for david@ixit.cz/default with auth_id=355 X-Original-From: David Heidelberg Reply-To: david@ixit.cz From: David Heidelberg Both phones share same values, put them into common dtsi. Signed-off-by: David Heidelberg --- arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 3 +++ arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 -- arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi b/arch/arm= 64/boot/dts/qcom/sdm845-oneplus-common.dtsi index b118d666e535a433f44b66c71b36e55df2ce5c80..da0052ab99e1d7ffb8ef0173b1c= 97d11b459b212 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi @@ -21,6 +21,9 @@ /delete-node/ &rmtfs_mem; =20 / { + chassis-type =3D "handset"; + qcom,msm-id =3D ; + aliases { serial0 =3D &uart9; serial1 =3D &uart6; diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts b/arch/a= rm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts index 474759ab61043005fcabadb5c061bbd2eccb2447..cd5546b69d13d8d7f29373aebab= 1cfda79666900 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts @@ -10,8 +10,6 @@ / { model =3D "OnePlus 6"; compatible =3D "oneplus,enchilada", "qcom,sdm845"; - chassis-type =3D "handset"; - qcom,msm-id =3D ; qcom,board-id =3D <8 0 17819 22>; =20 battery: battery { diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts b/arch/arm6= 4/boot/dts/qcom/sdm845-oneplus-fajita.dts index a0affaa246fea5514a00b6c37edb30c6dceb2c59..b4212626b42954e10974ec087db= 2b42b07979f72 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts @@ -10,8 +10,6 @@ / { model =3D "OnePlus 6T"; compatible =3D "oneplus,fajita", "qcom,sdm845"; - chassis-type =3D "handset"; - qcom,msm-id =3D ; qcom,board-id =3D <8 0 18801 41>; =20 battery: battery { --=20 2.50.1