From patchwork Sun May 29 20:26:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 577073 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FC28C4321E for ; Sun, 29 May 2022 20:26:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231805AbiE2U0o (ORCPT ); Sun, 29 May 2022 16:26:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231660AbiE2U0l (ORCPT ); Sun, 29 May 2022 16:26:41 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38873120B9 for ; Sun, 29 May 2022 13:26:37 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id d26so6601776wrb.13 for ; Sun, 29 May 2022 13:26:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=v/cDy7Pc+AVHD+wNR+Rz+yhCWOLUKaEFS/4CfLicCP4=; b=iskVBz4DTZHQfdCbQ7H+rb7G/9jmwow4Z8+4mbuQMJSNDmMHSZFRNeY1YY/HaKRBlr 9JlMbP00a9IwjjQsGrIIMpZTGCYPb0ArLMKZCqw9tClelK9/rr/aUpHwZpdyp5v73MvJ CTtyR3wV/LJ6Os7xBF7Hyg3nOvbtdJK7fjvFYY5013yw4gBidTydCvx2dhXWTll2OuD5 3dcadk1UOTkN4J+oc3pIY2f+pwSCwvYJBFmv/8ttPcLWM2XmF0Tkp9AJXLk754KVxdtO tyMJUeUvOMENu0lqacf/T3JWxdtuOOly5XZ4stOn6G3wGkrOkTO+lqpfIEZMwrUIAmC/ TDmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=v/cDy7Pc+AVHD+wNR+Rz+yhCWOLUKaEFS/4CfLicCP4=; b=Idj9CkJD2VsknmOp6V7Bi3kU4yJOVynqcFfgPLlfgx0eDad4Foo7mRruTlXoIxbug1 +El24VrVAf6WlLrTYU8TtjXM6AROjTCZMLsx7TBJ2YCCfRcuwQTgsdmkHk2JrmF+BPts Ikom5WV8pfRlDXQ6e8LiAYqb9ifwoMYYCNvfGVDBit1PM4Ga915I/aqvwL3FxJBF6Srl GpvB44gzzR4d6fUvCNjuHl8roA3BEkG3cJKEZgznatEDF55+aOoMSYykOY2YA6Z+l07R 1krujFtuyQarepTY2fy2GGjIHOKUx+yeb+2xDRKBz/e5UgfgZdBIa3qxRq+MoYAZFaO/ yHqg== X-Gm-Message-State: AOAM531t3UdzVb1/A5RSJRhubFovMHLxXqGxSxsbXbOcJDnZ/3po3Gug IKRVC38h6rNCobk7eiSd17j24w== X-Google-Smtp-Source: ABdhPJwlGxyui4QRiySaO4KGMAJsjcDp5zrZaBqX6mWcpTm2rgKxK86sbUWZEz1jYAw5laQNvkcUoA== X-Received: by 2002:adf:f789:0:b0:210:3534:636c with SMTP id q9-20020adff789000000b002103534636cmr1056358wrp.273.1653855995473; Sun, 29 May 2022 13:26:35 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id y4-20020a5d6144000000b0020c5253d8f7sm7099310wrt.67.2022.05.29.13.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 13:26:34 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephen Boyd , Konrad Dybcio , Amit Pundir , Trilok Soni , Rob Clark , Stephan Gerhold , Krzysztof Kozlowski , Kumar Gala Subject: [PATCH 1/4] dt-bindings: arm: qcom: document qcom,msm-id and qcom,board-id Date: Sun, 29 May 2022 22:26:26 +0200 Message-Id: <20220529202629.47588-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> References: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The top level qcom,msm-id and qcom,board-id properties are utilized by bootloaders on Qualcomm MSM platforms to determine which device tree should be used and passed to the kernel. The commit b32e592d3c28 ("devicetree: bindings: Document qcom board compatible format") from 2015 was a consensus during discussion about upstreaming qcom,msm-id and qcom,board-id fields. There are however still problems with that consensus: 1. It was reached 7 years ago but it turned out its implementation did not reach all possible products. 2. Initially additional tool (dtbTool) was needed for parsing these fields to create a QCDT image consisting of multiple DTBs, later the bootloaders were improved and they use these qcom,msm-id and qcom,board-id properties directly. 3. Extracting relevant information from the board compatible requires this additional tool (dtbTool), which makes the build process more complicated and not easily reproducible (DTBs are modified after the kernel build). 4. Some versions of Qualcomm bootloaders expect these properties even when booting with a single DTB. The community is stuck with these bootloaders thus they require properties in the DTBs. Since several upstreamed Qualcomm SoC-based boards require these properties to properly boot and the properties are reportedly used by bootloaders, document them. Link: https://lore.kernel.org/r/a3c932d1-a102-ce18-deea-18cbbd05ecab@linaro.org/ Co-developed-by: Kumar Gala Signed-off-by: Kumar Gala Signed-off-by: Krzysztof Kozlowski --- .../devicetree/bindings/arm/qcom.yaml | 58 +++++++++++++++++++ include/dt-bindings/arm/qcom,ids.h | 30 ++++++++++ 2 files changed, 88 insertions(+) create mode 100644 include/dt-bindings/arm/qcom,ids.h diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index 6c38c1387afd..b7fa85c1e478 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -403,6 +403,64 @@ properties: - qcom,sm8450-qrd - const: qcom,sm8450 + # Board compatibles go above + + qcom,msm-id: + $ref: /schemas/types.yaml#/definitions/uint32-matrix + minItems: 1 + maxItems: 8 + items: + items: + - description: | + MSM chipset ID - an exact match value consisting of three bitfields:: + - bits 0-15 - The unique MSM chipset ID + - bits 16-31 - Reserved; should be 0 + - description: | + Hardware revision ID - a chipset specific 32-bit ID representing + the version of the chipset. It is best a match value - the + bootloader will look for the closest possible match. + description: + The MSM chipset and hardware revision use by Qualcomm bootloaders. It + can optionally be an array of these to indicate multiple hardware that + use the same device tree. It is expected that the bootloader will use + this information at boot-up to decide which device tree to use when given + multiple device trees, some of which may not be compatible with the + actual hardware. It is the bootloader's responsibility to pass the + correct device tree to the kernel. + This is a legacy property - it is not expected on newer boards (starting + with SM8350). + + qcom,board-id: + $ref: /schemas/types.yaml#/definitions/uint32-matrix + minItems: 1 + maxItems: 8 + items: + items: + - description: | + Board ID consisting of three bitfields:: + - bits 31-24 - Unusued + - bits 23-16 - Platform Version Major + - bits 15-8 - Platform Version Minor + - bits 7-0 - Platform Type + Platform Type field is an exact match value. The + Platform Major/Minor field is a best match. The bootloader will + look for the closest possible match. + - description: | + Subtype ID unique to a Platform Type/Chipset ID. For a given + Platform Type, there will typically only be a single board and the + subtype_id will be 0. However in some cases board variants may + need to be distinguished by different subtype_id values. + description: + The board type and revision information. It can optionally be an array + of these to indicate multiple boards that use the same device tree. It + is expected that the bootloader will use this information at boot-up to + decide which device tree to use when given multiple device trees, some of + which may not be compatible with the actual hardware. It is the + bootloader's responsibility to pass the correct device tree to the + kernel + This is a legacy property - it is not expected on newer boards (starting + with SM8350). + additionalProperties: true ... diff --git a/include/dt-bindings/arm/qcom,ids.h b/include/dt-bindings/arm/qcom,ids.h new file mode 100644 index 000000000000..eaf86c18650f --- /dev/null +++ b/include/dt-bindings/arm/qcom,ids.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (c) 2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Linaro Ltd + * Author: Krzysztof Kozlowski based on previous work of Kumar Gala. + */ +#ifndef _DT_BINDINGS_ARM_QCOM_IDS_H +#define _DT_BINDINGS_ARM_QCOM_IDS_H + +/* qcom,msm-id */ +#define QCOM_ID_APQ8026 199 +#define QCOM_ID_MSM8916 206 +#define QCOM_ID_MSM8994 207 +#define QCOM_ID_MSM8996_3_0 246 +#define QCOM_ID_APQ8016 247 +#define QCOM_ID_MSM8216 248 +#define QCOM_ID_MSM8116 249 +#define QCOM_ID_MSM8616 250 +#define QCOM_ID_MSM8998 292 +#define QCOM_ID_SDM845 321 + +/* qcom,board-id */ +#define QCOM_BOARD_ID(a, major, minor) \ + (((major & 0xff) << 16) | ((minor & 0xff) << 8) | QCOM_BOARD_ID_##a) + +#define QCOM_BOARD_ID_MTP 8 +#define QCOM_BOARD_ID_DRAGONBOARD 10 +#define QCOM_BOARD_ID_SBC 24 + +#endif /* _DT_BINDINGS_ARM_QCOM_IDS_H */ From patchwork Sun May 29 20:26:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 577311 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 549C5C43219 for ; Sun, 29 May 2022 20:26:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231566AbiE2U0n (ORCPT ); Sun, 29 May 2022 16:26:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48590 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231538AbiE2U0j (ORCPT ); Sun, 29 May 2022 16:26:39 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 325C32B1AE for ; Sun, 29 May 2022 13:26:38 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id h5so4118629wrb.0 for ; Sun, 29 May 2022 13:26:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hHi3QBFwCXmqlLHYHksg4ge5xGm0n6+LjU5yPR19Zx4=; b=e9oGoTSh0tWkfvRnuv+IHjFghKNM5oTGbVheNxmRU0HGipNoeBuFWUwTtdIEB0OBBd Khx4FylHBg/pPoBMOg4bEAGn/hle997JQ0y1RTA2Czs5QR/ZRejjcQZ7Dx7DsRuZLJ6G vdcEh4+ZsOPpdyluZ6nNm6dEBIWTQsGFGNTzWPqIYVSmeqXGLWe3A1s54xGfqdMmxI4Z CCtEHN/3xmBmSqHiKYpzn1wIbjMDM2IXv30TEOjZN1cNMxuLBnzL+GK2b9cjWO7xKC0H z+tLGmd5WvlYQ/fYoPF45V7nesUxbPhqL6PAkSsaFEndDoK3xGF15eqkiLt7vXqqg4gv bs9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hHi3QBFwCXmqlLHYHksg4ge5xGm0n6+LjU5yPR19Zx4=; b=RBQsQCaiOA1XFzO6s9XkrVdkXbtZQwL2zvcfnce9q6Myirgh75/7fRpRKE/JF8AYVQ 2kAyJHWYONWvlFRQSFTeTNCsogYyX+xsTjd3Ivyxk4wEojiJwFWwlbXKd3Antc/30VTt Ihghy+gA6ToVAxx7A8w6JLjbdwNC0oikQIAmn2PYl9Qr2sR0r6sq8XymwmmuvjqJlTZt PUzFfZzbytmimuH3b/Yd4UYlasmAO8VHTy/1v3FuxoJS2Yp5k408kFe+0bgkZI0Y6LNZ PBMV7LN8sr/J97ibNQ7qSIChloYR+S15j6VIO9hol+OE9K6x5avd+w4E3vaSKZZYTwtU WoLA== X-Gm-Message-State: AOAM531pY7Zd+MHvQvCj93xQ2ZMrBttWAofbYJ0EjDx7iBV+gHTxYLZ7 gNfVJsumo/7fRZKT8igRJLbMCg== X-Google-Smtp-Source: ABdhPJyTTgnF/wU13PPKvTRh4pV1B09BRx4hG9kjESJxmKNCdUqSxaDErvlUIOARkVsQ4Qb1D6GJGA== X-Received: by 2002:adf:e712:0:b0:210:3db:fdbd with SMTP id c18-20020adfe712000000b0021003dbfdbdmr17066207wrm.625.1653855996751; Sun, 29 May 2022 13:26:36 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id y4-20020a5d6144000000b0020c5253d8f7sm7099310wrt.67.2022.05.29.13.26.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 13:26:36 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephen Boyd , Konrad Dybcio , Amit Pundir , Trilok Soni , Rob Clark , Stephan Gerhold , Krzysztof Kozlowski Subject: [PATCH 2/4] arm64: dts: qcom: msm8992-xiaomi-libra: split qcom, msm-id into tuples Date: Sun, 29 May 2022 22:26:27 +0200 Message-Id: <20220529202629.47588-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> References: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The qcom,msm-id is an uint32 matrix, so a list of tuples. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts index 7748b745a5df..15467b697e94 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts @@ -17,7 +17,7 @@ / { chassis-type = "handset"; /* required for bootloader to select correct board */ - qcom,msm-id = <251 0 252 0>; + qcom,msm-id = <251 0>, <252 0>; qcom,pmic-id = <65545 65546 0 0>; qcom,board-id = <12 0>; From patchwork Sun May 29 20:26:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 577310 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45AE1C433FE for ; Sun, 29 May 2022 20:26:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231693AbiE2U0p (ORCPT ); Sun, 29 May 2022 16:26:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231690AbiE2U0l (ORCPT ); Sun, 29 May 2022 16:26:41 -0400 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A2ADE3BBD8 for ; Sun, 29 May 2022 13:26:39 -0700 (PDT) Received: by mail-wm1-x32d.google.com with SMTP id n124-20020a1c2782000000b003972dfca96cso5426787wmn.4 for ; Sun, 29 May 2022 13:26:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7BSd+gf/ck0W1eHbOBBMckcPV2+14YCFy97u8V9nibQ=; b=r+uKBFxx100oKdFlHUazH37v/u76hZIcb0FSQYlogP+tc89e+JNsYgqwxqR77Zadam eRhTUGZXceN0Shp8zKvV5mSRS68HADRm+VQ24tASGmZ/ErKNSWxXX5AIJPU2sCzciod7 H/WyTzdjX5mMeLJv/zFN/0HUZyFjnN1CNz5UuFSgffNZq20T84ZTIjRklSxZbYMRvBMN UnJgJBLnopF48TxJwv+dEU/4fEZaF+qKnYaLCwM0p6o0uqyCIyCCpZbvQTk0OQYIGGiM Jntvsc4suVF7mh5Icbhp4SSRSMXwGbYH/7UaCeykdUGSaTksez74exhaNjnaGxRw4xoK 1Bvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7BSd+gf/ck0W1eHbOBBMckcPV2+14YCFy97u8V9nibQ=; b=jMMIsStjUQwewhLz6PTnlr9RujDssDuR4SU2Fd1/2rWkaG52ht6tdcrVmXcSSRPupk PXYGxQ8pIbNjFAvxT+AilfAZVVE51NHsx/silC7ru5PWdr7JfG9SL7S2Lbi8VHGIl/Ri n+0Ld5vsAVZ/KtHdJChjvTxhE/zwhAKDLv1jnXGjAg4KNDWRjah4yUyn5JJKQuQelbOL MxvsSdOSwAamn0UGWbMalFB0bmXoHe2K+NABMV/taISjBvu59m8g1+5iMJ5NYZdXbh3k 4QUN10UxCfTH8wczffBQDCy/ZUg2qR3fVrMObHGyJEnvblPXXknwQnp4asYb385IfRRB zNlg== X-Gm-Message-State: AOAM53141yv5qSLYrHRRoEOxPSuBH6Ek62p2XmYtbPfFQ37Z1pOucyu5 mW0Zh7+LZjYILDBzNs5sNoScug== X-Google-Smtp-Source: ABdhPJyesDDD/9OKesZcNDxQ5eAvtq1e4HWl/uDzDpbXjkvyhyIw77G9rq75UYadBVk5htYtuwtdzQ== X-Received: by 2002:a05:600c:1e1c:b0:397:3c4b:b188 with SMTP id ay28-20020a05600c1e1c00b003973c4bb188mr16403234wmb.64.1653855998079; Sun, 29 May 2022 13:26:38 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id y4-20020a5d6144000000b0020c5253d8f7sm7099310wrt.67.2022.05.29.13.26.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 13:26:37 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephen Boyd , Konrad Dybcio , Amit Pundir , Trilok Soni , Rob Clark , Stephan Gerhold , Krzysztof Kozlowski Subject: [PATCH 3/4] arm64: dts: qcom: msm8998-oneplus: split qcom,board-id into tuples Date: Sun, 29 May 2022 22:26:28 +0200 Message-Id: <20220529202629.47588-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> References: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The qcom,board-id is an uint32 matrix, so a list of tuples. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 2 +- arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts index 9563eb62db88..0a6d3e4ac48f 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-cheeseburger.dts @@ -13,7 +13,7 @@ / { compatible = "oneplus,cheeseburger", "qcom,msm8998"; chassis-type = "handset"; /* Required for bootloader to select correct board */ - qcom,board-id = <8 0 16859 23>; + qcom,board-id = <8 0>, <16859 23>; /* Capacitive keypad button backlight */ leds { diff --git a/arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dts b/arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dts index 5d0dabbaee4e..60718c06e17e 100644 --- a/arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dts +++ b/arch/arm64/boot/dts/qcom/msm8998-oneplus-dumpling.dts @@ -12,7 +12,7 @@ / { compatible = "oneplus,dumpling", "qcom,msm8998"; chassis-type = "handset"; /* Required for bootloader to select correct board */ - qcom,board-id = <8 0 17801 43>; + qcom,board-id = <8 0>, <17801 43>; }; /* Update the screen height values from 1920 to 2160 on the 5T */ From patchwork Sun May 29 20:26:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 577072 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ECC71C433EF for ; Sun, 29 May 2022 20:26:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbiE2U0r (ORCPT ); Sun, 29 May 2022 16:26:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231807AbiE2U0p (ORCPT ); Sun, 29 May 2022 16:26:45 -0400 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DD8B3F883 for ; Sun, 29 May 2022 13:26:41 -0700 (PDT) Received: by mail-wm1-x335.google.com with SMTP id f23-20020a7bcc17000000b003972dda143eso7368102wmh.3 for ; Sun, 29 May 2022 13:26:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x1VSkjEDoSpkJmFZJsis1oTlMiXSxH1AlXy0e1tfDgU=; b=cyOupqai6zlxeCdpJnX9PfK2L7NgvJMXBc9oFaIUetO5M4DRoLmN4Ooar8+qCX0LLs rwQUKa+LFuSyPZyfF1dm24lbepxl28MwyYn+hPYPvyaGxVSRhAbhUA40e6qo3cslX5Wa 2wtIcKapb2JWDktnJ+9Yk5JUvUAGok+s0ZKxUh9Sbm1EcDRts4d4ZsfCGf74D6FO6joO nHIYLh95XcZ3C6BbNdVhSD4zrCqhu9ikmaINsdBrdwAQ0Kf2VSgxCqPvyiKXAM2SmsR4 pk/fQIRAqcPJDoz9JIUBkjC1t4avQZFJonc76ZgBZBH3P0Np93/nUt2hQmfPZFGHNAor 9VYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x1VSkjEDoSpkJmFZJsis1oTlMiXSxH1AlXy0e1tfDgU=; b=dHCbu1JO3Fk1W5zXSuwS8kZ71U0RxJnFu0bILFaUGy/3ZxrFgJQA6IZDCix7Xb0x0k BO04IXaXfV7eDp0XcvUy1bYhTFUwKzKCVu+aRVIUqeaSct40W0dXInRtNNP6xEXwRY61 aixxdEjQyqQVVLdjRmTlQlbef/884xmiwbjFv3MP+dN7l4xE25m5DYiD2htqFQF1yd+t jzndxV92YaLx6dz2kX4JJtfHnx7UZ1JSPHBfjRUMGFCoHb3qIULAJ5qIDSSY3IRkhyd7 as1vdq/eabVVHEAqo9BuJ3Gyd9HJTewqD+ynSBUUvlzLdf+T8RPJiivWQcckxBEXmAVi DM0A== X-Gm-Message-State: AOAM532IFYIlefqm4DsmOYqduSv/ZLGjXI1eNwAYzyX3cFIbgP3AHYmJ dOuRbmMz+PsU1nk3ZS7AfBqSPg== X-Google-Smtp-Source: ABdhPJzJ0v9KLMvk6yNUhrEn/RGwGPqc9mHEXz2Bkz2+Izl5Aa4aPYOUy1/X/fXFb9FNpSSXvooCaA== X-Received: by 2002:a05:600c:3ba4:b0:397:49b8:262 with SMTP id n36-20020a05600c3ba400b0039749b80262mr16585365wms.77.1653855999975; Sun, 29 May 2022 13:26:39 -0700 (PDT) Received: from localhost.localdomain (xdsl-188-155-176-92.adslplus.ch. [188.155.176.92]) by smtp.gmail.com with ESMTPSA id y4-20020a5d6144000000b0020c5253d8f7sm7099310wrt.67.2022.05.29.13.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 May 2022 13:26:39 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stephen Boyd , Konrad Dybcio , Amit Pundir , Trilok Soni , Rob Clark , Stephan Gerhold , Krzysztof Kozlowski Subject: [PATCH 4/4] arm64: dts: qcom: sdm845-oneplus: split qcom,board-id into tuples Date: Sun, 29 May 2022 22:26:29 +0200 Message-Id: <20220529202629.47588-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> References: <20220529202629.47588-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The qcom,board-id is an uint32 matrix, so a list of tuples. Signed-off-by: Krzysztof Kozlowski --- arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts | 2 +- arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts index bf2cf92e8976..8897a2f4cfe3 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-enchilada.dts @@ -12,7 +12,7 @@ / { compatible = "oneplus,enchilada", "qcom,sdm845"; chassis-type = "handset"; qcom,msm-id = <0x141 0x20001>; - qcom,board-id = <8 0 17819 22>; + qcom,board-id = <8 0>, <17819 22>; battery: battery { compatible = "simple-battery"; diff --git a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts index 1b6b5bf368df..193cbd27b8b4 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts +++ b/arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts @@ -12,7 +12,7 @@ / { compatible = "oneplus,fajita", "qcom,sdm845"; chassis-type = "handset"; qcom,msm-id = <0x141 0x20001>; - qcom,board-id = <8 0 18801 41>; + qcom,board-id = <8 0>, <18801 41>; battery: battery { compatible = "simple-battery";