diff --git a/src/soc/intel/elkhartlake/acpi/scs.asl b/src/soc/intel/elkhartlake/acpi/scs.asl
index b58608feed..c6d71c1faf 100644
--- a/src/soc/intel/elkhartlake/acpi/scs.asl
+++ b/src/soc/intel/elkhartlake/acpi/scs.asl
@@ -68,7 +68,7 @@ Scope (\_SB.PCI0) {
 	/* SD CARD */
 	Device (SDXC)
 	{
-		Name (_ADR, 0x00140005)
+		Name (_ADR, 0x001A0001)
 		Name (_DDN, "SD Controller")
 		Name (TEMP, 0)
 		Name (DSUU, ToUUID("f6c13ea5-65cd-461f-ab7a-29f7e8d5bd61"))
diff --git a/src/soc/intel/elkhartlake/acpi/xhci.asl b/src/soc/intel/elkhartlake/acpi/xhci.asl
index 6557722ece..fb57065b87 100644
--- a/src/soc/intel/elkhartlake/acpi/xhci.asl
+++ b/src/soc/intel/elkhartlake/acpi/xhci.asl
@@ -40,13 +40,11 @@ Device (XHCI)
 		Device (HS08) { Name (_ADR, 8) }
 		Device (HS09) { Name (_ADR, 9) }
 		Device (HS10) { Name (_ADR, 10) }
-		Device (HS11) { Name (_ADR, 11) }
-		Device (HS12) { Name (_ADR, 12) }
 
 		/* USB3 */
-		Device (SS01) { Name (_ADR, 13) }
-		Device (SS02) { Name (_ADR, 14) }
-		Device (SS03) { Name (_ADR, 15) }
-		Device (SS04) { Name (_ADR, 16) }
+		Device (SS01) { Name (_ADR, 11) }
+		Device (SS02) { Name (_ADR, 12) }
+		Device (SS03) { Name (_ADR, 13) }
+		Device (SS04) { Name (_ADR, 14) }
 	}
 }
diff --git a/src/soc/intel/elkhartlake/include/soc/pcr_ids.h b/src/soc/intel/elkhartlake/include/soc/pcr_ids.h
index dbb886895f..20488e5b88 100644
--- a/src/soc/intel/elkhartlake/include/soc/pcr_ids.h
+++ b/src/soc/intel/elkhartlake/include/soc/pcr_ids.h
@@ -23,7 +23,6 @@
 #define PID_PSF2	0xbb
 #define PID_PSF3	0xbc
 #define PID_PSF4	0xbd
-#define PID_SCS		0xc0
 #define PID_RTC		0xc3
 #define PID_ITSS	0xc4
 #define PID_ESPI	0xc7