Star Labs has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/52768 )
Change subject: Updated mainboard.c ......................................................................
Updated mainboard.c
Change-Id: I26c9861e3c4335d8819e0925b1e0f9532a4bb6fb --- M src/ec/starlabs/it8987/acpi/ac.asl M src/ec/starlabs/it8987/acpi/cmos.asl M src/ec/starlabs/it8987/acpi/ec.asl M src/ec/starlabs/it8987/acpi/hid.asl M src/ec/starlabs/it8987/acpi/keyboard.asl M src/mainboard/starlabs/labtop/acpi/mainboard.asl M src/mainboard/starlabs/labtop/mainboard.c 7 files changed, 33 insertions(+), 33 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/68/52768/1
diff --git a/src/ec/starlabs/it8987/acpi/ac.asl b/src/ec/starlabs/it8987/acpi/ac.asl index 860bc86..97ae147 100644 --- a/src/ec/starlabs/it8987/acpi/ac.asl +++ b/src/ec/starlabs/it8987/acpi/ac.asl @@ -50,7 +50,7 @@ Notify (ADP1, 0x80) }
-Method(_Q0B, 0, NotSerialized) // Battery Connected +Method(_Q0B, 0, NotSerialized) // Battery Connected { // 500ms delay - Not used in coreboot // Sleep (500) diff --git a/src/ec/starlabs/it8987/acpi/cmos.asl b/src/ec/starlabs/it8987/acpi/cmos.asl index 3368473..052094c 100644 --- a/src/ec/starlabs/it8987/acpi/cmos.asl +++ b/src/ec/starlabs/it8987/acpi/cmos.asl @@ -3,7 +3,7 @@ OperationRegion (CMOS, SystemIO, 0x70, 0x02) Field (CMOS, ByteAcc, NoLock, Preserve) { - NVRI, 8, + NVRI, 8, NVRD, 8 }
diff --git a/src/ec/starlabs/it8987/acpi/ec.asl b/src/ec/starlabs/it8987/acpi/ec.asl index 1efe309..2628cd5 100644 --- a/src/ec/starlabs/it8987/acpi/ec.asl +++ b/src/ec/starlabs/it8987/acpi/ec.asl @@ -30,7 +30,7 @@ // Include the definitions for accessing CMOS. #include "cmos.asl"
- // Our embedded controller device. + // Our embedded controller device. Device (H_EC) { Name (_HID, EISAID ("PNP0C09")) // ACPI Embedded Controller @@ -46,7 +46,7 @@
Name(ECON, 1) // AC debug Name(BNUM, 0) // Number Of Batteries Present - Name(PVOL, ASL_PVOL_DEFOF_NUM) + Name(PVOL, ASL_PVOL_DEFOF_NUM) Name(B1CC, 0) Name(B2CC, 0)
@@ -79,7 +79,7 @@ Name(PB10, 0) Name(IWCW, 0) Name(IWCR, 0) - Name(BTEN, 0) + Name(BTEN, 0) Mutex(ECMT, 0)
Method (_CRS, 0, Serialized) @@ -110,19 +110,19 @@ { ECOS = 1 ECAV = 1 - + // Unconditionally fix up the Battery and Power State. - + // Initialize the Number of Present Batteries. // 1 = Real Battery 1 is present // 2 = Real Battery 2 is present // 3 = Real Battery 1 and 2 are present BNUM = 0 BNUM |= ((ECRD (RefOf (ECWR)) & 0x02) >> 1) - + // Save the current Power State for later. // Store (PWRS, Local0) - + // Initialize the Power State. // BNUM = 0 = Virtual Power State // BNUM > 0 = Real Power State @@ -177,14 +177,14 @@ XXX1, 8, // EC Firmware sub- version number. XXX2, 8, // EC Firmware test- version number.
- Offset(0x06), + Offset(0x06), SKID, 8, // SKU ID
Offset(0x11), KBCD, 8, // Key / Touch Pad disable/enable bit ECOS, 8, // Enter OS flag HDAO, 8, - ECHK, 8, // Hot keys flag + ECHK, 8, // Hot keys flag
Offset(0x18), KLBS, 8, // Keyboard backlight begin. @@ -195,7 +195,7 @@ PWPF, 8, // Power Profile
Offset(0x1E), - BTHP,8, // Health Battery Percentage + BTHP,8, // Health Battery Percentage
Offset(0x20), RCMD, 8, // Same function as IO 66 port to send EC command @@ -205,9 +205,9 @@ FNST, 8, // FN LOCK key status.
Offset(0x3F), - SFAN, 8, // Set Fan Speed. - BTMP, 16, // Battery Temperature. - BCNT, 16, // Battery Cycle Count. + SFAN, 8, // Set Fan Speed. + BTMP, 16, // Battery Temperature. + BCNT, 16, // Battery Cycle Count. FRMP, 16, // Fan Current Speed.
Offset(0x60), @@ -237,16 +237,16 @@ CHGR, 16, // Charge Rate
Offset(0x70), - CPTM, 8, // CPU Temperature + CPTM, 8, // CPU Temperature
- Offset(0x72), - TER2, 8, // Charger Temperature, Charger thermistor support + Offset(0x72), + TER2, 8, // Charger Temperature, Charger thermistor support
Offset(0x7F), LSTE, 1, // Lid feature // BIT0LID GPI , 7, // Reserved - + Offset(0x80), ECWR, 8, // AC & Battery status XX10, 8, // Battery#1 Model Number Code @@ -275,7 +275,7 @@ MGI9, 8, MGIA, 8, MGIB, 8, - MGIC, 8, + MGIC, 8, MGID, 8, MGIE, 8, MGIF, 8, @@ -319,7 +319,7 @@ CTL5, 8, CTL6, 8, CTL7, 8, - + Offset(0xF0), , 3,// BIT0 .. BIT2 Reserved TPCC, 1,// BIT3 TypeC connection bit diff --git a/src/ec/starlabs/it8987/acpi/hid.asl b/src/ec/starlabs/it8987/acpi/hid.asl index b0e71da..cc6bce6 100644 --- a/src/ec/starlabs/it8987/acpi/hid.asl +++ b/src/ec/starlabs/it8987/acpi/hid.asl @@ -29,9 +29,9 @@ Store ("-----> HDDM", Debug) Name (DPKG, Package (0x04) { - 0x11111111, - 0x22222222, - 0x33333333, + 0x11111111, + 0x22222222, + 0x33333333, 0x44444444 }) Return (DPKG) diff --git a/src/ec/starlabs/it8987/acpi/keyboard.asl b/src/ec/starlabs/it8987/acpi/keyboard.asl index fd7ab97..f5b1d52 100644 --- a/src/ec/starlabs/it8987/acpi/keyboard.asl +++ b/src/ec/starlabs/it8987/acpi/keyboard.asl @@ -14,24 +14,24 @@ Notify (_SB.HIDD, 0xC6) Notify (_SB.HIDD, 0xC7) Store ("<----- _Q81", Debug) -} +}
Method(_Q99) // Wireless mode { Store ("-----> _Q99", Debug) - _SB.HIDD.HPEM(8) + _SB.HIDD.HPEM(8) Store ("<----- _Q80", Debug) }
Method(_Q06) // Brightness decrease { _SB.PCI0.GFX0.DECB() -} +}
Method(_Q07) // Brightness increase { _SB.PCI0.GFX0.INCB() -} +}
Method(_Q08) // FN lock QEvent { diff --git a/src/mainboard/starlabs/labtop/acpi/mainboard.asl b/src/mainboard/starlabs/labtop/acpi/mainboard.asl index bf73244..9666055 100644 --- a/src/mainboard/starlabs/labtop/acpi/mainboard.asl +++ b/src/mainboard/starlabs/labtop/acpi/mainboard.asl @@ -34,7 +34,7 @@
Name (_CID, Package (0x02) { - "PRP00001", + "PRP00001", "PNP0A05" })
@@ -45,7 +45,7 @@ } }
-/* +/* * ITE IT8987E Embedded Controller * * We include this here as we need to support different levels within diff --git a/src/mainboard/starlabs/labtop/mainboard.c b/src/mainboard/starlabs/labtop/mainboard.c index b0073c7..71d96e6 100644 --- a/src/mainboard/starlabs/labtop/mainboard.c +++ b/src/mainboard/starlabs/labtop/mainboard.c @@ -9,7 +9,7 @@ /* Override the BIOS version using smbios_mainboard_bios_version() */ const char *smbios_mainboard_bios_version(void) { -#if CONFIG_BOARD_STARLABS_STARBOOK_TGL +#if CONFIG(BOARD_STARLABS_STARBOOK_TGL) return "CB_0"; #else return "CB_5"; @@ -34,9 +34,9 @@ /* Override smbios_system_sku */ const char *smbios_system_sku(void) { -#if CONFIG_BOARD_STARLABS_STARBOOK_TGL +#if CONFIG(BOARD_STARLABS_STARBOOK_TGL) return "B5"; -#elif CONFIG_BOARD_STARLABS_LABTOP_CML +#elif CONFIG(BOARD_STARLABS_LABTOP_CML) return "L4"; #else return "L3-U";