github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 10:33:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: mediatek: mt8186: Merge Voltorb device trees

Browse Source 
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.

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Link: https://lore.kernel.org/r/20250617082004.1653492-6-wenst@chromium.org
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
This commit is contained in:
Chen-Yu Tsai 2025-06-17 16:20:02 +08:00 committed by AngeloGioacchino Del Regno
parent 8609434f64
commit 57ac6f86ee
No known key found for this signature in database
GPG Key ID: 9A3604CFAD978478
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/boot/dts/mediatek/Makefile
View File

@ -76,8 +76,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

13
arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589824.dts
View File

@ -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";
};

5
arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts → arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dts
View File

@ -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 {