From 25ad0950a84b21e9b4129903772667022c16d2ec Mon Sep 17 00:00:00 2001
From: Matt DeVillier <matt.devillier@gmail.com>
Date: Mon, 2 Feb 2026 14:57:58 -0600
Subject: [PATCH] mb/google/brya: Add non-ChromeOS TBMC support for 360/flip
 variants

The TBMC ACPI device is used by Windows ChromeEC drivers to determine
tablet mode and to enable motion sensors (accelerometer, gyroscope).
Since it's not needed/used by ChromeOS, restrict its inclusion to
non-ChromeOS builds.

TEST=build/boot Win11/Linux on taeko, verify tablet mode and rotation
work properly, keyboard/touchpad disabled in tablet mode.

Change-Id: Ie26cd77c8a58034dbce05a1ab308b9dcc122484c
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/91797
Reviewed-by: Eric Lai <ericllai@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 .../google/brya/variants/craask/include/variant/ec.h         | 5 +++++
 .../google/brya/variants/craaskov/include/variant/ec.h       | 5 +++++
 .../google/brya/variants/crota/include/variant/ec.h          | 5 +++++
 .../google/brya/variants/dochi/include/variant/ec.h          | 5 +++++
 .../google/brya/variants/felwinter/include/variant/ec.h      | 5 +++++
 .../google/brya/variants/gimble/include/variant/ec.h         | 5 +++++
 .../google/brya/variants/gimble4es/include/variant/ec.h      | 5 +++++
 .../google/brya/variants/gothrax/include/variant/ec.h        | 5 +++++
 .../google/brya/variants/joxer/include/variant/ec.h          | 5 +++++
 .../google/brya/variants/kaladin/include/variant/ec.h        | 5 +++++
 src/mainboard/google/brya/variants/kano/include/variant/ec.h | 5 +++++
 .../google/brya/variants/mithrax/include/variant/ec.h        | 5 +++++
 .../google/brya/variants/pujjo/include/variant/ec.h          | 5 +++++
 .../google/brya/variants/pujjoga/include/variant/ec.h        | 5 +++++
 .../google/brya/variants/pujjolo/include/variant/ec.h        | 5 +++++
 .../google/brya/variants/pujjoniru/include/variant/ec.h      | 5 +++++
 .../google/brya/variants/redrix/include/variant/ec.h         | 5 +++++
 .../google/brya/variants/redrix4es/include/variant/ec.h      | 5 +++++
 .../google/brya/variants/riven/include/variant/ec.h          | 5 +++++
 .../google/brya/variants/taeko/include/variant/ec.h          | 5 +++++
 .../google/brya/variants/taeko4es/include/variant/ec.h       | 5 +++++
 src/mainboard/google/brya/variants/xivu/include/variant/ec.h | 5 +++++
 22 files changed, 110 insertions(+)

diff --git a/src/mainboard/google/brya/variants/craask/include/variant/ec.h b/src/mainboard/google/brya/variants/craask/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/craask/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/craask/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/craaskov/include/variant/ec.h b/src/mainboard/google/brya/variants/craaskov/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/craaskov/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/craaskov/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/crota/include/variant/ec.h b/src/mainboard/google/brya/variants/crota/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/crota/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/crota/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/dochi/include/variant/ec.h b/src/mainboard/google/brya/variants/dochi/include/variant/ec.h
index 6f104d5da4..74b96179aa 100644
--- a/src/mainboard/google/brya/variants/dochi/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/dochi/include/variant/ec.h
@@ -8,4 +8,9 @@
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/felwinter/include/variant/ec.h b/src/mainboard/google/brya/variants/felwinter/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/felwinter/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/felwinter/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/gimble/include/variant/ec.h b/src/mainboard/google/brya/variants/gimble/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/gimble/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/gimble/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/gimble4es/include/variant/ec.h b/src/mainboard/google/brya/variants/gimble4es/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/gimble4es/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/gimble4es/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/gothrax/include/variant/ec.h b/src/mainboard/google/brya/variants/gothrax/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/gothrax/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/gothrax/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/joxer/include/variant/ec.h b/src/mainboard/google/brya/variants/joxer/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/joxer/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/joxer/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/kaladin/include/variant/ec.h b/src/mainboard/google/brya/variants/kaladin/include/variant/ec.h
index 6f104d5da4..74b96179aa 100644
--- a/src/mainboard/google/brya/variants/kaladin/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/kaladin/include/variant/ec.h
@@ -8,4 +8,9 @@
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/kano/include/variant/ec.h b/src/mainboard/google/brya/variants/kano/include/variant/ec.h
index 6f104d5da4..74b96179aa 100644
--- a/src/mainboard/google/brya/variants/kano/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/kano/include/variant/ec.h
@@ -8,4 +8,9 @@
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/mithrax/include/variant/ec.h b/src/mainboard/google/brya/variants/mithrax/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/mithrax/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/mithrax/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/pujjo/include/variant/ec.h b/src/mainboard/google/brya/variants/pujjo/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/pujjo/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/pujjo/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/pujjoga/include/variant/ec.h b/src/mainboard/google/brya/variants/pujjoga/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/pujjoga/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/pujjoga/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/pujjolo/include/variant/ec.h b/src/mainboard/google/brya/variants/pujjolo/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/pujjolo/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/pujjolo/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/pujjoniru/include/variant/ec.h b/src/mainboard/google/brya/variants/pujjoniru/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/pujjoniru/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/pujjoniru/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/redrix/include/variant/ec.h b/src/mainboard/google/brya/variants/redrix/include/variant/ec.h
index ea8fb54830..18716e4f50 100644
--- a/src/mainboard/google/brya/variants/redrix/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/redrix/include/variant/ec.h
@@ -23,4 +23,9 @@
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/redrix4es/include/variant/ec.h b/src/mainboard/google/brya/variants/redrix4es/include/variant/ec.h
index d390746036..3034eef15a 100644
--- a/src/mainboard/google/brya/variants/redrix4es/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/redrix4es/include/variant/ec.h
@@ -44,4 +44,9 @@
 /* Enable EC backed Keyboard Backlight in ACPI */
 #define EC_ENABLE_KEYBOARD_BACKLIGHT
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/riven/include/variant/ec.h b/src/mainboard/google/brya/variants/riven/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/riven/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/riven/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/taeko/include/variant/ec.h b/src/mainboard/google/brya/variants/taeko/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/taeko/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/taeko/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/taeko4es/include/variant/ec.h b/src/mainboard/google/brya/variants/taeko4es/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/taeko4es/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/taeko4es/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif
diff --git a/src/mainboard/google/brya/variants/xivu/include/variant/ec.h b/src/mainboard/google/brya/variants/xivu/include/variant/ec.h
index 7a2a6ff8b7..dac67ca295 100644
--- a/src/mainboard/google/brya/variants/xivu/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/xivu/include/variant/ec.h
@@ -5,4 +5,9 @@
 
 #include <baseboard/ec.h>
 
+/* Enable Tablet switch for Windows drivers */
+#if !CONFIG(CHROMEOS)
+#define EC_ENABLE_TBMC_DEVICE
+#endif
+
 #endif