From patchwork Fri Dec 20 08:55:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 13916361 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B79F11B6CE5 for ; Fri, 20 Dec 2024 08:55:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734684906; cv=none; b=aCPkPmovp4ih7maA0qxr4capaQEQ6WtktXQMOh17z1qdTcvwS/nqwzlTOHPLfjEJ+MvgVyhGcaVYj9F9oqPXTVD2dwkeYyRg+4xpPz7E9nKN44DEaz+jqkkdaJx+54yWmJTHZA45O1kaJOCdYBZUDkfNlbEjMVavkCB1TiT4b8w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734684906; c=relaxed/simple; bh=RBDW6pIiESDvWThJlMdAfXLNct165Bn4CNYmU057wrA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=kAp/DzC7D1oluMlJBRthF3HT8GYXHzjfKfvOyFCWZBA7+pOYycGOUpgH9iKPS2HdwVVfybzGSC0UUfo4cijFfcFSxGNhPwNSe4V1SJqWFM0/HEchOKHs87EWAkHAUYgZ4zGB+wY/l6jxhg7wm+t88K5O3uEFZN+lU8HWetCrOLg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com; spf=pass smtp.mailfrom=fairphone.com; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b=DLtSAN0o; arc=none smtp.client-ip=209.85.128.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=fairphone.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=fairphone.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=fairphone.com header.i=@fairphone.com header.b="DLtSAN0o" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-436341f575fso17473375e9.1 for ; Fri, 20 Dec 2024 00:55:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1734684902; x=1735289702; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=x4bX0y1U2uj3LXkaRKY3Bj+bT7kkfpgx6oJ7MVuwDAg=; b=DLtSAN0oFwmLXoI+MeSlyJCDC0zBvYGMKrqqOaUvAF9bItzelRb2Bc4OcNw4F3HsQW caoHIMWEz5UMjjM+18T7JYuuQpMJ1dN8VEmnkCV8N3roHRXGGsSJIbcdGq7uJ49TI1En ohAim1KGFhKDmuolyLA3MVXiUsXocmLo/2QCR+Sj43BcpaXFC7OZTUtIgwIsE8jEk3G1 DKJCeHQIFGfjSpNkosWQcLGgm1OtH7Qtpcnczw5i0o3IE9qgm1aZC/tD4p6G443Ng9k4 dTYhnJ2fcBxVL9hzNfRv7VDIQvahL0GkHOTQ1aKZYELLyfHSyQS8BWwLhMmxS9gcwciD aMzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734684902; x=1735289702; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x4bX0y1U2uj3LXkaRKY3Bj+bT7kkfpgx6oJ7MVuwDAg=; b=FtPZgFwe5qR72OjtlQyB1ys13SFWMKuSUTAzofimBDneIcixvW8BgRedC9TQWiRaxZ 8KuF9Wh4r8tncAH/aMfxP7qEHBP4tIlfaqzfqPN9L2TTx39QgKsxpzrNo8Dpz3ayuXdi IHE3fP5hzv/pqIkfN76pSW4ve3Ud2gAln1VOVOXMKi1By7PK8lq2kR1CSTji9BWyLdqk zWytk900fUis0ZCJrrc2Pf+a4i3byNEkgE7ST+2VhJncs6n9Ag9w2yH7mjw1u49EwXo8 Hed3RghoWV3yd/uM9d5KfY+dhtiQioHtLIc4eARYcjLMkaMGcNb+71jRShkhtSvcW1GN wanA== X-Forwarded-Encrypted: i=1; AJvYcCW3gs0qUz6jniykPw6f7qaAthg+L8NCJBrYWQlJOS9iG+XMGJJatfJ/EWBr1eF494nIxRGzSGX7Zvtj6J8F@vger.kernel.org X-Gm-Message-State: AOJu0YyA0vTU7E1p0fZgo2V+fv+7E4zyA0IS+WIBiVEXgzvDKpP1qxkT LXuCC0saKhCdXUC8Ln4AVBnXtKcDHA1F+STzPrYWxFGIUrBJmeR4MdNVGr704bI= X-Gm-Gg: ASbGncvm4v9p1nW7Br+yhzhF+YcMehjt0PaKJASvdJPoTFdquDt3cKpodMtpgEl4jU+ 4M+idZU2TGrsi5Kwpgp/lRIPWHV+P92WoCK/El7vkKHcW5DRjgAZKn3TZ+/EVSVD8+ikkLSZPQg 9NVh417LcULW+IAGLpH37W81x2yjqeJTczWKW7yGZuyM6YUerwvo5tAP9m+H9+/fqKl9PFkZg/r pdsDeNy0Q2f1ZN5PQh0Lrw65Br/zMfa31vJbihqTbVBd5/imkMbdTD+Uu39b33rRPqcsNMxN/oJ B26gqdrGSMjBfKAXs9+ZU4TfRGD8BQ== X-Google-Smtp-Source: AGHT+IEYiNsrQEZYY/R6oX1gs6boqSiZAfgrH8ynuQCvryGC8V4E5T2j2oWTo6VitrE0P5xEju9nDA== X-Received: by 2002:a05:600c:450b:b0:434:f586:7520 with SMTP id 5b1f17b1804b1-4366835c3a3mr14506175e9.6.1734684901944; Fri, 20 Dec 2024 00:55:01 -0800 (PST) Received: from [100.64.0.4] (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43661200abesm39815225e9.18.2024.12.20.00.55.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Dec 2024 00:55:01 -0800 (PST) From: Luca Weiss Date: Fri, 20 Dec 2024 09:55:01 +0100 Subject: [PATCH] arm64: dts: qcom: sm7225-fairphone-fp4: Drop extra qcom,msm-id value Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241220-fp4-msm-id-v1-1-2b75af02032a@fairphone.com> X-B4-Tracking: v=1; b=H4sIAOQwZWcC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIxNDIyMD3bQCE93c4lygsG6yublpmpmFmYFJUpoSUENBUWpaZgXYsOjY2lo AyFQXelwAAAA= X-Change-ID: 20241220-fp4-msm-id-c775f68604bf To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Luca Weiss Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.14.2 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 --- 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(-) --- base-commit: 8155b4ef3466f0e289e8fcc9e6e62f3f4dceeac2 change-id: 20241220-fp4-msm-id-c775f68604bf Best regards, 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 {