From 096833fef4eb5616a95559bb2931dc5e8c0cf594 Mon Sep 17 00:00:00 2001 From: Jenny TC Date: Tue, 11 Dec 2018 16:16:11 +0530 Subject: [PATCH] Revert "mb/google/poppy/variants/nocturne: Add DMIC properties to ACPI DSD" This reverts commit 999b916015ea0558e3821bdb51501b43a60b5ed6. The DMIC doesn't have an ACPI id. The patch which enables ACPI device with id DMIC may create conflict in the feature. Also the ACPI id "DMIC" doesn't comply with ACPI naming conventions. The issue for which the patch was introduced, is already addressed in kernel DMIC driver and the patches are upstreamed in to the Linux kernel. Change-Id: I42cb076700dcb5906599471bebfcd5b265b17644 Signed-off-by: Jenny TC Reviewed-on: https://review.coreboot.org/c/30151 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Nick Vaccaro --- src/mainboard/google/poppy/Kconfig | 1 - .../google/poppy/variants/nocturne/devicetree.cb | 13 +------------ 2 files changed, 1 insertion(+), 13 deletions(-) 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