Signed-off-by: lushifex <shifeix.a...@intel.com> --- Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl | 3 ++- Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl | 12 +++++++++--- Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl | 7 +++++-- Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c | 3 ++- Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h | 3 ++- Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h | 3 ++- .../PlatformSetupDxe/SouthClusterConfig.vfi | 11 ++++++++++- Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni | Bin 66540 -> 66864 bytes Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni | Bin 215420 -> 216022 bytes 9 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl index 21e526c..32cfd9d 100644 --- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl +++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/GloblNvs.asl @@ -3,11 +3,11 @@ ;* *; ;* Intel Corporation - ACPI Reference Code for the Baytrail *; ;* Family of Customer Reference Boards. *; ;* *; ;* *; -;* Copyright (c) 1999 - 2015, Intel Corporation. All rights reserved *; +;* Copyright (c) 1999 - 2016, Intel Corporation. All rights reserved *; ; ; This program and the accompanying materials are licensed and made available under ; the terms and conditions of the BSD License that accompanies this distribution. ; The full text of the license may be found at ; http://opensource.org/licenses/bsd-license.php. @@ -347,7 +347,8 @@ Field(GNVS,AnyAcc,Lock,Preserve) Offset(792), EDPV, 8, //(792) Check for eDP display device DIDX, 32, //(793) Device ID for eDP device IOT, 8, //(794) MinnowBoard Max JP1 is configured for MSFT IOT project. BATT, 8, //(795) The Flag of RTC Battery Prensent. + LPAD, 8, //(796) } diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl index 38dac87..0d12719 100644 --- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl +++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/Pch.asl @@ -3,11 +3,11 @@ ;* *; ;* Intel Corporation - ACPI Reference Code for the Baytrail *; ;* Family of Customer Reference Boards. *; ;* *; ;* *; -;* Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved *; +;* Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved *; ; ; This program and the accompanying materials are licensed and made available under ; the terms and conditions of the BSD License that accompanies this distribution. ; The full text of the license may be found at ; http://opensource.org/licenses/bsd-license.php. @@ -137,11 +137,14 @@ scope (\_SB) Method (_STA, 0x0, NotSerialized) { If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 0))) { - Return (0xF) + If(LEqual(LPAD, 1)) + { + Return (0xF) + } } Return (0x0) } Method (_DIS, 0x0, NotSerialized) @@ -216,11 +219,14 @@ scope (\_SB) Method (_STA, 0x0, NotSerialized) { If (LAnd(LAnd(LEqual(LPEE, 2), LEqual(LPED, 0)), LEqual(OSEL, 1))) { - Return (0xF) + If(LEqual(LPAD, 1)) + { + Return (0xF) + } } Return (0x0) } Method (_DIS, 0x0, NotSerialized) diff --git a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl index 3e61e79..ecb20c1 100644 --- a/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl +++ b/Vlv2DeviceRefCodePkg/AcpiTablesPCAT/PchLpss.asl @@ -3,11 +3,11 @@ ;* *; ;* Intel Corporation - ACPI Reference Code for the Baytrail *; ;* Family of Customer Reference Boards. *; ;* *; ;* *; -;* Copyright (c) 2012 - 2014, Intel Corporation. All rights reserved *; +;* Copyright (c) 2012 - 2016, Intel Corporation. All rights reserved *; ; ; This program and the accompanying materials are licensed and made available under ; the terms and conditions of the BSD License that accompanies this distribution. ; The full text of the license may be found at ; http://opensource.org/licenses/bsd-license.php. @@ -603,11 +603,14 @@ Device(I2C2) Method (_STA, 0x0, NotSerialized) { If (LEqual(LPEE, 2)) { // LPE enable/disable - Return(0xF) + If (LEqual(LPAD, 1)) + { + Return(0xF) + } } Return(0) } Method (_DIS, 0x0, NotSerialized) diff --git a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c index a7e54e3..691a9d1 100644 --- a/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c +++ b/Vlv2TbltDevicePkg/AcpiPlatform/AcpiPlatform.c @@ -1,8 +1,8 @@ /** @file - Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. @@ -1054,10 +1054,11 @@ AcpiPlatformEntryPoint ( mGlobalNvsArea.Area->PmicEnable = GLOBAL_NVS_DEVICE_DISABLE; mGlobalNvsArea.Area->BatteryChargingSolution = GLOBAL_NVS_DEVICE_DISABLE; mGlobalNvsArea.Area->ISPDevSel = mSystemConfiguration.ISPDevSel; mGlobalNvsArea.Area->LpeEnable = mSystemConfiguration.Lpe; + mGlobalNvsArea.Area->LpeAudioReportedByDSDT = mSystemConfiguration.LpeAudioReportedByDSDT; if (mSystemConfiguration.ISPEn == 0) { mGlobalNvsArea.Area->ISPDevSel = GLOBAL_NVS_DEVICE_DISABLE; } diff --git a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h index 5168bd5..c7c51d0 100644 --- a/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h +++ b/Vlv2TbltDevicePkg/Include/Guid/SetupVariable.h @@ -1,8 +1,8 @@ /*++ - Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. @@ -1307,10 +1307,11 @@ typedef struct { UINT8 LpssHsuart1FlowControlEnabled; UINT8 SdCardRemovable; // ACPI reporting MMC/SD media as: removable/non-removable UINT8 GpioWakeCapability; UINT8 RtcBattery; + UINT8 LpeAudioReportedByDSDT; } SYSTEM_CONFIGURATION; #pragma pack() #ifndef PLATFORM_SETUP_VARIABLE_NAME diff --git a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h index 5e650b6..aa7ec92 100644 --- a/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h +++ b/Vlv2TbltDevicePkg/Include/Protocol/GlobalNvsArea.h @@ -1,8 +1,8 @@ /*++ - Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> + Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. @@ -470,10 +470,11 @@ typedef struct { UINT8 PssDeveice; // 791 PSS Deveice: 0 - None, 1 - Monzax 2K, 2 - Monzax 8K UINT8 EDPV; // 792 Check for eDP display device UINT32 DIDX; // 793 Device ID for eDP device UINT8 MicrosoftIoT; // (794)JP1 pins are for Microsoft IoT project. UINT8 RtcBattery; // (795) The Flag of RTC Battery Present. + UINT8 LpeAudioReportedByDSDT; // (796) } EFI_GLOBAL_NVS_AREA; #pragma pack () // // Global NVS Area Protocol diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi index 58e2676..258bd6f 100644 --- a/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi +++ b/Vlv2TbltDevicePkg/PlatformSetupDxe/SouthClusterConfig.vfi @@ -1,8 +1,8 @@ // // -// Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> +// Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR> // // This program and the accompanying materials are licensed and made available under // the terms and conditions of the BSD License that accompanies this distribution. // The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php. @@ -779,10 +779,19 @@ form formid = AZALIA_OPTIONS_FORM_ID, option text = STRING_TOKEN(STR_DISABLE), value=0, flags=DEFAULT | MANUFACTURING | RESET_REQUIRED; option text = STRING_TOKEN(STR_LPE_PCI_MODE), value=1, flags=0 | RESET_REQUIRED; option text = STRING_TOKEN(STR_LPE_ACPI_MODE), value=2, flags=0 | RESET_REQUIRED; endoneof; + grayoutif NOT ideqval Setup.Lpe == 0x2; + oneof varid = Setup.LpeAudioReportedByDSDT, + prompt = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_PROMPT), + help = STRING_TOKEN(STR_LPE_REPORTED_BY_DSDT_HELP), + option text = STRING_TOKEN(STR_DISABLE), value=0, flags=DEFAULT | MANUFACTURING | RESET_REQUIRED; + option text = STRING_TOKEN(STR_ENABLE), value=1, flags=RESET_REQUIRED; + endoneof; + endif; + subtitle text = STRING_TOKEN(STR_NULL_STRING); suppressif ideqval Setup.AzaliaDs == 0x1; oneof varid = Setup.PchAzalia, prompt = STRING_TOKEN(STR_PCH_AZALIA_PROMPT), help = STRING_TOKEN(STR_PCH_AZALIA_HELP), diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/UqiList.uni index 229b75e035b5ce8fcbd98799304f8dc24d692fd0..1de43911c3013a7f7ebf11025ceb17da36e54151 100644 GIT binary patch delta 124 zcmaFU&a$D4WkLX>S!3YVK*rh3lUF3lD7rGlGXycXG6XRA1L+VT%LORn#1IK2T^NEH tTqbWkZajIxRt-jr$rnE;PCk&xqD)W^L&)UB^O0N@3}y^U47?0n3;<ak9*+P3 delta 17 Ycmdnc#qy?|WkLX>X=C8lK*rh306zx?LjV8( diff --git a/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni b/Vlv2TbltDevicePkg/PlatformSetupDxe/VfrStrings.uni index d1e1b6d9a7b4372ec5579fd7cfcf3582dc40da46..02d3321918132d83735269967f4ada3a591e688c 100644 GIT binary patch delta 385 zcma)&y-EW?6ot=S(gyrtK?`vt7Pi}1yRs1kLD}8LMib(KL5+jE{(&G?wvrJB>`X0U z6MT*|3O<6*V9+yz_A+qi+<VV_cV@o&^*39;Tao3Pco<7&>~k2**w#pDR*$7Nm!gR+ zY$8QYm0%aE*k(+SAu;k4+19%(*{g4vm`_na;}|EXsP>@fy=3%W<Tf5j<3H5sJ~A&m zi=pFn$UEXH&?AvlyYLxIHx#-kiLTgIIAFt#R?IYOUG6<Q`5@tS+n-ZxU--L~R0<n> zQ<Hm)Q&OE>dHNZ3$2-ocD(tiF2#W4CtouxpbLf5Tzfr6^ugevQnk=UalvBSgH#Bo! ShTJ@kXKx2aUI!-l82$jph*ypP delta 31 pcmV+)0O0@Dmks=q4Uj+qHGx63K><^fldSy?hy0ZRxBQg?+O^-m4)*{6 -- 2.6.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
