From patchwork Wed Mar 12 10:43:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen-Yu Tsai X-Patchwork-Id: 14013338 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C0D3FC28B2F for ; Wed, 12 Mar 2025 11:06:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=iBHq9V8lKreFqK9KM1t5HhbZfxxdkE8xQHpVyP8b1xQ=; b=w6j0Ha6UfrEvlWBJKiTBv8kblt smVl2kXdZ6UwSoxqnM76gv+49XvpeS/CbvmKswgHAdIxQ2xjVr9hqXAkLeSXU2MnQyFebA0uvVJ85 FfBr3jZVCkSfa6n4NQOtLgGrg68mSsxDOXVHsC/D3fITJXaw3B3yPxdh74xgpz9oj1aLu0GS1c5SU zIvRtxqrJ7XyuVwG0pGgHrpXmwMdexlaTWDtnE/1pDwVhSzJfF5FXQxOLnhDIY+OSf8rYrj0z1LYt KHnWxay6SbrkzeSAjztGW2Q1kdtBR1mwdgbke/HYtcvzrF14pmKlWtCk73u0EUopRvcJdVeKJKJES p0QFmc4Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tsJur-00000008Cz4-165L; Wed, 12 Mar 2025 11:06:25 +0000 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tsJZI-000000088kd-0QnA for linux-mediatek@lists.infradead.org; Wed, 12 Mar 2025 10:44:09 +0000 Received: by mail-pj1-x1032.google.com with SMTP id 98e67ed59e1d1-2f9d3d0f55dso10032303a91.1 for ; Wed, 12 Mar 2025 03:44:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1741776247; x=1742381047; darn=lists.infradead.org; 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=iBHq9V8lKreFqK9KM1t5HhbZfxxdkE8xQHpVyP8b1xQ=; b=G+5wv9ko0ZExgKUyzKmIuLjTzYQRjEhJZr/spYMXJcmL23nWH25EnFoqHy2efVo7nO 6rDny5vHydxHWXB4qKAlyv+FV0kpMwXfM3xs8pOCygrFGnVgOqffhkE6GowRKY0OwQYS N33qyNkStRfAsLjaY9OHQCy3lxFtTpGyLDyvw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741776247; x=1742381047; 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=iBHq9V8lKreFqK9KM1t5HhbZfxxdkE8xQHpVyP8b1xQ=; b=SRlx0rTA5oroWGxU08ked9iVqj1B3LvKy20mHG+fbs4e6mFanu1cd1ds7T+Rt843qM 7yJJHZsQ2yFCaCRYrYnOnCyggGy6GHs9rIqiSPYLdH7TpgCfEa3J96AUBrkbn/TfI0Sp 7HYdKPEwedsQVcEvw5rdJqaWo/rDuT2Kq7aG3hNGFcU/RqtCITEhf0ispZJEQGQlSnHa vtCY6boV5s/nwmBTOeDdwSaF2RpyD786Kbnnuaps27L0rKgRNCNoeislKneu+pWyZwwj KkcEoTsAGYZoVZIErWmWNfOISxFJ4qRoEmUQyc6dKz/D9VcaSIxt7tRHJOoq8+gQpIzJ umOA== X-Forwarded-Encrypted: i=1; AJvYcCX01OM2hc77+jv4US5J1OnItpxL7fmffBYoHxAgu2iE/xUPO/GD0Lqav/ClLK5aRABMYnCIwxZ1gkwLhwfY3g==@lists.infradead.org X-Gm-Message-State: AOJu0YzvshgsXc/mOV+1BNbmEKwdzPd4I8LvXPfAlq4wybnj0A8k4+va 4ZM5e2FtTxoB6+d26+EshI9xmlPQULrM/Nw6Ky+F92uj/BQVvCp8x5b5h8lRv1BDCrzGKY9Pjz0 = X-Gm-Gg: ASbGncud4S3/1b6Ap3VluGtLkp9N2birLuTTcDSTKRFINoVUhKkFyE8NqfZmKc3XN7r JkWkrXp6Gqfxq0Sb7Y6oZ2vZXCBWw8xDbMDmtgds1IF1uRRsBOzRPUlEqvm4dLZpGaoZsl1W/I2 BRSQRoT7kLqP3zPUNn4v+qLn0iw0yk+2MadKl5ihQ+0soiEalPoK4sHGltYGKKEr1yZiX7zCVmN h4zxsYrZYZpbkg6CGolfvci+B9QQLVPiGJ1WtKiU03SJCwCDB14vlLL0cIsLCJ9S30YtoAHqWAD AHEQ6ycHREINPu4zmia6oSmKPcPZBVO2rILlh9YK6SGq5hUFoLKzfyiaHhiT63U= X-Google-Smtp-Source: AGHT+IHgEKYXDVQ8fG2MojJ+3+NZnnUhzA79ZMbcKKeZymlj+PamoGqt91exqHl5LDqK7OCjTlvNwA== X-Received: by 2002:a17:90b:350d:b0:2ee:c04a:4276 with SMTP id 98e67ed59e1d1-2ff7ce7276dmr28891107a91.5.1741776247611; Wed, 12 Mar 2025 03:44:07 -0700 (PDT) Received: from wenstp920.tpe.corp.google.com ([2401:fa00:1:10:b5ed:b71c:fb14:a696]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3011926599csm1405675a91.35.2025.03.12.03.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Mar 2025 03:44:07 -0700 (PDT) From: Chen-Yu Tsai To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Benson Leung , Tzung-Bi Shih , Dmitry Torokhov Cc: Chen-Yu Tsai , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, chrome-platform@lists.linux.dev, linux-input@vger.kernel.org, Douglas Anderson Subject: [PATCH 5/8] arm64: dts: mediatek: mt8186: Merge Voltorb device trees Date: Wed, 12 Mar 2025 18:43:39 +0800 Message-ID: <20250312104344.3084425-6-wenst@chromium.org> X-Mailer: git-send-email 2.49.0.rc0.332.g42c0ae87b1-goog In-Reply-To: <20250312104344.3084425-1-wenst@chromium.org> References: <20250312104344.3084425-1-wenst@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250312_034408_143866_AECDDB9F X-CRM114-Status: GOOD ( 14.16 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org There are only two different SKUs of Voltorb, and the only difference between them is whether a touchscreen is present or not. This can be detected by a simple I2C transfer to the address, instead of having separate device trees. Merge the two device trees together and simplify the compatible string list. The dtsi is still kept separate since there is an incoming device that shares the same design, but with slightly difference components. Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/mediatek/Makefile | 3 +-- .../mediatek/mt8186-corsola-voltorb-sku589824.dts | 13 ------------- ...orb-sku589825.dts => mt8186-corsola-voltorb.dts} | 5 ++--- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589824.dts rename arch/arm64/boot/dts/mediatek/{mt8186-corsola-voltorb-sku589825.dts => mt8186-corsola-voltorb.dts} (76%) diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/mediatek/Makefile index 58484e830063..ff67931e7821 100644 --- a/arch/arm64/boot/dts/mediatek/Makefile +++ b/arch/arm64/boot/dts/mediatek/Makefile @@ -73,8 +73,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacool-sku327681.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacool-sku327683.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacruel-sku262144.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-tentacruel-sku262148.dtb -dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-voltorb-sku589824.dtb -dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-voltorb-sku589825.dtb +dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-corsola-voltorb.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8186-evb.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-evb.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt8188-geralt-ciri-sku0.dtb diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589824.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589824.dts deleted file mode 100644 index d16834eec87a..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589824.dts +++ /dev/null @@ -1,13 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2022 Google LLC - */ - -/dts-v1/; -#include "mt8186-corsola-voltorb.dtsi" - -/ { - model = "Google Voltorb sku589824 board"; - compatible = "google,voltorb-sku589824", "google,voltorb", - "mediatek,mt8186"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dts similarity index 76% rename from arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts rename to arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dts index 45e57f7706cc..cc805408a8b7 100644 --- a/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts +++ b/arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dts @@ -7,9 +7,8 @@ #include "mt8186-corsola-voltorb.dtsi" / { - model = "Google Voltorb sku589825 board"; - compatible = "google,voltorb-sku589825", "google,voltorb", - "mediatek,mt8186"; + model = "Google Voltorb board"; + compatible = "google,voltorb", "mediatek,mt8186"; }; &i2c1 {