diff options
| -rw-r--r-- | src/mainboard/google/brya/Kconfig.name | 3 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/vell/gpio.c | 8 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/vell/overridetree.cb | 64 |
3 files changed, 44 insertions, 31 deletions
diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index 9bf50ae5bd..e29ef9fa56 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -156,10 +156,11 @@ config BOARD_GOOGLE_TANIKS config BOARD_GOOGLE_VELL bool "-> Vell" select BOARD_GOOGLE_BASEBOARD_BRYA + select CHROMEOS_WIFI_SAR if CHROMEOS select DRIVERS_GFX_GENERIC select DRIVERS_INTEL_MIPI_CAMERA + select DRIVERS_I2C_CS35L53 select SOC_INTEL_COMMON_BLOCK_IPU - select CHROMEOS_WIFI_SAR if CHROMEOS config BOARD_GOOGLE_VOLMAR bool "-> Volmar" diff --git a/src/mainboard/google/brya/variants/vell/gpio.c b/src/mainboard/google/brya/variants/vell/gpio.c index e6588b9f85..e9600da09d 100644 --- a/src/mainboard/google/brya/variants/vell/gpio.c +++ b/src/mainboard/google/brya/variants/vell/gpio.c @@ -72,13 +72,13 @@ static const struct pad_config override_gpio_table[] = { PAD_NC(GPP_R7, NONE), /* S0 : SNDW0_CLK ==> I2S_SPKR_SCLK_R */ - PAD_CFG_NF(GPP_S0, NONE, DEEP, NF2), + PAD_CFG_NF(GPP_S0, NONE, DEEP, NF4), /* S1 : SNDW0_DATA ==> I2S_SPKR_SFRM_R */ - PAD_CFG_NF(GPP_S1, NONE, DEEP, NF2), + PAD_CFG_NF(GPP_S1, NONE, DEEP, NF4), /* S2 : SNDW1_CLK ==> DMIC_CLK0_R */ - PAD_CFG_NF(GPP_S2, NONE, DEEP, NF3), + PAD_CFG_NF(GPP_S2, NONE, DEEP, NF4), /* S3 : SNDW1_DATA ==> I2S_PCH_RX_SPKR_TX */ - PAD_CFG_NF(GPP_S3, NONE, DEEP, NF3), + PAD_CFG_NF(GPP_S3, NONE, DEEP, NF4), /* S4 : SNDW2_CLK ==> NC */ PAD_NC(GPP_S4, NONE), /* S5 : SNDW2_DATA ==> NC */ diff --git a/src/mainboard/google/brya/variants/vell/overridetree.cb b/src/mainboard/google/brya/variants/vell/overridetree.cb index 4199cec6a6..3af316406f 100644 --- a/src/mainboard/google/brya/variants/vell/overridetree.cb +++ b/src/mainboard/google/brya/variants/vell/overridetree.cb @@ -172,33 +172,45 @@ chip soc/intel/alderlake end end device ref i2c0 on - chip drivers/i2c/generic - register "hid" = ""10EC5682"" - register "name" = ""RT58"" - register "desc" = ""Headset Codec"" - register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_A23)" - # 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 + 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/generic - register "hid" = ""RTL5682"" - register "name" = ""RT58"" - register "desc" = ""Headset Codec"" - register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPP_A23)" - # 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_ALC5682IVS_I2S - 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 "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 0x42 on end + end + chip drivers/i2c/cs35l53 + register "name" = ""SPK3"" + 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 0x43 on end end end #I2C0 device ref i2c1 on |