diff --git a/src/mainboard/google/poppy/acpi/mipi_camera.asl b/src/mainboard/google/poppy/acpi/mipi_camera.asl
index d32e7a3e08..0c3ceec146 100644
--- a/src/mainboard/google/poppy/acpi/mipi_camera.asl
+++ b/src/mainboard/google/poppy/acpi/mipi_camera.asl
@@ -86,6 +86,20 @@ Scope (\_SB.PCI0.I2C2)
 				AddressingMode7Bit, "\\_SB.PCI0.I2C2",
 				0x00, ResourceConsumer, ,
 			)
+			/* GPIO.1 is sensor SDA in daisy chain mode */
+			GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,
+				IoRestrictionInputOnly, "\\_SB.PCI0.I2C2.PMIC",
+				0x00, ResourceConsumer,,)
+			{
+				1
+			}
+			/* GPIO.2 is sensor SCL in daisy chain mode */
+			GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,
+				IoRestrictionInputOnly, "\\_SB.PCI0.I2C2.PMIC",
+				0x00, ResourceConsumer,,)
+			{
+				2
+			}
 			/* GPIO.4 is AVDD pin for user facing camera */
 			GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,
 				IoRestrictionOutputOnly, "\\_SB.PCI0.I2C2.PMIC",
@@ -292,12 +306,22 @@ Scope (\_SB.PCI0.I2C2)
 			}
 		}
 
+		/* C0GP is used to indicate if CAM0
+		 * GPIOs are configured as input.
+		 */
+		Name (C0GP, 0)
 		/* Power resource methods for CAM0 */
 		PowerResource (OVTH, 0, 0) {
 			Name (STA, 0)
 			Method (_ON, 0, Serialized) {
 				If (LEqual (AVBL, 1)) {
 					If (LEqual (STA, 0)) {
+						If (LEqual (C0GP, 0)) {
+							\_SB.PCI0.I2C2.CAM0.CGP1()
+							\_SB.PCI0.I2C2.CAM0.CGP2()
+							C0GP = 1
+						}
+
 						/* Enable VSIO regulator +
 						daisy chain */
 						DOVD(1)
@@ -505,6 +529,26 @@ Scope (\_SB.PCI0.I2C2)
 
 		Field (\_SB.PCI0.I2C2.PMIC.GPOP, ByteAcc, NoLock, Preserve)
 		{
+			Connection
+			(
+				GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,
+					IoRestrictionInputOnly, "\\_SB.PCI0.I2C2.PMIC",
+					0x00, ResourceConsumer,,)
+				{
+					1
+				}
+			),
+			GPO1, 1,
+			Connection
+			(
+				GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,
+					IoRestrictionInputOnly, "\\_SB.PCI0.I2C2.PMIC",
+					0x00, ResourceConsumer,,)
+				{
+					2
+				}
+			),
+			GPO2, 1,
 			Connection
 			(
 				GpioIo (Exclusive, PullDefault, 0x0000, 0x0000,
@@ -524,6 +568,18 @@ Scope (\_SB.PCI0.I2C2)
 			GRST = Arg0
 		}
 
+		/* Read GPO1 GPIO, to configure as input */
+		Method (CGP1, 0, Serialized)
+		{
+			Return (GPO1)
+		}
+
+		/* Read GPO2 GPIO, to configure as input */
+		Method (CGP2, 0, Serialized)
+		{
+			Return (GPO2)
+		}
+
 		Name (_PR0, Package () { ^^I2C2.PMIC.OVTH })
 		Name (_PR3, Package () { ^^I2C2.PMIC.OVTH })