Change in coreboot[master]: mb/google/guybrush/var/nipperkin: turn off WLAN ASPM L1ss

[Karthik Ramasubramanian (Code Review)]

Karthik Ramasubramanian has submitted this change. ( https://review.coreboot.org/c/coreboot/+/63537 )

Change subject: mb/google/guybrush/var/nipperkin: turn off WLAN ASPM L1ss
......................................................................

mb/google/guybrush/var/nipperkin: turn off WLAN ASPM L1ss

BUG=b:227296841
BRANCH=guybrush
TEST=emerge-guybrush coreboot chromeos-bootimage
     pass PLT criteria: S0 > 600ms, s0i3 > 14 days

Change-Id: I9c61e1d0f3db8b9885040255d6de266616768b68
Signed-off-by: Kevin Chiu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/63537
Tested-by: build bot (Jenkins) 
Reviewed-by: Rob Barnes 
Reviewed-by: Jon Murphy 
---
M src/mainboard/google/guybrush/variants/nipperkin/variant.c
1 file changed, 5 insertions(+), 15 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Rob Barnes: Looks good to me, approved
  Jon Murphy: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/guybrush/variants/nipperkin/variant.c b/src/mainboard/google/guybrush/variants/nipperkin/variant.c
index 9ffb2d5..b70545e 100644
--- a/src/mainboard/google/guybrush/variants/nipperkin/variant.c
+++ b/src/mainboard/google/guybrush/variants/nipperkin/variant.c
@@ -1,23 +1,13 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */

#include <baseboard/variants.h>
-#include <boardid.h>
-#include <device/device.h>
-#include <soc/gpio.h>
 #include <string.h>

void variant_update_dxio_descriptors(fsp_dxio_descriptor *dxio_descriptors)
 {
-	uint32_t board_version = board_id();
-
-	if (board_version >= 3) {
-		dxio_descriptors[WLAN].link_aspm_L1_1 = true;
-		dxio_descriptors[WLAN].link_aspm_L1_2 = true;
-		/* Disable PSPP to avoid S0ix hangs - b/228830362 */
-		memset(dxio_descriptors[WLAN].port_params, 0,
-		       sizeof(dxio_descriptors[WLAN].port_params));
-	} else {
-		dxio_descriptors[WLAN].link_aspm_L1_1 = false;
-		dxio_descriptors[WLAN].link_aspm_L1_2 = false;
-	}
+	dxio_descriptors[WLAN].link_aspm_L1_1 = false;
+	dxio_descriptors[WLAN].link_aspm_L1_2 = false;
+	/* Disable PSPP to avoid S0ix hangs - b/228830362 */
+	memset(dxio_descriptors[WLAN].port_params, 0,
+	       sizeof(dxio_descriptors[WLAN].port_params));
 }