2 files changed, 23 insertions, 0 deletions
diff --git a/src/mainboard/google/octopus/variants/bobba/overridetree.cb b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
index 6cd4c61796..c786a5d2b6 100644
--- a/src/mainboard/google/octopus/variants/bobba/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bobba/overridetree.cb
@@ -214,4 +214,5 @@ chip soc/intel/apollolake
 
 	# Disable compliance mode
 	register "DisableComplianceMode" = "1"
+	register "disable_xhci_lfps_pm" = "0"
 end
diff --git a/src/mainboard/google/octopus/variants/bobba/variant.c b/src/mainboard/google/octopus/variants/bobba/variant.c
index 57b706795d..089337ab4c 100644
--- a/src/mainboard/google/octopus/variants/bobba/variant.c
+++ b/src/mainboard/google/octopus/variants/bobba/variant.c
@@ -8,6 +8,7 @@
 #include <delay.h>
 #include <gpio.h>
 #include <ec/google/chromeec/ec.h>
+#include <soc/intel/apollolake/chip.h>
 
 enum {
 	SKU_37_DROID = 37, /* LTE */
@@ -74,3 +75,24 @@ void variant_smi_sleep(u8 slp_typ)
 		return;
 	}
 }
+
+
+void variant_update_devtree(struct device *dev)
+{
+	struct soc_intel_apollolake_config *cfg = NULL;
+
+	cfg = (struct soc_intel_apollolake_config *)dev->chip_info;
+
+	if (cfg != NULL && cfg->disable_xhci_lfps_pm) {
+		switch (google_chromeec_get_board_sku()) {
+		case 37:
+		case 38:
+		case 39:
+		case 40:
+			cfg->disable_xhci_lfps_pm = 1;
+			return;
+		default:
+			return;
+		}
+	}
+}