From nobody Thu Apr 9 00:19:30 2026 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 C1E76FA3744 for ; Mon, 31 Oct 2022 10:20:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230405AbiJaKUb (ORCPT ); Mon, 31 Oct 2022 06:20:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230343AbiJaKUX (ORCPT ); Mon, 31 Oct 2022 06:20:23 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F044DDF2C for ; Mon, 31 Oct 2022 03:20:22 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id b5so10298398pgb.6 for ; Mon, 31 Oct 2022 03:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quanta-corp-partner-google-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rN5pIXYHIPWnZBzWC0xE3jiOY/tjCziNvlEjCF/QMuE=; b=FEhtQ4lt1vwQd7b29HOAdNLE/xqfiMzxBVTYUImdOnQf+8s/8nBmGslxBwpRge5CxS 4218BwLx4XmTeeBUwyLuHd1MmpWyuaXdeZ5uUS+GJkqgaOt35IarjplHYWcTyA6PYpaY UyOTwiWIPw2YtZIU8wvnRnjconjNusS5Ree8gTDTShmBa8zvCnpRn5vl+an/41L2dhNz jOGDsV+SyvlAeAFwgQCvsWHhy8QquoyrnYQGJjncSxD47kK19gIrPmumyB0EqrdkMNa0 AepqANRNCl5Kt+OTwE0qU2yIJUwwFdEIZdzAVK+UMGEKfDNb8d7ovXLgv57C4/qobWW5 1kag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rN5pIXYHIPWnZBzWC0xE3jiOY/tjCziNvlEjCF/QMuE=; b=H10nQFsQdBL9PAERX2KL7fFH2OaRfYN+tbw6hIXnuFdXjbmAGg5GCEB+L4i4W4K6oh U23UrC+FGsS+ISEfqN9Sy4rKpYgzD+Htsl2hDV0pcq5jU282EEDnGMbdvKBDwhp+gif1 s0LZngJBHVZy1v5Khcx6sqf1VgPSaa6T9Ye1WIqbtAdoBdJKw1dl7E2Kl0HpX4ZMZExQ hijmRhq4NbLJpfpW3vh4Ru+ZKaSAo0pdp5ueBZsVIEyswgvDXrn1dfFZopO30420VDmk Sf7BnJOMJbqPvp8ELQnWklVBvhPkFdz8KPurUHT5CLq1zC5IqLWOxzxylphlZn9u5lSg FXYw== X-Gm-Message-State: ACrzQf0l+jQ7qHtZ+rfA3PYCcea4NQC311tySpixLK0ShvA/e87TzEgY DaNS6lvEkAZiiStwl/SpI9ahsgUW3HYmtw== X-Google-Smtp-Source: AMsMyM6VJK3H8BWfRIIaUk380Srg6bIt31RIvUZ/XS7aYMbCHMLUHeL8rxZgco9gW0VGWAcwBLOByA== X-Received: by 2002:a63:6b09:0:b0:453:b1f8:bb3b with SMTP id g9-20020a636b09000000b00453b1f8bb3bmr12434312pgc.36.1667211622187; Mon, 31 Oct 2022 03:20:22 -0700 (PDT) Received: from liang-Predator-PH517-52.. (60-250-232-247.hinet-ip.hinet.net. [60.250.232.247]) by smtp.gmail.com with ESMTPSA id k12-20020a170902c40c00b00186881e1feasm4136551plk.112.2022.10.31.03.20.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 03:20:21 -0700 (PDT) From: Sheng-Liang Pan To: LKML Cc: dianders@chromium.org, Sheng-Liang Pan , Andy Gross , Bjorn Andersson , Konrad Dybcio , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org Subject: [PATCH v9 2/4] arm64: dts: qcom: sc7280: Add LTE SKU for sc7280-evoker family Date: Mon, 31 Oct 2022 18:20:09 +0800 Message-Id: <20221031181735.v9.2.If03e9e85e63ece4b1599db841c90ed785c47a4be@changeid> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221031102011.136945-1-sheng-liang.pan@quanta.corp-partner.google.com> References: <20221031102011.136945-1-sheng-liang.pan@quanta.corp-partner.google.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" evoker have wifi/lte sku, add different dts for each sku. Signed-off-by: Sheng-Liang Pan Reviewed-by: Douglas Anderson --- Changes in v8: - updated patch subjects Changes in v5: - recover whitespace change Changes in v4: - recover change for trackpad and touchscreen arch/arm64/boot/dts/qcom/Makefile | 3 ++- .../boot/dts/qcom/sc7280-herobrine-evoker-lte.dts | 14 ++++++++++++++ .../boot/dts/qcom/sc7280-herobrine-evoker.dts | 15 +++++++++++++++ ...evoker-r0.dts =3D> sc7280-herobrine-evoker.dtsi} | 7 ------- 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts rename arch/arm64/boot/dts/qcom/{sc7280-herobrine-evoker-r0.dts =3D> sc728= 0-herobrine-evoker.dtsi} (98%) diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/M= akefile index b0558d3389e5a..6f234995284b2 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -106,7 +106,8 @@ dtb-$(CONFIG_ARCH_QCOM) +=3D sc7180-trogdor-wormdingler= -rev1-boe-rt5682s.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7180-trogdor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7180-trogdor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-evoker-r0.dtb +dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-evoker.dtb +dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-evoker-lte.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-herobrine-r1.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-villager-r0.dtb dtb-$(CONFIG_ARCH_QCOM) +=3D sc7280-herobrine-villager-r1.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts b/arc= h/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts new file mode 100644 index 0000000000000..3af9224a7492e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-lte.dts @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Evoker board device tree source + * + * Copyright 2022 Google LLC. + */ + +#include "sc7280-herobrine-evoker.dts" +#include "sc7280-herobrine-lte-sku.dtsi" + +/ { + model =3D "Google Evoker with LTE"; + compatible =3D "google,evoker-sku512", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts b/arch/ar= m64/boot/dts/qcom/sc7280-herobrine-evoker.dts new file mode 100644 index 0000000000000..dcdd4eecfe670 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dts @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Evoker board device tree source + * + * Copyright 2022 Google LLC. + */ + +/dts-v1/; + +#include "sc7280-herobrine-evoker.dtsi" + +/ { + model =3D "Google Evoker"; + compatible =3D "google,evoker", "qcom,sc7280"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts b/arch= /arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi similarity index 98% rename from arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts rename to arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi index 739e81bd6d689..a6015491c6082 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-herobrine-evoker.dtsi @@ -5,15 +5,8 @@ * Copyright 2022 Google LLC. */ =20 -/dts-v1/; - #include "sc7280-herobrine.dtsi" =20 -/ { - model =3D "Google Evoker"; - compatible =3D "google,evoker", "qcom,sc7280"; -}; - /* * ADDITIONS TO FIXED REGULATORS DEFINED IN PARENT DEVICE TREE FILES * --=20 2.34.1