<p>Sathyanarayana Nujella has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/24918">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mainboard/intel/cannonlake_rvp: include correct SND related DT entries<br><br>For cannonlake_rvp, want to support two SND configurations based on<br>relevant daughter board connected (either of these configurations:<br>SND_MAX98373_NHLT and SND_MAX98357_DA7219_NHLT).<br>By default SSDT included all codec entries.<br>This patch corrects and includes relevant codec entries in SSDT<br><br>Change-Id: I4f9487f3a81ef2d24315f75ec1d34bfab8560224<br>Signed-off-by: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com><br>---<br>M src/mainboard/intel/cannonlake_rvp/Kconfig<br>M src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb<br>2 files changed, 26 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/24918/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/intel/cannonlake_rvp/Kconfig b/src/mainboard/intel/cannonlake_rvp/Kconfig</span><br><span>index fb6f9b1..3104331 100644</span><br><span>--- a/src/mainboard/intel/cannonlake_rvp/Kconfig</span><br><span>+++ b/src/mainboard/intel/cannonlake_rvp/Kconfig</span><br><span>@@ -3,9 +3,6 @@</span><br><span> config BOARD_SPECIFIC_OPTIONS</span><br><span> def_bool y</span><br><span> select BOARD_ROMSIZE_KB_16384</span><br><span style="color: hsl(0, 100%, 40%);">- select DRIVERS_GENERIC_MAX98357A</span><br><span style="color: hsl(0, 100%, 40%);">- select DRIVERS_I2C_DA7219</span><br><span style="color: hsl(0, 100%, 40%);">- select DRIVERS_I2C_MAX98373</span><br><span> select GENERIC_SPD_BIN</span><br><span> select HAVE_ACPI_RESUME</span><br><span> select HAVE_ACPI_TABLES</span><br><span>@@ -51,6 +48,8 @@</span><br><span> </span><br><span> config INCLUDE_SND_MAX98357_DA7219_NHLT</span><br><span> bool "Include blobs for audio with MAX98357_DA7219"</span><br><span style="color: hsl(120, 100%, 40%);">+ select DRIVERS_GENERIC_MAX98357A</span><br><span style="color: hsl(120, 100%, 40%);">+ select DRIVERS_I2C_DA7219</span><br><span> select NHLT_DMIC_4CH_16B</span><br><span> select NHLT_DMIC_2CH_16B</span><br><span> select NHLT_DA7219</span><br><span>@@ -58,6 +57,7 @@</span><br><span> </span><br><span> config INCLUDE_SND_MAX98373_NHLT</span><br><span> bool "Include blobs for audio with MAX98373"</span><br><span style="color: hsl(120, 100%, 40%);">+ select DRIVERS_I2C_MAX98373</span><br><span> select NHLT_DMIC_4CH_16B</span><br><span> select NHLT_DMIC_2CH_16B</span><br><span> select NHLT_MAX98373</span><br><span>diff --git a/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb b/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb</span><br><span>index 8502048..17cb2cb 100644</span><br><span>--- a/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb</span><br><span>+++ b/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb</span><br><span>@@ -32,6 +32,8 @@</span><br><span> </span><br><span> register "PchHdaDspEnable" = "1"</span><br><span> register "PchHdaAudioLinkHda" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "PchHdaAudioLinkSsp0" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "PchHdaAudioLinkSsp1" = "1"</span><br><span> </span><br><span> register "PcieRpEnable[0]" = "1"</span><br><span> register "PcieRpEnable[1]" = "1"</span><br><span>@@ -91,6 +93,24 @@</span><br><span> device pci 15.1 on end # I2C #1</span><br><span> device pci 15.2 off end # I2C #2</span><br><span> device pci 15.3 on</span><br><span style="color: hsl(120, 100%, 40%);">+ #if IS_ENABLED(CONFIG_INCLUDE_SND_MAX98373_NHLT)</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/max98373</span><br><span style="color: hsl(120, 100%, 40%);">+ register "vmon_slot_no" = "4"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "imon_slot_no" = "5"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "uid" = "0"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""RIGHT SPEAKER AMP""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "name" = ""MAXR""</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 31 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/max98373</span><br><span style="color: hsl(120, 100%, 40%);">+ register "vmon_slot_no" = "6"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "imon_slot_no" = "7"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "uid" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""LEFT SPEAKER AMP""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "name" = ""MAXL""</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 32 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ #elif IS_ENABLED(CONFIG_INCLUDE_SND_MAX98357_DA7219_NHLT)</span><br><span> chip drivers/i2c/da7219</span><br><span> register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_A20)"</span><br><span> register "btn_cfg" = "50"</span><br><span>@@ -108,6 +128,7 @@</span><br><span> register "mic_amp_in_sel" = ""diff""</span><br><span> device i2c 1a on end</span><br><span> end</span><br><span style="color: hsl(120, 100%, 40%);">+ #endif</span><br><span> end # I2C #3</span><br><span> device pci 16.0 on end # Management Engine Interface 1</span><br><span> device pci 16.1 off end # Management Engine Interface 2</span><br><span>@@ -144,6 +165,7 @@</span><br><span> end # LPC Interface</span><br><span> device pci 1f.1 on end # P2SB</span><br><span> device pci 1f.2 on end # Power Management Controller</span><br><span style="color: hsl(120, 100%, 40%);">+ #if IS_ENABLED(CONFIG_INCLUDE_SND_MAX98357_DA7219_NHLT)</span><br><span> device pci 1f.3 on</span><br><span> chip drivers/generic/max98357a</span><br><span> register "sdmode_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D16)"</span><br><span>@@ -151,6 +173,7 @@</span><br><span> device generic 0 on end</span><br><span> end</span><br><span> end # Intel HDA</span><br><span style="color: hsl(120, 100%, 40%);">+ #endif</span><br><span> device pci 1f.4 on end # SMBus</span><br><span> device pci 1f.5 on end # PCH SPI</span><br><span> device pci 1f.6 off end # GbE</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/24918">change 24918</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/24918"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I4f9487f3a81ef2d24315f75ec1d34bfab8560224 </div>
<div style="display:none"> Gerrit-Change-Number: 24918 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Sathyanarayana Nujella <sathyanarayana.nujella@intel.com> </div>