summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Huang <tony-huang@quanta.corp-partner.google.com>2021-04-28 10:39:34 +0800
committerPatrick Georgi <pgeorgi@google.com>2021-05-06 14:36:45 +0000
commit9c9844922cf410b375047dfe1a191623f5d06699 (patch)
tree15367177ff807a65b7f427b02190b17e7434af3d
parente73e1ce9dec3522aa760d011e056e35047845645 (diff)
downloadcoreboot-9c9844922cf410b375047dfe1a191623f5d06699.tar.gz
coreboot-9c9844922cf410b375047dfe1a191623f5d06699.tar.bz2
coreboot-9c9844922cf410b375047dfe1a191623f5d06699.zip
mb/google/octopus: add audio codec into SSFC support for Bloog
BUG=b:186380809 BRANCH=octopus TEST=adjust SSFC value of CBI to select RT5682 or DA7219 then check whether device tree is updated correspondingly by disabling unselected one. Change-Id: I0975a8b64452c3f636e6c5937c6918518ec5b4e9 Signed-off-by: Tony Huang <tony-huang@quanta.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/52720 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marco Chen <marcochen@google.com>
-rw-r--r--src/mainboard/google/octopus/Kconfig.name1
-rw-r--r--src/mainboard/google/octopus/variants/bloog/gpio.c4
-rw-r--r--src/mainboard/google/octopus/variants/bloog/overridetree.cb13
3 files changed, 18 insertions, 0 deletions
diff --git a/src/mainboard/google/octopus/Kconfig.name b/src/mainboard/google/octopus/Kconfig.name
index b384a66b2258..942726e87507 100644
--- a/src/mainboard/google/octopus/Kconfig.name
+++ b/src/mainboard/google/octopus/Kconfig.name
@@ -61,6 +61,7 @@ config BOARD_GOOGLE_BLOOG
select BASEBOARD_OCTOPUS_LAPTOP
select BOARD_GOOGLE_BASEBOARD_OCTOPUS
select NHLT_DA7219 if INCLUDE_NHLT_BLOBS
+ select NHLT_RT5682 if INCLUDE_NHLT_BLOBS
config BOARD_GOOGLE_GARG
bool "-> Garg"
diff --git a/src/mainboard/google/octopus/variants/bloog/gpio.c b/src/mainboard/google/octopus/variants/bloog/gpio.c
index d27813682856..cea0451849d5 100644
--- a/src/mainboard/google/octopus/variants/bloog/gpio.c
+++ b/src/mainboard/google/octopus/variants/bloog/gpio.c
@@ -26,6 +26,10 @@ static const struct pad_config default_override_table[] = {
PAD_NC(GPIO_161, UP_20K), /* LTE_OFF_ODL -- unused */
+ /* GPIO_137 -- HP_INT_ODL and would be amend by SSFC. */
+ PAD_CFG_GPI_APIC_IOS(GPIO_137, NONE, DEEP, LEVEL, INVERT, HIZCRx1,
+ DISPUPD),
+
/* EN_PP3300_TOUCHSCREEN */
PAD_CFG_GPO_IOSSTATE_IOSTERM(GPIO_146, 0, DEEP, NONE, Tx0RxDCRx0,
DISPUPD),
diff --git a/src/mainboard/google/octopus/variants/bloog/overridetree.cb b/src/mainboard/google/octopus/variants/bloog/overridetree.cb
index 7c22ce7a0933..b585c853e34e 100644
--- a/src/mainboard/google/octopus/variants/bloog/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/bloog/overridetree.cb
@@ -100,6 +100,19 @@ chip soc/intel/apollolake
register "mic_amp_in_sel" = ""diff""
device i2c 1a on end
end
+ chip drivers/i2c/generic
+ register "hid" = ""10EC5682""
+ register "name" = ""RT58""
+ register "desc" = ""Realtek RT5682""
+ register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_137_IRQ)"
+ register "probed" = "1"
+ register "property_count" = "1"
+ # Set the jd_src to RT5668_JD1 for jack detection
+ 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 end
+ end
end # - I2C 5
device pci 17.2 on
chip drivers/i2c/generic