ec/starlabs/merlin: Remove the UCSI ACPI
The UCSI mailbox isn't used, so remove it.
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: I03587a2322b1f34fa26a5c2ba7906a4e1ae82ae0
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76254
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
diff --git a/src/ec/starlabs/merlin/acpi/ec.asl b/src/ec/starlabs/merlin/acpi/ec.asl
index 9de3bc2..fbf367b 100644
--- a/src/ec/starlabs/merlin/acpi/ec.asl
+++ b/src/ec/starlabs/merlin/acpi/ec.asl
@@ -139,7 +139,6 @@
#include "battery.asl"
#include "events.asl"
#include "lid.asl"
- #include "typec.asl"
Method (_REG, 2, NotSerialized)
{
diff --git a/src/ec/starlabs/merlin/acpi/typec.asl b/src/ec/starlabs/merlin/acpi/typec.asl
deleted file mode 100644
index 1acc8a4..0000000
--- a/src/ec/starlabs/merlin/acpi/typec.asl
+++ /dev/null
@@ -1,82 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-Method (UCSW, 0, Serialized)
-{
- Sleep (50)
- MGO0 = ^^^^UBTC.MGO0
- MGO1 = ^^^^UBTC.MGO1
- MGO2 = ^^^^UBTC.MGO2
- MGO3 = ^^^^UBTC.MGO3
- MGO4 = ^^^^UBTC.MGO4
- MGO5 = ^^^^UBTC.MGO5
- MGO6 = ^^^^UBTC.MGO6
- MGO7 = ^^^^UBTC.MGO7
- MGO8 = ^^^^UBTC.MGO7
- MGO9 = ^^^^UBTC.MGO9
- MGOA = ^^^^UBTC.MGOA
- MGOB = ^^^^UBTC.MGOB
- MGOC = ^^^^UBTC.MGOC
- MGOD = ^^^^UBTC.MGOD
- MGOE = ^^^^UBTC.MGOE
- MGOF = ^^^^UBTC.MGOF
- CTL0 = ^^^^UBTC.CTL0
- CTL1 = ^^^^UBTC.CTL1
- CTL2 = ^^^^UBTC.CTL2
- CTL3 = ^^^^UBTC.CTL3
- CTL4 = ^^^^UBTC.CTL4
- CTL5 = ^^^^UBTC.CTL5
- CTL6 = ^^^^UBTC.CTL6
- CTL7 = ^^^^UBTC.CTL7
- OPWE = 0xE0
-}
-
-Method (UCSR, 0, Serialized)
-{
- Sleep (50)
- ^^^^UBTC.MGI0 = MGI0
- ^^^^UBTC.MGI1 = MGI1
- ^^^^UBTC.MGI2 = MGI2
- ^^^^UBTC.MGI3 = MGI3
- ^^^^UBTC.MGI4 = MGI4
- ^^^^UBTC.MGI5 = MGI5
- ^^^^UBTC.MGI6 = MGI6
- ^^^^UBTC.MGI7 = MGI7
- ^^^^UBTC.MGI8 = MGI8
- ^^^^UBTC.MGI9 = MGI9
- ^^^^UBTC.MGIA = MGIA
- ^^^^UBTC.MGIB = MGIB
- ^^^^UBTC.MGIC = MGIC
- ^^^^UBTC.MGID = MGID
- ^^^^UBTC.MGIE = MGIE
- ^^^^UBTC.MGIF = MGIF
- ^^^^UBTC.CCI0 = CCI0
- ^^^^UBTC.CCI1 = CCI1
- ^^^^UBTC.CCI2 = CCI2
- ^^^^UBTC.CCI3 = CCI3
-}
-
-Method (UCEV, 0, Serialized)
-{
- Sleep (50)
- ^^^^UBTC.MGI0 = MGI0
- ^^^^UBTC.MGI1 = MGI1
- ^^^^UBTC.MGI2 = MGI2
- ^^^^UBTC.MGI3 = MGI3
- ^^^^UBTC.MGI4 = MGI4
- ^^^^UBTC.MGI5 = MGI5
- ^^^^UBTC.MGI6 = MGI6
- ^^^^UBTC.MGI7 = MGI7
- ^^^^UBTC.MGI8 = MGI8
- ^^^^UBTC.MGI9 = MGI9
- ^^^^UBTC.MGIA = MGIA
- ^^^^UBTC.MGIB = MGIB
- ^^^^UBTC.MGIC = MGIC
- ^^^^UBTC.MGID = MGID
- ^^^^UBTC.MGIE = MGIE
- ^^^^UBTC.MGIF = MGIF
- ^^^^UBTC.CCI0 = CCI0
- ^^^^UBTC.CCI1 = CCI1
- ^^^^UBTC.CCI2 = CCI2
- ^^^^UBTC.CCI3 = CCI3
- Notify (^^^^UBTC, 0x80)
-}
diff --git a/src/ec/starlabs/merlin/variants/adl/events.asl b/src/ec/starlabs/merlin/variants/adl/events.asl
index 03de4d9..b87f97f 100644
--- a/src/ec/starlabs/merlin/variants/adl/events.asl
+++ b/src/ec/starlabs/merlin/variants/adl/events.asl
@@ -222,7 +222,6 @@
Method (_Q79, 0, NotSerialized) // Event: USB Type-C
{
Printf ("EC: USB Type-C")
- UCEV()
}
Method (_Q80, 0, NotSerialized) // Event: Volume Up
diff --git a/src/ec/starlabs/merlin/variants/cezanne-desktop/events.asl b/src/ec/starlabs/merlin/variants/cezanne-desktop/events.asl
index 12fdf7c..d385bc8 100644
--- a/src/ec/starlabs/merlin/variants/cezanne-desktop/events.asl
+++ b/src/ec/starlabs/merlin/variants/cezanne-desktop/events.asl
@@ -174,7 +174,6 @@
Method (_Q79, 0, NotSerialized) // Event: USB Type-C
{
Printf ("EC: USB Type-C")
- UCEV()
}
Method (_Q80, 0, NotSerialized) // Event: Volume Up
diff --git a/src/ec/starlabs/merlin/variants/cezanne/events.asl b/src/ec/starlabs/merlin/variants/cezanne/events.asl
index 3fd297f..37b84b7 100644
--- a/src/ec/starlabs/merlin/variants/cezanne/events.asl
+++ b/src/ec/starlabs/merlin/variants/cezanne/events.asl
@@ -209,7 +209,6 @@
Method (_Q79, 0, NotSerialized) // Event: USB Type-C
{
Printf ("EC: USB Type-C")
- UCEV()
}
Method (_Q80, 0, NotSerialized) // Event: Volume Up
diff --git a/src/ec/starlabs/merlin/variants/glkr/events.asl b/src/ec/starlabs/merlin/variants/glkr/events.asl
index 49589da..556da66 100644
--- a/src/ec/starlabs/merlin/variants/glkr/events.asl
+++ b/src/ec/starlabs/merlin/variants/glkr/events.asl
@@ -62,7 +62,6 @@
Method (_Q79, 0, NotSerialized) // Event: USB Type-C
{
Printf ("EC: USB Type-C")
- UCEV()
}
Method (_Q60, 0, NotSerialized) // Event: Trackpad Enable
diff --git a/src/ec/starlabs/merlin/variants/kbl/events.asl b/src/ec/starlabs/merlin/variants/kbl/events.asl
index df7399d..5e80fd0 100644
--- a/src/ec/starlabs/merlin/variants/kbl/events.asl
+++ b/src/ec/starlabs/merlin/variants/kbl/events.asl
@@ -126,7 +126,6 @@
Method (_Q79, 0, NotSerialized) // Event: USB Type-C
{
Printf ("EC: USB Type-C")
- UCEV()
}
Method (_Q0E, 0, NotSerialized) // Event: SLEEP
diff --git a/src/ec/starlabs/merlin/variants/merlin/emem.asl b/src/ec/starlabs/merlin/variants/merlin/emem.asl
index 9539e09..2a28a45 100644
--- a/src/ec/starlabs/merlin/variants/merlin/emem.asl
+++ b/src/ec/starlabs/merlin/variants/merlin/emem.asl
@@ -49,7 +49,4 @@
B1RC, 16, // Battery Remaining Capacity
B1PV, 16, // Battery Present Voltage
BPRP, 8, // Battery Remaining percentage
-
- Offset(0x9d),
- OPWE, 8, // OPM write to EC flag for UCSI
}
diff --git a/src/ec/starlabs/merlin/variants/tgl/events.asl b/src/ec/starlabs/merlin/variants/tgl/events.asl
index 5dd4ba9..d8d298c 100644
--- a/src/ec/starlabs/merlin/variants/tgl/events.asl
+++ b/src/ec/starlabs/merlin/variants/tgl/events.asl
@@ -125,7 +125,6 @@
Method (_Q79, 0, NotSerialized) // Event: USB Type-C
{
Printf ("EC: USB Type-C")
- UCEV()
}
Method (_Q85, 0, NotSerialized) // Event: HOME