summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Huang <tony-huang@quanta.corp-partner.google.com>2022-03-30 14:59:19 +0800
committerTim Wawrzynczak <twawrzynczak@chromium.org>2022-03-31 15:03:36 +0000
commitf00ab8c26a2b5881c2a9f442194d7d5e59348f8a (patch)
treead4f0a7e53feb9b18aa3d09b0986c3d7c00a14ea
parentbcfc87dbfff70a71a2a5c398b9adeda541e6ee9c (diff)
downloadcoreboot-f00ab8c26a2b5881c2a9f442194d7d5e59348f8a.tar.gz
coreboot-f00ab8c26a2b5881c2a9f442194d7d5e59348f8a.tar.bz2
coreboot-f00ab8c26a2b5881c2a9f442194d7d5e59348f8a.zip
mb/google/brya/var/agah: Replace amp max98390 with max98360
Based on the latest schematic, agah will replace the Maxim 98390 speaker amps with Maxim max98360. This patch updates the devicetree entries to reflect that. BUG=b:210970640 BRANCH=brya TEST=emerge-draco coreboot Change-Id: I7ea36d276f7ffeae1510483027092e2bc59690fc Signed-off-by: Tony Huang <tony-huang@quanta.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/63196 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
-rw-r--r--src/mainboard/google/brya/Kconfig.name1
-rw-r--r--src/mainboard/google/brya/variants/agah/overridetree.cb31
2 files changed, 9 insertions, 23 deletions
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name
index 4590ec6f2b51..3126d28495b2 100644
--- a/src/mainboard/google/brya/Kconfig.name
+++ b/src/mainboard/google/brya/Kconfig.name
@@ -4,7 +4,6 @@ config BOARD_GOOGLE_AGAH
bool "-> Agah"
select BOARD_GOOGLE_BASEBOARD_BRYA
select DRIVERS_GENESYSLOGIC_GL9750
- select DRIVERS_I2C_MAX98390
select PCIEXP_SUPPORT_RESIZABLE_BARS
select RT8168_GEN_ACPI_POWER_RESOURCE
select RT8168_GET_MAC_FROM_VPD
diff --git a/src/mainboard/google/brya/variants/agah/overridetree.cb b/src/mainboard/google/brya/variants/agah/overridetree.cb
index 97fa9905e4b4..a7286a85724a 100644
--- a/src/mainboard/google/brya/variants/agah/overridetree.cb
+++ b/src/mainboard/google/brya/variants/agah/overridetree.cb
@@ -127,28 +127,6 @@ chip soc/intel/alderlake
register "property_list[0].integer" = "1"
device i2c 1a on end
end
- chip drivers/i2c/max98390
- register "desc" = ""MAX98390 Speaker Amp 0""
- register "uid" = "0"
- register "name" = ""MXW0""
- register "r0_calib_key" = ""dsm_calib_r0_0""
- register "temperature_calib_key" = ""dsm_calib_temp_0""
- register "dsm_param_file_name" = ""dsm_param_R""
- register "vmon_slot_no" = "0"
- register "imon_slot_no" = "1"
- device i2c 0x3a on end
- end
- chip drivers/i2c/max98390
- register "desc" = ""MAX98390 Speaker Amp 1""
- register "uid" = "1"
- register "name" = ""MXW1""
- register "r0_calib_key" = ""dsm_calib_r0_1""
- register "temperature_calib_key" = ""dsm_calib_temp_1""
- register "dsm_param_file_name" = ""dsm_param_L""
- register "vmon_slot_no" = "1"
- register "imon_slot_no" = "0"
- device i2c 0x3b on end
- end
end #I2C0
device ref i2c1 on end # GPU
device ref i2c2 on end # External GPU
@@ -191,6 +169,15 @@ chip soc/intel/alderlake
device generic 0 on end
end
end #PCIE8 SD card
+ device ref hda on
+ chip drivers/generic/max98357a
+ register "hid" = ""MX98360A""
+ register "sdmode_gpio" =
+ "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)"
+ register "sdmode_delay" = "5"
+ device generic 0 on end
+ end
+ end
device ref pch_espi on
chip ec/google/chromeec
use conn0 as mux_conn[0]