From e40ca124c6f28733475cdd3e1e5ebbea7c2b45f5 Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Mon, 16 May 2022 08:23:08 +0100 Subject: ec/starlabs/merlin/glk: Correct offset of USCI Signed-off-by: Sean Rhodes Change-Id: I54b01b1974822c155cb49634fff8616326d55705 Reviewed-on: https://review.coreboot.org/c/coreboot/+/64380 Tested-by: build bot (Jenkins) Reviewed-by: Matt DeVillier --- src/ec/starlabs/merlin/variants/glk/emem.asl | 34 ++++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/ec') diff --git a/src/ec/starlabs/merlin/variants/glk/emem.asl b/src/ec/starlabs/merlin/variants/glk/emem.asl index c41fc24be6..d9d80b1921 100644 --- a/src/ec/starlabs/merlin/variants/glk/emem.asl +++ b/src/ec/starlabs/merlin/variants/glk/emem.asl @@ -105,6 +105,22 @@ Field (ECF2, ByteAcc, Lock, Preserve) EJ8A, 8, // EJ898A Firmware Version Offset(0xc0), + UCSV, 16, // UCSI DS Version + UCSD, 16, // UCSI DS Reserved + CCI0, 8, // UCSI DS CCI 0 + CCI1, 8, // UCSI DS CCI 1 + CCI2, 8, // UCSI DS CCI 2 + CCI3, 8, // UCSI DS CCI 3 + CTL0, 8, // UCSI DS Control 0 + CTL1, 8, // UCSI DS Control 0 + CTL2, 8, // UCSI DS Control 0 + CTL3, 8, // UCSI DS Control 0 + CTL4, 8, // UCSI DS Control 0 + CTL5, 8, // UCSI DS Control 0 + CTL6, 8, // UCSI DS Control 0 + CTL7, 8, // UCSI DS Control 0 + + Offset(0xd0), MGI0, 8, // UCSI DS MGI 0 MGI1, 8, // UCSI DS MGI 1 MGI2, 8, // UCSI DS MGI 2 @@ -122,7 +138,7 @@ Field (ECF2, ByteAcc, Lock, Preserve) MGIE, 8, // UCSI DS MGI E MGIF, 8, // UCSI DS MGI F - Offset(0xd0), + Offset(0xe0), MGO0, 8, // UCSI DS MGO 0 MGO1, 8, // UCSI DS MGO 1 MGO2, 8, // UCSI DS MGO 2 @@ -140,22 +156,6 @@ Field (ECF2, ByteAcc, Lock, Preserve) MGOE, 8, // UCSI DS MGO E MGOF, 8, // UCSI DS MGO F - Offset(0xe0), - UCSV, 16, // UCSI DS Version - UCSD, 16, // UCSI DS Reserved - CCI0, 8, // UCSI DS CCI 0 - CCI1, 8, // UCSI DS CCI 1 - CCI2, 8, // UCSI DS CCI 2 - CCI3, 8, // UCSI DS CCI 3 - CTL0, 8, // UCSI DS Control 0 - CTL1, 8, // UCSI DS Control 0 - CTL2, 8, // UCSI DS Control 0 - CTL3, 8, // UCSI DS Control 0 - CTL4, 8, // UCSI DS Control 0 - CTL5, 8, // UCSI DS Control 0 - CTL6, 8, // UCSI DS Control 0 - CTL7, 8, // UCSI DS Control 0 - Offset(0xf0), P0SD, 8, // PD Port Status DD P0S4, 8, // PD Port Status 4 -- cgit v1.2.3