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: 14013285 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 6F817243951 for ; Wed, 12 Mar 2025 10:44:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741776249; cv=none; b=JdwAr8MUNEj2tcvpFl+OHbV3d4fJNp1ivewZApaNe0OOa5lVBsJXyeqHharlfk8/5qWf2M9cF4E9mkQcPS15OB+qawxnJszmE2BFFidhLHM6++RpN+4L4OdC20LTL2rFD0wrEKl7qvcvmK6RLU4pBuD9NM60XmLZOWnPFxz9Lsg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741776249; c=relaxed/simple; bh=DLOFKyixrKjuNk5xbPr6+WZVuEvD4zxgmFK1T42/rQ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LMAICxyBUQX1/028uqczM47Dc3ysmZ4P3OHlrD0YYpuQwEyJY/YT0wNiXWkk7NIXyP/B19MvqxKUPx9TmQ0fTSUWRZhcR1fpVaX3Af4cFODyx4/jJDt/2o7qa7aCl+4HIebBZhrNIsHO3jp1sOFW0ueRPyEXnWXyFXltugMn5nA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=fKcOjMHz; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="fKcOjMHz" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2ff64550991so10045494a91.0 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=vger.kernel.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=fKcOjMHzh5460KSR8xnOFBqDFi+7vSkhBVTb4KRCzG0WLmHDrRy0kxkrp4D0aa3CWY u3y17L9/TN9UYnnBlOBq2XoQa2jX1JF+TdrDQtxwR/7cjpID3leroe8InlRCKlSbU6y4 1RiGAImqn41F7LWjx32+gnZb4lyBdMuOCa4gY= 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=wu3EbkxfWo8VnIBd65f4GbB+S8fhzWvEF2J8MWp3TmGhBRjWERnjqks1HkF4MrEJ4C I3fTMV6OcfMm1IJcTTeHyEtddfRKKWZiKJLLZu9Nf9hEyRnyTuVAc4W+7fr2WyzRT24d 8IQssOFMORkj2P7Vjt5UkQiBQ4O+3cva5LMGHAIMQviL4rg57Pq+WMyTf3QcnaIXZI6V T2pTkfLcH9To5r/W8Kfdf9qBHdV42NrlbZBvL4PXDU7WC9jIwKQ4n0jpCTZCj++SP6P9 ZUoHhnFG9f9bsly7R1tLACZovzdIIG8jZY3N6UG+RERhk/YQM6v/qhbc9v+IiRKm/OWq e5cQ== X-Forwarded-Encrypted: i=1; AJvYcCW9R6mcYj1WkjF0u/+OZMFDZup+TJYC/LsXo0ZF7Sr6zr5ua9wE4itVSDKgH8g/vro35ZPhdQ74dEhbsA==@vger.kernel.org X-Gm-Message-State: AOJu0YyGGsOQ1fpecbLC2OoSm3itxw0SGmot8EuBIlArw6d75BUH4ZSo tC7Wd56KzDTmlvdiMQ6Ctmf/5+lbFZf4BlN5L6q9v/jfD/Css577X2pG2IbUMg== X-Gm-Gg: ASbGncsUFPw2xEhum9IelEBLTQuu0MJkn0zEv/kUTAjLTcxH1DhgItYDsn/NOVTTBWY LMzWiVA3zkPs2CVWDLkEZswSbZKqOa8Itji5u3XGxCfb+3pmlNe0VWWj7xh20k/u60H6hadp7FN 8T0gXNJFuXTaBbflPoGxYGfMQ9piy1/lY5bjatnjQXpOWyQbl9ThuVoBFtHky+dZJMYPs69gvSz 9dsUeOHFxQGCYM7dhhlNObYPxqmYXy1yIkhn4f5Z7dxwKungTg9C7bzAt0pdJnyev/yMYYkmmrt UAPAzeHvRghA3wR1HCmSki8HOTHekwQeAVnpFGhhJj8uO3kKUJamvDU8qJ209rA= 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> Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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 {