[coreboot-gerrit] Change in coreboot[master]: mb/google/octopus: add audio codec into SSFC support for Garg/Garfour

[Werner Zeh (Code Review)]

Werner Zeh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55564 )

Change subject: mb/google/octopus: add audio codec into SSFC support for Garg/Garfour
......................................................................

mb/google/octopus: add audio codec into SSFC support for Garg/Garfour

BUG=b:191213716
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.

Signed-off-by: Kevin Chiu 
Change-Id: I2d5738442d2c173fd5b4802d8b5dff76b428c6f7
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55564
Reviewed-by: Marco Chen 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/octopus/Kconfig.name
M src/mainboard/google/octopus/variants/garg/gpio.c
M src/mainboard/google/octopus/variants/garg/overridetree.cb
3 files changed, 26 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marco Chen: Looks good to me, approved

diff --git a/src/mainboard/google/octopus/Kconfig.name b/src/mainboard/google/octopus/Kconfig.name
index b822d65..41932d7 100644
--- a/src/mainboard/google/octopus/Kconfig.name
+++ b/src/mainboard/google/octopus/Kconfig.name
@@ -69,6 +69,7 @@
    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_DOOD
    bool "->  Dood"
diff --git a/src/mainboard/google/octopus/variants/garg/gpio.c b/src/mainboard/google/octopus/variants/garg/gpio.c
index d7affc7..c285a88 100644
--- a/src/mainboard/google/octopus/variants/garg/gpio.c
+++ b/src/mainboard/google/octopus/variants/garg/gpio.c
@@ -11,6 +11,10 @@
 static const struct pad_config default_override_table[] = {
    PAD_NC(GPIO_104, UP_20K),

+	/* 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),
@@ -28,6 +32,10 @@
    PAD_CFG_NF_IOSSTATE_IOSTERM(GPIO_127, NONE, DEEP, NF1, HIZCRx1,
    			    DISPUPD),

+	/* 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),
@@ -40,6 +48,10 @@
    /* Default override table. */
    PAD_NC(GPIO_104, UP_20K),

+	/* 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/garg/overridetree.cb b/src/mainboard/google/octopus/variants/garg/overridetree.cb
index 38e5cdd..c2a6997 100644
--- a/src/mainboard/google/octopus/variants/garg/overridetree.cb
+++ b/src/mainboard/google/octopus/variants/garg/overridetree.cb
@@ -128,6 +128,19 @@
    			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