diff --git a/src/mainboard/google/dedede/variants/madoo/overridetree.cb b/src/mainboard/google/dedede/variants/madoo/overridetree.cb
index d8ffd3d0c7..c793866e94 100644
--- a/src/mainboard/google/dedede/variants/madoo/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/madoo/overridetree.cb
@@ -1,7 +1,10 @@
 chip soc/intel/jasperlake
 
 	# USB Port Configuration
+	register "usb2_ports[2]" = "USB2_PORT_EMPTY"	    # Not Used
+	register "usb2_ports[4]" = "USB2_PORT_EMPTY"	    # Not Used
 	register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)"	# Camera
+	register "usb3_ports[2]" = "USB3_PORT_EMPTY"	    # Not Used
 
 	# Intel Common SoC Config
 	#+-------------------+---------------------------+
@@ -14,7 +17,7 @@ chip soc/intel/jasperlake
 	#| I2C0              | Trackpad                  |
 	#| I2C1              | Digitizer                 |
 	#| I2C2              | Touchscreen               |
-	#| I2C3              | Camera                    |
+	#| I2C3              |                           |
 	#| I2C4              | Audio                     |
 	#+-------------------+---------------------------+
 	register "common_soc_config" = "{
@@ -24,9 +27,6 @@ chip soc/intel/jasperlake
 		},
 		.i2c[0] = {
 			.speed = I2C_SPEED_FAST,
-			.rise_time_ns = 66,
-			.fall_time_ns = 90,
-			.data_hold_time_ns = 350,
 		},
 		.i2c[1] = {
 			.speed = I2C_SPEED_FAST,
@@ -34,15 +34,28 @@ chip soc/intel/jasperlake
 		.i2c[2] = {
 			.speed = I2C_SPEED_FAST,
 		},
-		.i2c[3] = {
-			.speed = I2C_SPEED_FAST,
-		},
 		.i2c[4] = {
 			.speed = I2C_SPEED_FAST,
 		},
 	}"
 	device domain 0 on
-		device pci 14.0 on end
+		device pci 14.0 on
+			chip drivers/usb/acpi
+				device usb 0.0 on
+					chip drivers/usb/acpi
+						device usb 2.2 off end
+					end
+					chip drivers/usb/acpi
+						register "desc" = ""Camera""
+						register "type" = "UPC_TYPE_INTERNAL"
+						device usb 2.5 on end
+					end
+					chip drivers/usb/acpi
+						device usb 3.2 off end
+					end
+				end
+			end
+		end # USB xHCI
 		device pci 15.0 on end
 		device pci 15.2 on end
 		device pci 1c.7 on end