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 <luca.weiss@fairphone.com>
---
Completely dropping these values also appears to work when using
boot.img header version 2, but doing this change now would mean any
tooling in the wild for packaging up the boot.img using header v0 would
stop producing working without adjusting that mkbootimg invocation.
---
 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 2ee2561b57b1d6c7b0f40c93de62df47faaf95ca..52b16a4fdc43212e1ca1986361b01f47d36445d0 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 {

---
base-commit: 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2
change-id: 20241220-fp4-msm-id-c775f68604bf

Best regards,
-- 
Luca Weiss <luca.weiss@fairphone.com>

On Fri, 20 Dec 2024 09:55:01 +0100, Luca Weiss wrote:
> The ID 434 is for SM6350 while 459 is for SM7225. Fairphone 4 is only
> SM7225, so drop the unused 434 entry.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sm7225-fairphone-fp4: Drop extra qcom,msm-id value
      commit: 7fb88e0d4dc1a40a29d49b603faa1484334c60f3

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>

On 20.12.2024 9:55 AM, Luca Weiss wrote:
> 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 <luca.weiss@fairphone.com>
> ---
> Completely dropping these values also appears to work when using
> boot.img header version 2, but doing this change now would mean any
> tooling in the wild for packaging up the boot.img using header v0 would
> stop producing working without adjusting that mkbootimg invocation.
> ---

It would be nice if you could start shifting that tooling to bootimgv2
slowly, and when it trickles down to appropriate places, switch it up
upstream as well. Of course if that works for you.

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

On Fri Dec 20, 2024 at 10:36 AM CET, Konrad Dybcio wrote:
> On 20.12.2024 9:55 AM, Luca Weiss wrote:
> > 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 <luca.weiss@fairphone.com>
> > ---
> > Completely dropping these values also appears to work when using
> > boot.img header version 2, but doing this change now would mean any
> > tooling in the wild for packaging up the boot.img using header v0 would
> > stop producing working without adjusting that mkbootimg invocation.
> > ---
>
> It would be nice if you could start shifting that tooling to bootimgv2
> slowly, and when it trickles down to appropriate places, switch it up
> upstream as well. Of course if that works for you.

In postmarketOS for sure it's simple to switch, I know Mobian also has
something for FP4, but apart from that I'm not sure if there's more
build scripts floating around somewhere.

>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>
> Konrad