From 54516673a4554b97a1ac819ba3afcb28e47c11ce Mon Sep 17 00:00:00 2001 From: "eddylu@ami.corp-partner.google.com" Date: Thu, 19 May 2022 11:47:37 +0800 Subject: mb/google/brya/var/vell: Move SPK0/SPK1 to I2C7 To support speaker AMP CS35L53-CWZR'S I2C needs to split to two I2C ports BUG=b:207333035 BRANCH=none TEST=built and verified speaker Signed-off-by: Eddy Lu Change-Id: I8095abc4fc3233b21b818a508c84cd59b39fc1d6 Reviewed-on: https://review.coreboot.org/c/coreboot/+/63756 Tested-by: build bot (Jenkins) Reviewed-by: Martin L Roth Reviewed-by: Shon Wang --- .../google/brya/variants/vell/overridetree.cb | 59 ++++++++++++++-------- 1 file changed, 38 insertions(+), 21 deletions(-) (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/brya/variants/vell/overridetree.cb b/src/mainboard/google/brya/variants/vell/overridetree.cb index 7cbdb5ee4a..f40b52beec 100644 --- a/src/mainboard/google/brya/variants/vell/overridetree.cb +++ b/src/mainboard/google/brya/variants/vell/overridetree.cb @@ -225,29 +225,13 @@ chip soc/intel/alderlake end end device ref i2c0 on - chip drivers/i2c/cs35l53 - register "name" = ""SPK0"" - register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_D14)" - register "boost_type" = "EXTERNAL_BOOST" - register "asp_sdout_hiz" = "ASP_SDOUT_LOGIC0_UNUSED_LOGIC0_DISABLED" - register "gpio1_output_enable" = "true" - register "gpio1_src_select" = "GPIO1_SRC_GPIO" - register "gpio2_src_select" = "GPIO2_SRC_HIGH_IMPEDANCE" - device i2c 0x40 on end - end - chip drivers/i2c/cs35l53 - register "name" = ""SPK1"" - register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_D14)" - register "boost_type" = "EXTERNAL_BOOST" - register "asp_sdout_hiz" = "ASP_SDOUT_LOGIC0_UNUSED_LOGIC0_DISABLED" - register "gpio1_output_enable" = "true" - register "gpio1_src_select" = "GPIO1_SRC_GPIO" - register "gpio2_src_select" = "GPIO2_SRC_HIGH_IMPEDANCE" - device i2c 0x41 on end - end chip drivers/i2c/cs35l53 register "name" = ""SPK2"" + register "sub" = ""103CA221"" + register "desc" = ""Cirrus Logic CS35L53 Tweeter Right Audio Codec"" + register "uid" = "3" register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_D14)" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)" register "boost_type" = "EXTERNAL_BOOST" register "asp_sdout_hiz" = "ASP_SDOUT_LOGIC0_UNUSED_LOGIC0_DISABLED" register "gpio1_output_enable" = "true" @@ -257,7 +241,11 @@ chip soc/intel/alderlake end chip drivers/i2c/cs35l53 register "name" = ""SPK3"" + register "sub" = ""103CA221"" + register "desc" = ""Cirrus Logic CS35L53 Woofer Right Audio Codec"" + register "uid" = "1" register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_D14)" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)" register "boost_type" = "EXTERNAL_BOOST" register "asp_sdout_hiz" = "ASP_SDOUT_LOGIC0_UNUSED_LOGIC0_DISABLED" register "gpio1_output_enable" = "true" @@ -362,7 +350,36 @@ chip soc/intel/alderlake device i2c 15 on end end end - device ref i2c7 on end + device ref i2c7 on + chip drivers/i2c/cs35l53 + register "name" = ""SPK0"" + register "sub" = ""103CA221"" + register "desc" = ""Cirrus Logic CS35L53 Tweeter Left Audio Codec"" + register "uid" = "2" + register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_D14)" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)" + register "boost_type" = "EXTERNAL_BOOST" + register "asp_sdout_hiz" = "ASP_SDOUT_LOGIC0_UNUSED_LOGIC0_DISABLED" + register "gpio1_output_enable" = "true" + register "gpio1_src_select" = "GPIO1_SRC_GPIO" + register "gpio2_src_select" = "GPIO2_SRC_HIGH_IMPEDANCE" + device i2c 0x40 on end + end + chip drivers/i2c/cs35l53 + register "name" = ""SPK1"" + register "sub" = ""103CA221"" + register "desc" = ""Cirrus Logic CS35L53 Woofer Left Audio Codec"" + register "uid" = "0" + register "irq_gpio" = "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_D14)" + register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_A11)" + register "boost_type" = "EXTERNAL_BOOST" + register "asp_sdout_hiz" = "ASP_SDOUT_LOGIC0_UNUSED_LOGIC0_DISABLED" + register "gpio1_output_enable" = "true" + register "gpio1_src_select" = "GPIO1_SRC_GPIO" + register "gpio2_src_select" = "GPIO2_SRC_HIGH_IMPEDANCE" + device i2c 0x41 on end + end + end device ref gspi1 on chip drivers/spi/acpi register "name" = ""CRFP"" -- cgit v1.2.3