From nobody Fri Dec 19 11:44:55 2025 Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) (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 F252B259C80 for ; Mon, 8 Dec 2025 07:33:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765179205; cv=none; b=IJ+KyThuzXWrm6awVQ/WWOt9VIyysVJv7vJN8i0UuCsSp2nLGWXcjCibzb29Vqwx+BYBHmvb4+K7FqWC10JDpB+bQPcyBNWv6oRIYe1C8bCe1TePtlGGNNSNEZy0IViYJHsU8Et+lQ4JSu4+DCM9UTdQaXT7757c3NiyqYpzcso= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765179205; c=relaxed/simple; bh=zaBVlGUKrSTynVz6thrUWTQuG6E2PWBzYqGUjsmTIZE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PMNRuE5kpGzOtOE70q3NbMvr3qLBIi7dWzIcH4XLpow3rkG/qEqn//IsADOX6tCjRE1lXQunmicgzpTd7Vf5rm08AM8QpI/Ya/yHSwM/DBwPJq15ic5QvVXT0Qw52NhOnnyGgdKV//woqU4ozg+JWpXwbAfoQtYkr0N8UatTV3Y= 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=XS8dBtCj; arc=none smtp.client-ip=209.85.210.170 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="XS8dBtCj" Received: by mail-pf1-f170.google.com with SMTP id d2e1a72fcca58-7ba92341f83so5652634b3a.0 for ; Sun, 07 Dec 2025 23:33:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1765179203; x=1765784003; 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=86b9GUNfdvttDCRCuxugZUht31CVbPRSKA3vMkwcp9w=; b=XS8dBtCjz+UizleYj8kVcOWc4A4ztmgUOz3U1jpJsV8/cFDBfdoz3D8EHMlvomWw/P bUwvGTfUxKR4W2AOP9JpBeVU1UXIodN397jwKfJBrInT5OUfa6uHpeANkbMUHEx1wu03 K+1GJuBcLbOZK9ihd6gohf8STwPJE2LSVxgM0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765179203; x=1765784003; 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=86b9GUNfdvttDCRCuxugZUht31CVbPRSKA3vMkwcp9w=; b=lgD99mZb4xiIn2O0rlrJbcNcvKwfJHsT1DYLLW+qOxpA4r8BBdm4AjHObHi1yq5DIX FtPjY5KGca3IVOFdS6eRNJFzGzrN+zJVMnYVJaehv4Vz1BzzABks6IjaQ+cTbGq0B2SD 1J+ww4Z48TNxSpGFabtOTuygmdFFrOCH98b79eDa1vSFnkqrcmY8VwyqwQZnkexN984M OsmRwjSYjuLuy9Qsw365garLtx7Dr63IW1eEcx7PyidAde/HxRJRRp2BrlenrPWxORaX jyC+ySKRHO4SjALG8K3P758z1Lf/oS1U0axAHr+7zt0rflkryzH3fx3INEPZ2IATFwfb i+dQ== X-Forwarded-Encrypted: i=1; AJvYcCXBkOPjbHuEltRaFrw+IvrCXhWEdaTJ7FcB29dJHEQMJgGzkQuEyHTj6k+e0+bcJ7pAZze3BaumN0sdvmg=@vger.kernel.org X-Gm-Message-State: AOJu0YxsMD1gHHcXeKj8v24AjQ5sqGxVsVCD0GmNh0+Wk4icPqUdc3nC o2MSjDrcnJUdqhPLx50GwNcrrqnaM07U7FcvC6ll3sEMm9T1AaRH3aaOd6ji5EjgWg== X-Gm-Gg: ASbGncvWTIMQW8QL1j1NwgTfNS20RMURwzzd/7uvtiA3GVl/kSigM+S6mkWKPDTenPO bKDfvkhdpnAwDXPDXXeCiCrwJv31cX8rSUNDW09RGXuw0kmD404FX/y9IYwOoB4iJpacdGXmyoN CPQ7jS91mlBWTWu8jhLuz7iLHa3FZa/VTy7BhiYxB5j9dvD5e7XFM7I3k68i8pGeRSN/9uU3qdC 1A9tpMk+sBqnRjjbTKet43AqrqgbiQG9JSI+sJCgG1lHR5L3215Ay/pC5psYnlqZID07G1gGwVI xJgKvOdZ4E6ivK8ZObpbHkLkKYlK3pbfUhAi+K+kQXDKu9LwEhcZ3a4QUYk7GOz0bLA4vJYMdQz sP5Rgl2YEnX/cA56Egw8CesACk2zBpUIp+4IjrZf8YNgZI8EJyt2bls80yDydzNJyA3dNQQkQQw 1lZlrsSZSVKEA/q9i8Ig7lgCJYBSoKcVb9nBZ0h7s0F0nbUldVaapGIQp0ByS0xQbe/f/M X-Google-Smtp-Source: AGHT+IG+bsvH7N1bapcW1PPpLCcGsoW9Tvo9GMseHgeyoI6qRL9+qatTD69qLryiAHY5E8s1TajC4g== X-Received: by 2002:a05:6a00:852:b0:7e8:450c:61aa with SMTP id d2e1a72fcca58-7e8c960087cmr4519854b3a.65.1765179203211; Sun, 07 Dec 2025 23:33:23 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Dec 2025 23:33:22 -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 1/3] dt-bindings: arm: mediatek: Add generic Ciri "base" board Date: Mon, 8 Dec 2025 15:33:02 +0800 Message-ID: <20251208073306.75279-2-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" To reorganize all the Ciri SKUs into device tree overlays, there needs to be a base device tree with its own compatible string. Add a new entry for the generic Ciri "base" with just the fallback generic "google,ciri" compatible string. Signed-off-by: Chen-Yu Tsai --- Documentation/devicetree/bindings/arm/mediatek.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/mediatek.yaml b/Document= ation/devicetree/bindings/arm/mediatek.yaml index 718d732174b9..9cff861c6e38 100644 --- a/Documentation/devicetree/bindings/arm/mediatek.yaml +++ b/Documentation/devicetree/bindings/arm/mediatek.yaml @@ -372,6 +372,10 @@ properties: - enum: - mediatek,mt8186-evb - const: mediatek,mt8186 + - description: Google Ciri (Lenovo Chromebook Duet (11", 9)) + items: + - const: google,ciri + - const: mediatek,mt8188 - description: Google Ciri (Lenovo Chromebook Duet (11", 9)) items: - enum: --=20 2.52.0.223.gf5cc29aaa4-goog From nobody Fri Dec 19 11:44:55 2025 Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) (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 A4AF2335BA for ; Mon, 8 Dec 2025 07:33:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765179209; cv=none; b=krgDYIxu9fSnNic54nFzD81NXMvPiwynbHbfpAVpELkCen9R8DyRbLSuVBt7BjOyWugdgF/Hg1MXmjp4r3/33IIVQyD/zb/NQXRF0N4wovugcgVHmOcz1nUsqw34ALNT+T1dQr5/RlLZpR9HS1ehXmoLcH8YVJFUqXRuLWMO7AI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765179209; c=relaxed/simple; bh=SK8qhgJDYE5gVQTI0M+uR0reKW7zD59w/6b5mzVTqIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Zqbgj5TK/kncyHVTr097fd5kXYNOx5DMnWy4I4Be878P9/n4W9eQaj50FGDnHyR82rJIBYRmrrX7noIpN7q2KYXGViVtBwHl3hCf8bFiJ0olY99dHUn75+7Fu4v3tjG10u5q8zzG0M6/cqioYCI/JI6ce5fkxIegWMDT8uH/soY= 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=PpCFZX1D; arc=none smtp.client-ip=209.85.210.181 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="PpCFZX1D" Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-7b86e0d9615so7230407b3a.0 for ; Sun, 07 Dec 2025 23:33:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1765179206; x=1765784006; 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=Eh8zbwl3BBYVc+9B6hMq3b7GWPBAajSCppyaHXoFIk4=; b=PpCFZX1D/4eS1gJjnWl6dADv9cGKKnKjm9gHdcFo8WsyJ0mjIWOQg6cUy/YQ5sP3VE 5EE/kjsVhQ2gAha8GUWIVrOAKWefQ0Z/uJAmBlzVpTxN3IuRq61pta+Mj2yCdA9NNd86 OBTGPf2+BzLELNYs5WCK3dUqvuNLuddK0T3AM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765179206; x=1765784006; 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=Eh8zbwl3BBYVc+9B6hMq3b7GWPBAajSCppyaHXoFIk4=; b=tOgX0umXmG295Ez5HYnYV8vzE4mNpmW8MRlxLiFYDOwHYCCCjzv6dmHxAn1T+5JCBE Z6klop0Xy5TtcGyDMV51e/PHxm1yeTFK3xSM9ERkP/X4GwRxXH8bQ8I6Bu3vcoQAkD03 JNGZTdsijmUP6875OMsSld1PmXxnI1GrWsY8Lry61FVXEn6fZIyo+MLh2CjUj1aWLLaQ OmyVjMUmvNuGpWymm4dIpDemsvK792CjGpXJtP55VH4cZLW1Y1U9TafxvlX/+TTpBXyK yhMnAn+CrKlbqN/xSa0/pOxOhXxJOyTWFV9lMHiwwWOU5uMoxS5qAWDuE/4514Xu8lNd WTPQ== X-Forwarded-Encrypted: i=1; AJvYcCXgCDgFvbn1hMuDsf446Qoi72NS7wODTkoOKThlwxGirCWl+7Lllqm17l7jiZTOLoztfS4NMwCHl+7Y6hE=@vger.kernel.org X-Gm-Message-State: AOJu0YyYG5od1JetDr4Skq41msRsEd5rgJofOzpm42nUztfgsNDv7rrz MMSp+gxVCzvp5dmvCAkZ3m2VIWkC0EBmuI4YVQ8rnJA/iNyzAHiUVlfvGsgioN0ZcQ== X-Gm-Gg: ASbGncvBJCIunL4mPzHbhhmDjfj9a9DN1uQabZapzHOdDblHrYhuAf/HthLyVObuFvJ S6TldkOC+GLiOeTwgAbtfwSMhHtcCOhEliiT3RdokwZchlP4FgAEAtTohpUVxmy9P6ZA4iYfCei x96B0mqA2o/bZmHmrf/Q9sYEEyKCa65TsqNA8m36R3UJoDuJ7H4jP0/uY+chXCEWmavem/tS62K DJKYuz1ttOu/tZN2UZqKvw2IisUNC1Qma7sg9MaO2nvzlNNdBq6M/9IFfKZs8w7kOdyXK1pHqEB pky+C3U9/RF76B8IJP7ht7vV/A81FpIDiyERlzfSpoI37TWL49OHCgnpVcUIdYlcFxEluGXh7ps nH/1UHX3er0jJxISw4LjW8d0Bsr/+7OSYH291/r/ZfkbnpNXEX61cvhSYctuKNWnX6wzmlp64WS Fi7S0KTDjd8mcjQsK6J+ExgO5l+Z16SPocmybvby2J0QnwD2zwEgyoLUSDOwcnAdVzYGLS X-Google-Smtp-Source: AGHT+IE+INKuhg3s+6b8+naNepG4jj8nvP01S3s32sLn7T7V4DzcQdK7nbVe2ipp2f5euqAiLmaZbQ== X-Received: by 2002:a05:6a00:a28:b0:7e8:4398:b354 with SMTP id d2e1a72fcca58-7e8c4a766bamr6669231b3a.39.1765179205747; Sun, 07 Dec 2025 23:33:25 -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.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Dec 2025 23:33:25 -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 2/3] arm64: dts: mt8188-ciri: Split into base and overlays based on components Date: Mon, 8 Dec 2025 15:33:03 +0800 Message-ID: <20251208073306.75279-3-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 MT8188-based Ciri device has 8 SKUs. These are derived from the combinations of 3 types of components (headphone codec, speaker codec, and display panel), each having 2 options. Decompose the existing dtsi / dts files into 6 overlays for each component option. The audio codec have combined audio routing and graph connections, cannot be easily separated into separate bits without adding even more glue overlays. The per-SKU dts files are also converted to overlays, though now they only contain the final board compatible and model name. Signed-off-by: Chen-Yu Tsai --- arch/arm64/boot/dts/mediatek/Makefile | 34 ++++++++ ...88-geralt-ciri-audio-max98390-es8326.dtso} | 40 ++++++--- ...88-geralt-ciri-audio-max98390-rt5682s.dtso | 81 +++++++++++++++++++ ...188-geralt-ciri-audio-tas2563-es8326.dtso} | 18 ++--- ...88-geralt-ciri-audio-tas2563-rt5682s.dtso} | 46 +++++------ .../mt8188-geralt-ciri-panel-boe.dtso | 10 +++ .../mt8188-geralt-ciri-panel-ivo.dtso | 10 +++ .../dts/mediatek/mt8188-geralt-ciri-sku0.dts | 32 -------- .../dts/mediatek/mt8188-geralt-ciri-sku0.dtso | 11 +++ .../dts/mediatek/mt8188-geralt-ciri-sku1.dtso | 11 +++ .../dts/mediatek/mt8188-geralt-ciri-sku2.dts | 59 -------------- .../dts/mediatek/mt8188-geralt-ciri-sku2.dtso | 11 +++ .../dts/mediatek/mt8188-geralt-ciri-sku3.dts | 32 -------- .../dts/mediatek/mt8188-geralt-ciri-sku3.dtso | 11 +++ .../dts/mediatek/mt8188-geralt-ciri-sku4.dts | 48 ----------- .../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.dts | 48 ----------- .../dts/mediatek/mt8188-geralt-ciri-sku7.dtso | 11 +++ ...eralt-ciri.dtsi =3D> mt8188-geralt-ciri.dts} | 54 ++----------- 21 files changed, 285 insertions(+), 315 deletions(-) rename arch/arm64/boot/dts/mediatek/{mt8188-geralt-ciri-sku1.dts =3D> mt81= 88-geralt-ciri-audio-max98390-es8326.dtso} (59%) create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-m= ax98390-rt5682s.dtso rename arch/arm64/boot/dts/mediatek/{mt8188-geralt-ciri-sku5.dts =3D> mt81= 88-geralt-ciri-audio-tas2563-es8326.dtso} (78%) rename arch/arm64/boot/dts/mediatek/{mt8188-geralt-ciri-sku6.dts =3D> mt81= 88-geralt-ciri-audio-tas2563-rt5682s.dtso} (52%) create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-b= oe.dtso create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-i= vo.dtso delete mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dt= so create 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.dts create 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.dts create 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.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dt= so create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dt= so create 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.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dt= so rename arch/arm64/boot/dts/mediatek/{mt8188-geralt-ciri.dtsi =3D> mt8188-g= eralt-ciri.dts} (81%) diff --git a/arch/arm64/boot/dts/mediatek/Makefile b/arch/arm64/boot/dts/me= diatek/Makefile index c5fd6191a925..39a844386366 100644 --- a/arch/arm64/boot/dts/mediatek/Makefile +++ b/arch/arm64/boot/dts/mediatek/Makefile @@ -86,6 +86,40 @@ dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8186-corsola-tentacru= el-sku262148.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8186-corsola-voltorb.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8186-evb.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8188-evb.dtb + +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-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-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-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-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-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-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-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 + dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8188-geralt-ciri-sku0.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8188-geralt-ciri-sku1.dtb dtb-$(CONFIG_ARCH_MEDIATEK) +=3D mt8188-geralt-ciri-sku2.dtb diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-max98390-es8326.dtso similarity index 59% rename from arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts rename to arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-max98390-es= 8326.dtso index ef5ea9d12b1d..b99bd4c78ec5 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dts +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-max98390-es8326= .dtso @@ -2,20 +2,14 @@ /* * Copyright 2023 Google LLC */ +#include +#include /dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku1 board"; - compatible =3D "google,ciri-sku1", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "ivo,t109nw41", "himax,hx83102"; -}; +/plugin/; =20 &i2c0 { - /delete-node/ audio-codec@1a; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 es8326: audio-codec@19 { compatible =3D "everest,es8326"; @@ -27,6 +21,23 @@ es8326: audio-codec@19 { everest,jack-pol =3D [0e]; everest,interrupt-clk =3D [00]; }; + + max98390_38: amplifier@38 { + compatible =3D "maxim,max98390"; + reg =3D <0x38>; + sound-name-prefix =3D "Front Right"; + reset-gpios =3D <&pio 118 GPIO_ACTIVE_LOW>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&speaker_en>; + #sound-dai-cells =3D <0>; + }; + + max98390_39: amplifier@39 { + compatible =3D "maxim,max98390"; + reg =3D <0x39>; + sound-name-prefix =3D "Front Left"; + #sound-dai-cells =3D <0>; + }; }; =20 &sound { @@ -45,6 +56,13 @@ &sound { "Left Spk", "Front Left BE_OUT", "Right Spk", "Front Right BE_OUT"; =20 + dai-link-1 { + codec { + sound-dai =3D <&max98390_38>, + <&max98390_39>; + }; + }; + dai-link-2 { codec { sound-dai =3D <&es8326>; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-max98390= -rt5682s.dtso b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-max98= 390-rt5682s.dtso new file mode 100644 index 000000000000..44dd82926280 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-max98390-rt5682= s.dtso @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright 2023 Google LLC + */ +#include +#include +/dts-v1/; +/plugin/; + +&i2c0 { + #address-cells =3D <1>; + #size-cells =3D <0>; + + rt5682s: audio-codec@1a { + compatible =3D "realtek,rt5682s"; + reg =3D <0x1a>; + interrupts-extended =3D <&pio 108 IRQ_TYPE_EDGE_BOTH>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&audio_codec_pins>; + #sound-dai-cells =3D <1>; + + AVDD-supply =3D <&mt6359_vio18_ldo_reg>; + DBVDD-supply =3D <&mt6359_vio18_ldo_reg>; + LDO1-IN-supply =3D <&mt6359_vio18_ldo_reg>; + MICVDD-supply =3D <&pp3300_s3>; + realtek,jd-src =3D <1>; + }; + + max98390_38: amplifier@38 { + compatible =3D "maxim,max98390"; + reg =3D <0x38>; + sound-name-prefix =3D "Front Right"; + reset-gpios =3D <&pio 118 GPIO_ACTIVE_LOW>; + pinctrl-names =3D "default"; + pinctrl-0 =3D <&speaker_en>; + #sound-dai-cells =3D <0>; + }; + + max98390_39: amplifier@39 { + compatible =3D "maxim,max98390"; + reg =3D <0x39>; + sound-name-prefix =3D "Front Left"; + #sound-dai-cells =3D <0>; + }; +}; + +&sound { + compatible =3D "mediatek,mt8188-rt5682s"; + model =3D "mt8188_m98390_5682"; + + audio-routing =3D + "ETDM1_OUT", "ETDM_SPK_PIN", + "ETDM2_OUT", "ETDM_HP_PIN", + "ETDM1_IN", "ETDM_SPK_PIN", + "ETDM2_IN", "ETDM_HP_PIN", + "ADDA Capture", "MTKAIF_PIN", + "Headphone Jack", "HPOL", + "Headphone Jack", "HPOR", + "IN1P", "Headset Mic", + "Left Spk", "Front Left BE_OUT", + "Right Spk", "Front Right BE_OUT"; + + dai-link-1 { + codec { + sound-dai =3D <&max98390_38>, + <&max98390_39>; + }; + }; + + dai-link-2 { + codec { + sound-dai =3D <&rt5682s 0>; + }; + }; + + dai-link-3 { + codec { + sound-dai =3D <&rt5682s 0>; + }; + }; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-tas2563-es8326.dtso similarity index 78% rename from arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts rename to arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-tas2563-es8= 326.dtso index bf87201ccf27..c64094c6c249 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dts +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-tas2563-es8326.= dtso @@ -2,22 +2,14 @@ /* * Copyright 2024 Google LLC */ +#include +#include /dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku5 board (rev4)"; - compatible =3D "google,ciri-sku5", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "ivo,t109nw41", "himax,hx83102"; -}; +/plugin/; =20 &i2c0 { - /delete-node/ audio-codec@1a; - /delete-node/ amplifier@38; - /delete-node/ amplifier@39; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 es8326: audio-codec@19 { compatible =3D "everest,es8326"; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-tas2563-rt5682s.dtso similarity index 52% rename from arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts rename to arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-tas2563-rt5= 682s.dtso index 17d7359dfb6a..b8e6220a449e 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dts +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-audio-tas2563-rt5682s= .dtso @@ -2,32 +2,28 @@ /* * Copyright 2024 Google LLC */ +#include +#include /dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku6 board (rev4)"; - compatible =3D "google,ciri-sku6", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "boe,nv110wum-l60", "himax,hx83102"; -}; +/plugin/; =20 &i2c0 { - /delete-node/ audio-codec@1a; - /delete-node/ amplifier@38; - /delete-node/ amplifier@39; + #address-cells =3D <1>; + #size-cells =3D <0>; =20 - es8326: audio-codec@19 { - compatible =3D "everest,es8326"; - reg =3D <0x19>; - interrupts-extended =3D <&pio 108 IRQ_TYPE_LEVEL_LOW>; + rt5682s: audio-codec@1a { + compatible =3D "realtek,rt5682s"; + reg =3D <0x1a>; + interrupts-extended =3D <&pio 108 IRQ_TYPE_EDGE_BOTH>; pinctrl-names =3D "default"; pinctrl-0 =3D <&audio_codec_pins>; - #sound-dai-cells =3D <0>; - everest,jack-pol =3D [0e]; - everest,interrupt-clk =3D [00]; + #sound-dai-cells =3D <1>; + + AVDD-supply =3D <&mt6359_vio18_ldo_reg>; + DBVDD-supply =3D <&mt6359_vio18_ldo_reg>; + LDO1-IN-supply =3D <&mt6359_vio18_ldo_reg>; + MICVDD-supply =3D <&pp3300_s3>; + realtek,jd-src =3D <1>; }; =20 tas2563: amplifier@4f { @@ -39,8 +35,8 @@ tas2563: amplifier@4f { }; =20 &sound { - compatible =3D "mediatek,mt8188-es8326"; - model =3D "mt8188_tas2563_8326"; + compatible =3D "mediatek,mt8188-rt5682s"; + model =3D "mt8188_tas2563_5682"; =20 audio-routing =3D "ETDM1_OUT", "ETDM_SPK_PIN", @@ -50,7 +46,7 @@ &sound { "ADDA Capture", "MTKAIF_PIN", "Headphone Jack", "HPOL", "Headphone Jack", "HPOR", - "MIC1", "Headset Mic"; + "IN1P", "Headset Mic"; =20 dai-link-1 { codec { @@ -60,13 +56,13 @@ codec { =20 dai-link-2 { codec { - sound-dai =3D <&es8326>; + sound-dai =3D <&rt5682s 0>; }; }; =20 dai-link-3 { codec { - sound-dai =3D <&es8326>; + sound-dai =3D <&rt5682s 0>; }; }; }; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-boe.dtso= b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-boe.dtso new file mode 100644 index 000000000000..4d61226713bc --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-boe.dtso @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright 2023 Google LLC + */ +/dts-v1/; +/plugin/; + +&dsi_panel { + compatible =3D "boe,nv110wum-l60", "himax,hx83102"; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-ivo.dtso= b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-ivo.dtso new file mode 100644 index 000000000000..8cdacf64c100 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-panel-ivo.dtso @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright 2023 Google LLC + */ +/dts-v1/; +/plugin/; + +&dsi_panel { + compatible =3D "ivo,t109nw41", "himax,hx83102"; +}; diff --git a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts deleted file mode 100644 index 79d6d12394b9..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dts +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2023 Google LLC - */ -/dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku0 board"; - compatible =3D "google,ciri-sku0", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "boe,nv110wum-l60", "himax,hx83102"; -}; - -&sound { - compatible =3D "mediatek,mt8188-rt5682s"; - model =3D "mt8188_m98390_5682"; - - audio-routing =3D - "ETDM1_OUT", "ETDM_SPK_PIN", - "ETDM2_OUT", "ETDM_HP_PIN", - "ETDM1_IN", "ETDM_SPK_PIN", - "ETDM2_IN", "ETDM_HP_PIN", - "ADDA Capture", "MTKAIF_PIN", - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR", - "IN1P", "Headset Mic", - "Left Spk", "Front Left BE_OUT", - "Right Spk", "Front Right BE_OUT"; -}; 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 new file mode 100644 index 000000000000..884a7b2d943c --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku0.dtso @@ -0,0 +1,11 @@ +// 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 new file mode 100644 index 000000000000..d3ed6ea535d7 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku1.dtso @@ -0,0 +1,11 @@ +// 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.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dts deleted file mode 100644 index ef56786fc2be..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dts +++ /dev/null @@ -1,59 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku2 board"; - compatible =3D "google,ciri-sku2", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "boe,nv110wum-l60", "himax,hx83102"; -}; - -&i2c0 { - /delete-node/ audio-codec@1a; - - es8326: audio-codec@19 { - compatible =3D "everest,es8326"; - reg =3D <0x19>; - interrupts-extended =3D <&pio 108 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&audio_codec_pins>; - #sound-dai-cells =3D <0>; - everest,jack-pol =3D [0e]; - everest,interrupt-clk =3D [00]; - }; -}; - -&sound { - compatible =3D "mediatek,mt8188-es8326"; - model =3D "mt8188_m98390_8326"; - - audio-routing =3D - "ETDM1_OUT", "ETDM_SPK_PIN", - "ETDM2_OUT", "ETDM_HP_PIN", - "ETDM1_IN", "ETDM_SPK_PIN", - "ETDM2_IN", "ETDM_HP_PIN", - "ADDA Capture", "MTKAIF_PIN", - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR", - "MIC1", "Headset Mic", - "Left Spk", "Front Left BE_OUT", - "Right Spk", "Front Right BE_OUT"; - - dai-link-2 { - codec { - sound-dai =3D <&es8326>; - }; - }; - - dai-link-3 { - codec { - sound-dai =3D <&es8326>; - }; - }; -}; 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 new file mode 100644 index 000000000000..3f9d38bc2ad2 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku2.dtso @@ -0,0 +1,11 @@ +// 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.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dts deleted file mode 100644 index 524f7f0064c1..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dts +++ /dev/null @@ -1,32 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku3 board"; - compatible =3D "google,ciri-sku3", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "ivo,t109nw41", "himax,hx83102"; -}; - -&sound { - compatible =3D "mediatek,mt8188-rt5682s"; - model =3D "mt8188_m98390_5682"; - - audio-routing =3D - "ETDM1_OUT", "ETDM_SPK_PIN", - "ETDM2_OUT", "ETDM_HP_PIN", - "ETDM1_IN", "ETDM_SPK_PIN", - "ETDM2_IN", "ETDM_HP_PIN", - "ADDA Capture", "MTKAIF_PIN", - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR", - "IN1P", "Headset Mic", - "Left Spk", "Front Left BE_OUT", - "Right Spk", "Front Right BE_OUT"; -}; 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 new file mode 100644 index 000000000000..e6a6f8f06141 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku3.dtso @@ -0,0 +1,11 @@ +// 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.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dts deleted file mode 100644 index ea953d7e1543..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dts +++ /dev/null @@ -1,48 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku4 board (rev4)"; - compatible =3D "google,ciri-sku4", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "boe,nv110wum-l60", "himax,hx83102"; -}; - -&i2c0 { - /delete-node/ amplifier@38; - /delete-node/ amplifier@39; - - tas2563: amplifier@4f { - compatible =3D "ti,tas2563", "ti,tas2781"; - reg =3D <0x4f>, <0x4c>; /* left / right channel */ - reset-gpios =3D <&pio 118 GPIO_ACTIVE_HIGH>; - #sound-dai-cells =3D <0>; - }; -}; - -&sound { - compatible =3D "mediatek,mt8188-rt5682s"; - model =3D "mt8188_tas2563_5682"; - - audio-routing =3D - "ETDM1_OUT", "ETDM_SPK_PIN", - "ETDM2_OUT", "ETDM_HP_PIN", - "ETDM1_IN", "ETDM_SPK_PIN", - "ETDM2_IN", "ETDM_HP_PIN", - "ADDA Capture", "MTKAIF_PIN", - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR", - "IN1P", "Headset Mic"; - - dai-link-1 { - codec { - sound-dai =3D <&tas2563>; - }; - }; -}; 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 new file mode 100644 index 000000000000..ee5b28c4ef00 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku4.dtso @@ -0,0 +1,11 @@ +// 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 new file mode 100644 index 000000000000..ccf8d2f0eb70 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku5.dtso @@ -0,0 +1,11 @@ +// 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 new file mode 100644 index 000000000000..773c702b59d8 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku6.dtso @@ -0,0 +1,11 @@ +// 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.dts b/arc= h/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dts deleted file mode 100644 index 825015b452d5..000000000000 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dts +++ /dev/null @@ -1,48 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0 OR MIT) -/* - * Copyright 2024 Google LLC - */ -/dts-v1/; -#include "mt8188-geralt-ciri.dtsi" - -/ { - model =3D "Google Ciri sku7 board (rev4)"; - compatible =3D "google,ciri-sku7", "google,ciri", "mediatek,mt8188"; -}; - -&dsi_panel { - compatible =3D "ivo,t109nw41", "himax,hx83102"; -}; - -&i2c0 { - /delete-node/ amplifier@38; - /delete-node/ amplifier@39; - - tas2563: amplifier@4f { - compatible =3D "ti,tas2563", "ti,tas2781"; - reg =3D <0x4f>, <0x4c>; /* left / right channel */ - reset-gpios =3D <&pio 118 GPIO_ACTIVE_HIGH>; - #sound-dai-cells =3D <0>; - }; -}; - -&sound { - compatible =3D "mediatek,mt8188-rt5682s"; - model =3D "mt8188_tas2563_5682"; - - audio-routing =3D - "ETDM1_OUT", "ETDM_SPK_PIN", - "ETDM2_OUT", "ETDM_HP_PIN", - "ETDM1_IN", "ETDM_SPK_PIN", - "ETDM2_IN", "ETDM_HP_PIN", - "ADDA Capture", "MTKAIF_PIN", - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR", - "IN1P", "Headset Mic"; - - dai-link-1 { - codec { - sound-dai =3D <&tas2563>; - }; - }; -}; 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 new file mode 100644 index 000000000000..c22860eab9f8 --- /dev/null +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri-sku7.dtso @@ -0,0 +1,11 @@ +// 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-geralt-ciri.dtsi b/arch/ar= m64/boot/dts/mediatek/mt8188-geralt-ciri.dts similarity index 81% rename from arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri.dtsi rename to arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri.dts index 6815c435a57e..2c9e9e67c8e2 100644 --- a/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8188-geralt-ciri.dts @@ -5,6 +5,11 @@ /dts-v1/; #include "mt8188-geralt.dtsi" =20 +/ { + model =3D "Google Ciri board"; + compatible =3D "google,ciri", "mediatek,mt8188"; +}; + &aud_etdm_hp_on { pins-mclk { pinmux =3D ; @@ -19,40 +24,6 @@ pins-mclk { }; }; =20 -&i2c0 { - rt5682s: audio-codec@1a { - compatible =3D "realtek,rt5682s"; - reg =3D <0x1a>; - interrupts-extended =3D <&pio 108 IRQ_TYPE_EDGE_BOTH>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&audio_codec_pins>; - #sound-dai-cells =3D <1>; - - AVDD-supply =3D <&mt6359_vio18_ldo_reg>; - DBVDD-supply =3D <&mt6359_vio18_ldo_reg>; - LDO1-IN-supply =3D <&mt6359_vio18_ldo_reg>; - MICVDD-supply =3D <&pp3300_s3>; - realtek,jd-src =3D <1>; - }; - - max98390_38: amplifier@38 { - compatible =3D "maxim,max98390"; - reg =3D <0x38>; - sound-name-prefix =3D "Front Right"; - reset-gpios =3D <&pio 118 GPIO_ACTIVE_LOW>; - pinctrl-names =3D "default"; - pinctrl-0 =3D <&speaker_en>; - #sound-dai-cells =3D <0>; - }; - - max98390_39: amplifier@39 { - compatible =3D "maxim,max98390"; - reg =3D <0x39>; - sound-name-prefix =3D "Front Left"; - #sound-dai-cells =3D <0>; - }; -}; - &i2c_tunnel { /* * The virtual battery I2C addr is 0xf on Ciri, so we describe it @@ -77,6 +48,8 @@ &mt6359_vm18_ldo_reg { }; =20 &sound { + /* compatible, model, routing, and dai-link codecs added by overlays */ + dai-link-0 { link-name =3D "ETDM1_IN_BE"; dai-format =3D "i2s"; @@ -87,29 +60,16 @@ dai-link-1 { link-name =3D "ETDM1_OUT_BE"; dai-format =3D "i2s"; mediatek,clk-provider =3D "cpu"; - - codec { - sound-dai =3D <&max98390_38>, - <&max98390_39>; - }; }; =20 dai-link-2 { link-name =3D "ETDM2_IN_BE"; mediatek,clk-provider =3D "cpu"; - - codec { - sound-dai =3D <&rt5682s 0>; - }; }; =20 dai-link-3 { link-name =3D "ETDM2_OUT_BE"; mediatek,clk-provider =3D "cpu"; - - codec { - sound-dai =3D <&rt5682s 0>; - }; }; =20 dai-link-4 { --=20 2.52.0.223.gf5cc29aaa4-goog From nobody Fri Dec 19 11:44:55 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