summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb2
-rw-r--r--src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb2
-rw-r--r--src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c4
-rw-r--r--src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c4
-rw-r--r--src/mainboard/google/zork/variants/baseboard/ramstage_common.c55
5 files changed, 61 insertions, 6 deletions
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
index 9b40ca05b4..c60373b999 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
@@ -308,7 +308,7 @@ chip soc/amd/picasso
register "name" = ""RT58""
register "uid" = "1"
register "desc" = ""Realtek RT5682""
- register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(62)"
+ register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPIO_84)"
register "property_count" = "2"
register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
register "property_list[0].name" = ""realtek,jd-src""
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
index 1b43cc83c8..6d26179afd 100644
--- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
+++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
@@ -333,7 +333,7 @@ chip soc/amd/picasso
register "name" = ""RT58""
register "uid" = "1"
register "desc" = ""Realtek RT5682""
- register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(62)"
+ register "irq_gpio" = "ACPI_GPIO_IRQ_EDGE_BOTH(GPIO_29)"
register "property_count" = "2"
register "property_list[0].type" = "ACPI_DP_TYPE_INTEGER"
register "property_list[0].name" = ""realtek,jd-src""
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
index 5568194a47..a07529ff9d 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_dalboz.c
@@ -93,8 +93,8 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
/* EN_PWR_CAMERA */
PAD_GPO(GPIO_76, HIGH),
/* GPIO_77 - GPIO_83: Not available */
- /* UNUSED */
- PAD_NC(GPIO_84),
+ /* HP_INT_ODL */
+ PAD_GPI(GPIO_84, PULL_NONE),
/* APU_EDP_BL_DISABLE TODP: Set low in depthcharge */
PAD_GPO(GPIO_85, HIGH),
/* RAM ID 2 */
diff --git a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
index c10c9f4376..c6c728e08f 100644
--- a/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
+++ b/src/mainboard/google/zork/variants/baseboard/gpio_baseboard_trembyle.c
@@ -65,8 +65,8 @@ static const struct soc_amd_gpio gpio_set_stage_ram[] = {
/* PCIE_RST1_L (unused) */
PAD_NC(GPIO_27),
/* GPIO_28: Not available */
- /* GPIO_29: unused */
- PAD_NC(GPIO_29),
+ /* GPIO_29: HP_INT_ODL */
+ PAD_GPI(GPIO_29, PULL_NONE),
/* FCH_ESPI_EC_CS_L */
PAD_NF(GPIO_30, ESPI_CS_L, PULL_NONE),
/* EC_AP_INT_ODL (Sensor Framesync) */
diff --git a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
index b2c5830d10..298837b54b 100644
--- a/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
+++ b/src/mainboard/google/zork/variants/baseboard/ramstage_common.c
@@ -5,12 +5,65 @@
#include <console/console.h>
#include <device/device.h>
#include <drivers/amd/i2s_machine_dev/chip.h>
+#include <drivers/i2c/generic/chip.h>
#include <drivers/usb/acpi/chip.h>
#include <ec/google/chromeec/ec.h>
#include <soc/gpio.h>
#include <soc/pci_devs.h>
extern struct chip_operations drivers_amd_i2s_machine_dev_ops;
+extern struct chip_operations drivers_i2c_generic_ops;
+
+
+static void update_hp_int_odl(void)
+{
+
+ static const struct device_path rt5682_path[] = {
+ {
+ .type = DEVICE_PATH_PCI,
+ .pci.devfn = LPC_DEVFN
+ },
+ {
+ .type = DEVICE_PATH_PNP,
+ .pnp.port = 0xc09,
+ .pnp.device = 0x0
+ },
+ {
+ .type = DEVICE_PATH_GENERIC,
+ .generic.id = 0,
+ .generic.subid = 0
+ },
+ {
+ .type = DEVICE_PATH_I2C,
+ .i2c.device = 0x1a
+ }
+ };
+
+ const struct device *rt5682_dev;
+ struct drivers_i2c_generic_config *cfg;
+ struct acpi_gpio *gpio;
+
+ if (!variant_uses_codec_gpi())
+ return;
+
+ rt5682_dev = find_dev_nested_path(
+ pci_root_bus(), rt5682_path, ARRAY_SIZE(rt5682_path));
+ if (!rt5682_dev) {
+ printk(BIOS_ERR, "%s: Failed to find audio device\n",
+ __func__);
+ return;
+ }
+
+ if (rt5682_dev->chip_ops != &drivers_i2c_generic_ops) {
+ printk(BIOS_ERR, "%s: Incorrect device found\n", __func__);
+ return;
+ }
+
+ cfg = config_of(rt5682_dev);
+ gpio = &cfg->irq_gpio;
+ gpio->pins[0] = 62;
+
+}
void variant_audio_update(void)
{
@@ -49,6 +102,8 @@ void variant_audio_update(void)
break;
}
+
+ update_hp_int_odl();
}
static const struct device_path xhci0_bt_path[] = {