From nobody Fri Dec 19 13:23:13 2025 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (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 05E53259C80 for ; Mon, 8 Dec 2025 07:33:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765179211; cv=none; b=aA5kK68C4/9quYistT7T/ocuPLxV+u4aQGZ2BG1iAipFUHGzCD0D0/Ds80oylVM1xv9tsENvvdbVy22TT+DHdw7LUxTcxyUBwJBKZcWbQdUG1IWF6d8f+pvhBSztgX/Sc41RIYzOf0h60rq+N5zdaVWhXOgDj1jV4VfPB5VfIPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765179211; c=relaxed/simple; bh=dgsL85HtQH4N6Gkpd2wP0Y9dRnpZAZRObKliYeGH4gs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QUIsrCi+hH4hhbW5qy/nQS7+8JSttbcZHkZ1UZu2UA1cqL9bmJAvZKtAo9gGtvjIKGx465qZ49v8gM2lHge33wWZ4+EUAiXNCyWeTeHrc3AbrLdEz+Y7hBlrm8WjXz4w0VmYO1Jh5fSrN8uU/PeAS2TojlToKQAY1TMuPMnfaqM= 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=IcSMIFxc; arc=none smtp.client-ip=209.85.210.179 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="IcSMIFxc" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7b7828bf7bcso4782698b3a.2 for ; Sun, 07 Dec 2025 23:33:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1765179208; x=1765784008; 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=yk1cUWmBl5XhhK+g/p4690RHmYDgOIsh6ZzYZ8NiuW0=; b=IcSMIFxcjXai0vLoCRETN4HmASuU8xizh/JG6tp3wXd4FbvjmIJn9vGwEb3ia9u+Bt jbO/DKobVdzNAg2NUuQaXaKCyuXz94WSfKd9jvjwAsu2FCjdl/8bMiuKGtxIx2QdBkrY sOz/nhZdYlFtbW1E+q6V7L84ILhWSdlSNcTWI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765179208; x=1765784008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=yk1cUWmBl5XhhK+g/p4690RHmYDgOIsh6ZzYZ8NiuW0=; b=dJ5vCz7UghMmpQV4rpYlEhPj9D7vutRHLQRodZvAdKL2GCoNEsGt+EtTW6LFz0YedX CYoW6cwBJt3vF3+RS6z3nTPhec6JV5CtkR9IsswVbuN0YWMmYlKjQXGAO8Lo/tq25zFo FZws7pu3T/bGdecXw3aQFHi7wgNf6Iw1ppcV2yde/vatudhMZLRC8SgnTHRJHrqIPA2Z AcUCW3pm9iEUSLbzfqvESASsiwkvj5m68nDoDS5hee+RpP3WxRZZtbtGsAeQfj9PTXw5 m4m8sOBzS01juPTyux0wP8egEKP757iRa4LcRZuZn2DaXCFfgCH5jgdnI/4D+S/LqQkW GGxQ== X-Forwarded-Encrypted: i=1; AJvYcCUiZNCYT1jeEl6/dLtLKC0fHLMSZAfNfMT2Puc7Zg0s1qFB+eSlRtFcv6hBzuQlardZu2F2Tu7J9qSniTE=@vger.kernel.org X-Gm-Message-State: AOJu0YyMCgxYs8LgMvKzS+2Yg9xxSxR+VD+RNtDksw81JCodQYIHOZI2 z1t+xJ+fMJJFwU9jL/JdeKH9Uqeh9ShcG2jNXFfIFFIh1v7zj52eRudvg8PIcyx7Wg== X-Gm-Gg: ASbGncvl2vUcdMrxrmboiD+BzMUIeR1O0xQnnwRBqaGrXt1jfuPyge1hSp2ASOJcCWJ 4dF5x93k5zFItHUGp3ihiqHWUve3+ycsPZqb8wTCDQzrmV8wA0za2Wl+GBytoA458HwcfMVGlpd 3QZwOXdxJOq4fH/e1pde53QK2siJCKz2zi9OgaShImvZbuk7xFTZuHmdAtDXmTi/gZyVjJPymXo XsFZTgzjtjTF9eTBefR3ibsP1mZp9MZdxLSrqlPN3UsxjymM/tbW5bTB3+02H/J4crrIgc/CHBa I3Ejmje69qMgvCRvZ3pcGPSLvCpbWP5wIcSKOQ/U1IkvICuEwr+5wEuzGSjyZ3j1rXsYmo5N4ZR UjtNHPmiV7ezB0cRWe/9870IX9bSm9SoeNxvYOP4+HK3tYrl6JN6v12MSYnOxRhA635pFbYvV5Y lFN7Xj6SJbVWcSp3B4jTVg+Iy6SPj5zFTpPGuf2UK0YlY3SXnCFzZFvLuCKvncPp5yuY8Y X-Google-Smtp-Source: AGHT+IH03+VWpfw72JOyBUA2/6zHYSF0GZ6M4iF47ZhbShTJYVZdsObM/Okmg4+ncXpzCQ/1sI3Tkw== X-Received: by 2002:a05:6a00:a8e:b0:7b7:8aad:99cc with SMTP id d2e1a72fcca58-7e8c0ad15ecmr6144301b3a.3.1765179208186; Sun, 07 Dec 2025 23:33:28 -0800 (PST) Received: from wenstp920.tpe.corp.google.com ([2a00:79e0:201d:8:d31e:c84f:5cc1:d554]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7e29ff6b56esm12127686b3a.20.2025.12.07.23.33.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Dec 2025 23:33:27 -0800 (PST) From: Chen-Yu Tsai To: Matthias Brugger , AngeloGioacchino Del Regno , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Chen-Yu Tsai , linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 3/3] [EXAMPLE] arm64: dts: mediatek: ciri: Drop SKU-specific overlays Date: Mon, 8 Dec 2025 15:33:04 +0800 Message-ID: <20251208073306.75279-4-wenst@chromium.org> X-Mailer: git-send-email 2.52.0.223.gf5cc29aaa4-goog In-Reply-To: <20251208073306.75279-1-wenst@chromium.org> References: <20251208073306.75279-1-wenst@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The final SKU-specific overlays only set the top level board compatible and model, but add nothing else. The specifics are not super important to the kernel, and could be removed so we don't have to have so many source files. However, the ChromeOS bootloader (coreboot / depthcharge) selects the device tree blob to load basd on the compatible string, so the mapping from a SKU-specific compatible to a DTB (or a series of DTB/DTBOs) needs to be maintained somewhere to build the FIT image. Move the SKU-specific top level compatible strings to a separate file stored with the device tree sources, and drop the SKU specific files. Signed-off-by: Chen-Yu Tsai --- This is meant to serve as an example for dropping SKU-specific files that just have specific identifiers that the kernel doesn't care about, i.e. doesn't need to be present in the DTB itself, but need to be preserved for other purposes. --- arch/arm64/boot/dts/mediatek/Makefile | 24 +++------ .../dts/mediatek/mt8188-geralt-ciri-sku0.dtso | 11 ---- .../dts/mediatek/mt8188-geralt-ciri-sku1.dtso | 11 ---- .../dts/mediatek/mt8188-geralt-ciri-sku2.dtso | 11 ---- .../dts/mediatek/mt8188-geralt-ciri-sku3.dtso | 11 ---- .../dts/mediatek/mt8188-geralt-ciri-sku4.dtso | 11 ---- .../dts/mediatek/mt8188-geralt-ciri-sku5.dtso | 11 ---- .../dts/mediatek/mt8188-geralt-ciri-sku6.dtso | 11 ---- .../dts/mediatek/mt8188-geralt-ciri-sku7.dtso | 11 ---- arch/arm64/boot/dts/mediatek/mt8188.yaml | 51 +++++++++++++++++++ 10 files changed, 59 insertions(+), 104 deletions(-) delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dt= so delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dt= so delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dt= so delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dt= so delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dt= so delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dt= so delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dt= so delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dt= so create mode 100644 arch/arm64/boot/dts/mediatek/mt8188.yaml diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/me= diatek/Makefile index 39a844386366..5123d15c62c1 100644 --- a/arch/arm64/boot/dts/mediatek/Makefile +++ b/arch/arm64/boot/dts/mediatek/Makefile @@ -89,36 +89,28 @@ dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8188-evb.dtb =20 mt8188-geralt-ciri-sku0-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-boe.dtbo \ - mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo \ - mt8188-geralt-ciri-sku0.dtbo + mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo mt8188-geralt-ciri-sku1-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-ivo.dtbo \ - mt8188-geralt-ciri-audio-max98390-es8326.dtbo \ - mt8188-geralt-ciri-sku1.dtbo + mt8188-geralt-ciri-audio-max98390-es8326.dtbo mt8188-geralt-ciri-sku2-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-boe.dtbo \ - mt8188-geralt-ciri-audio-max98390-es8326.dtbo \ - mt8188-geralt-ciri-sku2.dtbo + mt8188-geralt-ciri-audio-max98390-es8326.dtbo mt8188-geralt-ciri-sku3-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-ivo.dtbo \ - mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo \ - mt8188-geralt-ciri-sku3.dtbo + mt8188-geralt-ciri-audio-max98390-rt5682s.dtbo mt8188-geralt-ciri-sku4-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-boe.dtbo \ - mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo \ - mt8188-geralt-ciri-sku4.dtbo + mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo mt8188-geralt-ciri-sku5-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-ivo.dtbo \ - mt8188-geralt-ciri-audio-tas2563-es8326.dtbo \ - mt8188-geralt-ciri-sku5.dtbo + mt8188-geralt-ciri-audio-tas2563-es8326.dtbo mt8188-geralt-ciri-sku6-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-boe.dtbo \ - mt8188-geralt-ciri-audio-tas2563-es8326.dtbo \ - mt8188-geralt-ciri-sku6.dtbo + mt8188-geralt-ciri-audio-tas2563-es8326.dtbo mt8188-geralt-ciri-sku7-dtbs :=3D mt8188-geralt-ciri.dtb \ mt8188-geralt-ciri-panel-ivo.dtbo \ - mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo \ - mt8188-geralt-ciri-sku7.dtbo + mt8188-geralt-ciri-audio-tas2563-rt5682s.dtbo =20 dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8188-geralt-ciri-sku0.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8188-geralt-ciri-sku1.dtb diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso deleted file mode 100644 index 884a7b2d943c..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2023 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku0 board"; - compatible =3D "google,ciri-sku0", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso deleted file mode 100644 index d3ed6ea535d7..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2023 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku1 board"; - compatible =3D "google,ciri-sku1", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso deleted file mode 100644 index 3f9d38bc2ad2..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku2 board"; - compatible =3D "google,ciri-sku2", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso deleted file mode 100644 index e6a6f8f06141..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku3 board"; - compatible =3D "google,ciri-sku3", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso deleted file mode 100644 index ee5b28c4ef00..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku4 board (rev4)"; - compatible =3D "google,ciri-sku4", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso deleted file mode 100644 index ccf8d2f0eb70..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku5 board (rev4)"; - compatible =3D "google,ciri-sku5", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso deleted file mode 100644 index 773c702b59d8..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku6 board (rev4)"; - compatible =3D "google,ciri-sku6", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso b/ar= ch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso deleted file mode 100644 index c22860eab9f8..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -/plugin/; - -&{/} { - model =3D "Google Ciri sku7 board (rev4)"; - compatible =3D "google,ciri-sku7", "google,ciri", "mediatek,mt8188"; -}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188.yaml b/arch/arm64/boot/dts= /mediatek/mt8188.yaml new file mode 100644 index 000000000000..7808ae20060f --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188.yaml @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: (GPL-2.0 OR MIT) +%YAML 1.2 +--- +- dtb: mt8188-geralt-ciri-sku0.dtb + description: Google Ciri board SKU0 + compatibles: + - google,ciri-sku0 + - google,ciri + - mediatek,mt8188 +- dtb: mt8188-geralt-ciri-sku1.dtb + description: Google Ciri board SKU1 + compatibles: + - google,ciri-sku1 + - google,ciri + - mediatek,mt8188 +- dtb: mt8188-geralt-ciri-sku2.dtb + description: Google Ciri board SKU2 + compatibles: + - google,ciri-sku2 + - google,ciri + - mediatek,mt8188 +- dtb: mt8188-geralt-ciri-sku3.dtb + description: Google Ciri board SKU3 + compatibles: + - google,ciri-sku3 + - google,ciri + - mediatek,mt8188 +- dtb: mt8188-geralt-ciri-sku4.dtb + description: Google Ciri board SKU4 + compatibles: + - google,ciri-sku4 + - google,ciri + - mediatek,mt8188 +- dtb: mt8188-geralt-ciri-sku5.dtb + description: Google Ciri board SKU5 + compatibles: + - google,ciri-sku5 + - google,ciri + - mediatek,mt8188 +- dtb: mt8188-geralt-ciri-sku6.dtb + description: Google Ciri board SKU6 + compatibles: + - google,ciri-sku6 + - google,ciri + - mediatek,mt8188 +- dtb: mt8188-geralt-ciri-sku7.dtb + description: Google Ciri board SKU7 + compatibles: + - google,ciri-sku7 + - google,ciri + - mediatek,mt8188 --=20 2.52.0.223.gf5cc29aaa4-goog