diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/google/eve/Kconfig | 2 | ||||
| -rw-r--r-- | src/mainboard/google/eve/devicetree.cb | 15 | ||||
| -rw-r--r-- | src/mainboard/google/eve/mainboard.c | 6 |
3 files changed, 18 insertions, 5 deletions
diff --git a/src/mainboard/google/eve/Kconfig b/src/mainboard/google/eve/Kconfig index f51134c73e..b4442f2f20 100644 --- a/src/mainboard/google/eve/Kconfig +++ b/src/mainboard/google/eve/Kconfig @@ -66,7 +66,7 @@ config MAX_CPUS config INCLUDE_NHLT_BLOBS bool "Include blobs for audio." - select NHLT_DMIC_4CH + select NHLT_RT5514 select NHLT_RT5663 select NHLT_MAX98927 diff --git a/src/mainboard/google/eve/devicetree.cb b/src/mainboard/google/eve/devicetree.cb index 0de7a263f7..1cef26c388 100644 --- a/src/mainboard/google/eve/devicetree.cb +++ b/src/mainboard/google/eve/devicetree.cb @@ -281,6 +281,12 @@ chip soc/intel/skylake register "probed" = "1" device i2c 13 on end end + chip drivers/i2c/generic + register "hid" = ""10EC5514"" + register "name" = ""RT54"" + register "desc" = ""Realtek RT5514"" + device i2c 57 on end + end end # I2C #4 device pci 1c.0 on chip drivers/intel/wifi @@ -301,7 +307,14 @@ chip soc/intel/skylake device pci 1d.3 off end # PCI Express Port 12 device pci 1e.0 on end # UART #0 device pci 1e.1 off end # UART #1 - device pci 1e.2 on end # GSPI #0 + device pci 1e.2 on + chip drivers/spi/acpi + register "hid" = "ACPI_DT_NAMESPACE_HID" + register "compat_string" = ""realtek,rt5514"" + register "irq" = "ACPI_IRQ_LEVEL_HIGH(GPP_F10_IRQ)" + device spi 0 on end + end + end # GSPI #0 device pci 1e.3 on chip drivers/spi/acpi register "hid" = "ACPI_DT_NAMESPACE_HID" diff --git a/src/mainboard/google/eve/mainboard.c b/src/mainboard/google/eve/mainboard.c index 2b1010182c..dda0cfacfd 100644 --- a/src/mainboard/google/eve/mainboard.c +++ b/src/mainboard/google/eve/mainboard.c @@ -46,9 +46,9 @@ static unsigned long mainboard_write_acpi_tables( if (!nhlt) return start_addr; - /* 4 Channel DMIC array. */ - if (nhlt_soc_add_dmic_array(nhlt, 4)) - printk(BIOS_ERR, "Couldn't add 4CH DMIC arrays.\n"); + /* 4 Channel DMIC array */ + if (nhlt_soc_add_rt5514(nhlt, AUDIO_LINK_SSP0, 4)) + printk(BIOS_ERR, "Couldn't add rt5514.\n"); /* RT5663 Headset codec */ if (nhlt_soc_add_rt5663(nhlt, AUDIO_LINK_SSP1)) |