diff --git a/src/soc/amd/picasso/acpi/aoac.asl b/src/soc/amd/picasso/acpi/aoac.asl
index f26f85f205ef..727b9bb44406 100644
--- a/src/soc/amd/picasso/acpi/aoac.asl
+++ b/src/soc/amd/picasso/acpi/aoac.asl
@@ -139,7 +139,6 @@ Device (AOAC) {
 
 	AOAC_DEVICE(I2C2,	7, 0)
 	AOAC_DEVICE(I2C3,	8, 0)
-	AOAC_DEVICE(I2C4,	9, 5) /* I2C4 is powered from the S5 power group. */
 	AOAC_DEVICE(FUR1,	12, 0)
 	AOAC_DEVICE(FUR2,	16, 0)
 	AOAC_DEVICE(FUR3,	26, 0)
diff --git a/src/soc/amd/picasso/acpi/sb_fch.asl b/src/soc/amd/picasso/acpi/sb_fch.asl
index 00774fdd4fb0..7623d9b03e17 100644
--- a/src/soc/amd/picasso/acpi/sb_fch.asl
+++ b/src/soc/amd/picasso/acpi/sb_fch.asl
@@ -345,52 +345,6 @@ Device (I2C3)
 	}
 }
 
-Device (I2C4) {
-	Name (_HID, "AMD0010")
-	Name (_UID, 0x4)
-	Method (_CRS, 0) {
-		Local0 = ResourceTemplate() {
-			Interrupt (
-				ResourceConsumer,
-				Edge,
-				ActiveHigh,
-				Exclusive, , , IRQR)
-			{ 0 }
-			Memory32Fixed (ReadWrite, APU_I2C4_BASE, 0x1000)
-		}
-		CreateDWordField (Local0, IRQR._INT, IRQN)
-		If (PMOD) {
-			IRQN = II24
-		} Else {
-			IRQN = PI24
-		}
-		If (IRQN == 0x1f) {
-			Return (ResourceTemplate() {
-				Memory32Fixed (ReadWrite, APU_I2C4_BASE, 0x1000)
-			})
-		} Else {
-			Return (Local0)
-		}
-	}
-
-	Method (_STA, 0x0, NotSerialized)
-	{
-		Return (0x0F)
-	}
-
-	Name (_PR0, Package () { \_SB.AOAC.I2C4 })
-	Name (_PR2, Package () { \_SB.AOAC.I2C4 })
-	Name (_PR3, Package () { \_SB.AOAC.I2C4 })
-	Method (_PS0, 0, Serialized) {
-		Printf("I2C4._PS0")
-		\_SB.AOAC.I2C4.TDS = 1
-	}
-	Method (_PS3, 0, Serialized) {
-		Printf("I2C4._PS3")
-		\_SB.AOAC.I2C4.TDS = 3
-	}
-}
-
 Device (MISC)
 {
 	Name (_HID, "AMD0040")
diff --git a/src/soc/amd/picasso/include/soc/iomap.h b/src/soc/amd/picasso/include/soc/iomap.h
index bc2c964c63e3..295aa53089bc 100644
--- a/src/soc/amd/picasso/include/soc/iomap.h
+++ b/src/soc/amd/picasso/include/soc/iomap.h
@@ -39,7 +39,8 @@
 /* I2C parameters for lpc_read_resources */
 #define I2C_BASE_ADDRESS		APU_I2C2_BASE
 #define I2C_DEVICE_SIZE			0x00001000
-#define I2C_DEVICE_COUNT		3
+#define I2C_DEVICE_COUNT		(I2C_MASTER_DEV_COUNT \
+					 - I2C_MASTER_START_INDEX)
 
 #define APU_DMAC0_BASE			0xfedc7000
 #define APU_DMAC1_BASE			0xfedc8000