diff options
| -rw-r--r-- | src/mainboard/google/rex/Kconfig | 4 | ||||
| -rw-r--r-- | src/mainboard/google/rex/variants/karis/overridetree.cb | 64 |
2 files changed, 1 insertions, 67 deletions
diff --git a/src/mainboard/google/rex/Kconfig b/src/mainboard/google/rex/Kconfig index b289408633..7d384bdf4c 100644 --- a/src/mainboard/google/rex/Kconfig +++ b/src/mainboard/google/rex/Kconfig @@ -72,10 +72,6 @@ config BOARD_GOOGLE_MODEL_SCREEBO config BOARD_GOOGLE_MODEL_KARIS def_bool n select BOARD_GOOGLE_BASEBOARD_REX - select DRIVERS_GENERIC_MAX98357A - select DRIVERS_INTEL_SOUNDWIRE - select DRIVERS_SOUNDWIRE_CS42L42 - select DRIVERS_SOUNDWIRE_MAX98363 config BOARD_GOOGLE_BASEBOARD_OVIS def_bool n diff --git a/src/mainboard/google/rex/variants/karis/overridetree.cb b/src/mainboard/google/rex/variants/karis/overridetree.cb index 42106daefa..6ff22d2c0a 100644 --- a/src/mainboard/google/rex/variants/karis/overridetree.cb +++ b/src/mainboard/google/rex/variants/karis/overridetree.cb @@ -1,9 +1,4 @@ fw_config - field AUDIO 0 3 - option AUDIO_UNKNOWN 0 - option MAX98360_ALC5682I_I2S 1 - option MAX98363_CS42L42_SNDW 2 - end field DB_USB 12 14 option USB_UNKNOWN 0 option USB3_PS8815 1 @@ -362,20 +357,6 @@ chip soc/intel/meteorlake end device ref i2c0 on chip drivers/i2c/generic - register "hid" = ""RTL5682"" - register "name" = ""RT58"" - register "desc" = ""Headset Codec"" - register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_B06)" - # Set the jd_src to RT5668_JD1 for jack detection - register "property_count" = "1" - register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER" - register "property_list[0].name" = ""realtek,jd-src"" - register "property_list[0].integer" = "1" - device i2c 1a on - probe AUDIO MAX98360_ALC5682I_I2S - end - end - chip drivers/i2c/generic register "hid" = ""10EC5650"" register "name" = ""RT58"" register "desc" = ""Realtek RT5650"" @@ -566,49 +547,6 @@ chip soc/intel/meteorlake end end end - device ref hda on - chip drivers/generic/max98357a - register "hid" = ""MX98360A"" - register "sdmode_gpio" = - "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D04)" - register "sdmode_delay" = "5" - device generic 0 on - probe AUDIO MAX98360_ALC5682I_I2S - end - end - chip drivers/intel/soundwire - device generic 0 on - probe AUDIO MAX98363_CS42L42_SNDW - chip drivers/soundwire/cs42l42 - # SoundWire Link 0 ID 0 - register "desc" = ""Headset Codec"" - register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_B07)" - register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_B06)" - register "ts_inv" = "true" - register "ts_dbnc_rise" = "RISE_DEB_1000_MS" - register "ts_dbnc_fall" = "FALL_DEB_0_MS" - register "btn_det_init_dbnce" = "100" - register "btn_det_event_dbnce" = "10" - register "bias_lvls[0]" = "15" - register "bias_lvls[1]" = "8" - register "bias_lvls[2]" = "4" - register "bias_lvls[3]" = "1" - register "hs_bias_ramp_rate" = "HSBIAS_RAMP_SLOW" - register "hs_bias_sense_disable" = "true" - device generic 0.0 on end - end - chip drivers/soundwire/max98363 - # SoundWire Link 2 ID 0 - register "desc" = ""Left Speaker Amp"" - device generic 2.0 on end - end - chip drivers/soundwire/max98363 - # SoundWire Link 2 ID 1 - register "desc" = ""Right Speaker Amp"" - device generic 2.1 on end - end - end - end - end + device ref hda on end end end |