diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig
index 58c627c94b..789578f728 100644
--- a/src/mainboard/google/poppy/Kconfig
+++ b/src/mainboard/google/poppy/Kconfig
@@ -3,7 +3,6 @@ config BOARD_GOOGLE_BASEBOARD_POPPY
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_GENERIC_GPIO_KEYS
-	select DRIVERS_GENERIC_GENERIC
 	select DRIVERS_I2C_GENERIC
 	select DRIVERS_I2C_HID
 	select EC_GOOGLE_CHROMEEC
diff --git a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
index 031c7ff369..76b97732d8 100644
--- a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb
@@ -468,18 +468,7 @@ chip soc/intel/skylake
 		end # LPC Interface
 		device pci 1f.1 on  end # P2SB
 		device pci 1f.2 on  end # Power Management Controller
-		device pci 1f.3 on
-			chip drivers/generic/generic
-				register "hid" = ""DMIC""
-				register "name" = ""DMIC""
-				register "desc" = ""Generic DMIC""
-				register "property_count" = "1"
-				register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
-				register "property_list[0].name" = ""modeswitch_delay_ms""
-				register "property_list[0].integer" = "35"
-				device generic 0 on end
-			end
-		end # Intel HDA
+		device pci 1f.3 on  end # Intel HDA
 		device pci 1f.4 on  end # SMBus
 		device pci 1f.5 on  end # PCH SPI
 		device pci 1f.6 off end # GbE