1 files changed, 0 insertions, 62 deletions

diff --git a/src/mainboard/intel/kblrvp/mainboard.c b/src/mainboard/intel/kblrvp/mainboard.c
index fe4fb3ab24..cd6c3f90be 100644
--- a/src/mainboard/intel/kblrvp/mainboard.c
+++ b/src/mainboard/intel/kblrvp/mainboard.c
@@ -26,73 +26,12 @@
 #include "ec.h"
 #include "gpio.h"
 
-static const char *oem_id_maxim = "INTEL";
-static const char *oem_table_id_maxim = "SCRDMAX";
-
 static void mainboard_init(device_t dev)
 {
 	if (IS_ENABLED(CONFIG_EC_GOOGLE_CHROMEEC))
 		mainboard_ec_init();
 }
 
-static uint8_t select_audio_codec(void)
-{
-	int audio_db_sel = gpio_get(AUDIO_DB_ID);
-
-	return audio_db_sel;
-}
-
-static unsigned long mainboard_write_acpi_tables(
-	device_t device, unsigned long current, acpi_rsdp_t *rsdp)
-{
-		uintptr_t start_addr;
-		uintptr_t end_addr;
-		struct nhlt *nhlt;
-		const char *oem_id = NULL;
-		const char *oem_table_id = NULL;
-
-		start_addr = current;
-
-		nhlt = nhlt_init();
-
-		if (nhlt == NULL)
-			return start_addr;
-
-		/* 2 Channel DMIC array. */
-		if (nhlt_soc_add_dmic_array(nhlt, 2))
-			printk(BIOS_ERR, "Couldn't add 2CH DMIC array.\n");
-
-
-		/* 4 Channel DMIC array. */
-		if (nhlt_soc_add_dmic_array(nhlt, 4))
-			printk(BIOS_ERR, "Couldn't add 4CH DMIC arrays.\n");
-
-		if (select_audio_codec()) {
-			/* ADI Smart Amps for left and right. */
-			if (nhlt_soc_add_ssm4567(nhlt, AUDIO_LINK_SSP0))
-				printk(BIOS_ERR, "Couldn't add ssm4567.\n");
-		} else {
-			/* MAXIM Smart Amps for left and right. */
-			if (nhlt_soc_add_max98357(nhlt, AUDIO_LINK_SSP0))
-				printk(BIOS_ERR, "Couldn't add max98357.\n");
-
-			oem_id = oem_id_maxim;
-			oem_table_id = oem_table_id_maxim;
-		}
-
-		/* NAU88l25 Headset codec. */
-		if (nhlt_soc_add_nau88l25(nhlt, AUDIO_LINK_SSP1))
-			printk(BIOS_ERR, "Couldn't add headset codec.\n");
-
-		end_addr = nhlt_soc_serialize_oem_overrides(nhlt, start_addr,
-						 oem_id, oem_table_id);
-
-		if (end_addr != start_addr)
-			acpi_add_table(rsdp, (void *)start_addr);
-
-		return end_addr;
-}
-
 /*
  * mainboard_enable is executed as first thing after
  * enumerate_buses().
@@ -100,7 +39,6 @@ static unsigned long mainboard_write_acpi_tables(
 static void mainboard_enable(device_t dev)
 {
 	dev->ops->init = mainboard_init;
-	dev->ops->write_acpi_tables = mainboard_write_acpi_tables;
 	dev->ops->acpi_inject_dsdt_generator = chromeos_dsdt_generator;
 }