Change in coreboot[master]: mainboard/intel/cannonlake_rvp: include correct SND related DT entries

[Sathyanarayana Nujella (Code Review)]

Sathyanarayana Nujella has uploaded this change for review. ( https://review.coreboot.org/24918

Change subject: mainboard/intel/cannonlake_rvp: include correct SND related DT entries
......................................................................

mainboard/intel/cannonlake_rvp: include correct SND related DT entries

For cannonlake_rvp, want to support two SND configurations based on
relevant daughter board connected (either of these configurations:
SND_MAX98373_NHLT and SND_MAX98357_DA7219_NHLT).
By default SSDT included all codec entries.
This patch corrects and includes relevant codec entries in SSDT

Change-Id: I4f9487f3a81ef2d24315f75ec1d34bfab8560224
Signed-off-by: Sathyanarayana Nujella 
---
M src/mainboard/intel/cannonlake_rvp/Kconfig
M src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb
2 files changed, 26 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/18/24918/1

diff --git a/src/mainboard/intel/cannonlake_rvp/Kconfig b/src/mainboard/intel/cannonlake_rvp/Kconfig
index fb6f9b1..3104331 100644
--- a/src/mainboard/intel/cannonlake_rvp/Kconfig
+++ b/src/mainboard/intel/cannonlake_rvp/Kconfig
@@ -3,9 +3,6 @@
 config BOARD_SPECIFIC_OPTIONS
    def_bool y
    select BOARD_ROMSIZE_KB_16384
-	select DRIVERS_GENERIC_MAX98357A
-	select DRIVERS_I2C_DA7219
-	select DRIVERS_I2C_MAX98373
    select GENERIC_SPD_BIN
    select HAVE_ACPI_RESUME
    select HAVE_ACPI_TABLES
@@ -51,6 +48,8 @@

config INCLUDE_SND_MAX98357_DA7219_NHLT
    bool "Include blobs for audio with MAX98357_DA7219"
+	select DRIVERS_GENERIC_MAX98357A
+	select DRIVERS_I2C_DA7219
    select NHLT_DMIC_4CH_16B
    select NHLT_DMIC_2CH_16B
    select NHLT_DA7219
@@ -58,6 +57,7 @@

config INCLUDE_SND_MAX98373_NHLT
    bool "Include blobs for audio with MAX98373"
+	select DRIVERS_I2C_MAX98373
    select NHLT_DMIC_4CH_16B
    select NHLT_DMIC_2CH_16B
    select NHLT_MAX98373
diff --git a/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb b/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb
index 8502048..17cb2cb 100644
--- a/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb
+++ b/src/mainboard/intel/cannonlake_rvp/variants/cnl_y/devicetree.cb
@@ -32,6 +32,8 @@

register "PchHdaDspEnable" = "1"
    register "PchHdaAudioLinkHda" = "1"
+	register "PchHdaAudioLinkSsp0" = "1"
+	register "PchHdaAudioLinkSsp1" = "1"

register "PcieRpEnable[0]" = "1"
    register "PcieRpEnable[1]" = "1"
@@ -91,6 +93,24 @@
    	device pci 15.1 on  end # I2C #1
    	device pci 15.2 off end # I2C #2
    	device pci 15.3 on
+			#if IS_ENABLED(CONFIG_INCLUDE_SND_MAX98373_NHLT)
+			chip drivers/i2c/max98373
+				register "vmon_slot_no" = "4"
+				register "imon_slot_no" = "5"
+				register "uid" = "0"
+				register "desc" = ""RIGHT SPEAKER AMP""
+				register "name" = ""MAXR""
+				device i2c 31 on end
+			end
+			chip drivers/i2c/max98373
+				register "vmon_slot_no" = "6"
+				register "imon_slot_no" = "7"
+				register "uid" = "1"
+				register "desc" = ""LEFT SPEAKER AMP""
+				register "name" = ""MAXL""
+				device i2c 32 on end
+			end
+			#elif IS_ENABLED(CONFIG_INCLUDE_SND_MAX98357_DA7219_NHLT)
    		chip drivers/i2c/da7219
    			register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_A20)"
    			register "btn_cfg" = "50"
@@ -108,6 +128,7 @@
    			register "mic_amp_in_sel" = ""diff""
    			device i2c 1a on end
    		end
+			#endif
    	end   # I2C #3
    	device pci 16.0 on  end # Management Engine Interface 1
    	device pci 16.1 off end # Management Engine Interface 2
@@ -144,6 +165,7 @@
    	end # LPC Interface
    	device pci 1f.1 on  end # P2SB
    	device pci 1f.2 on  end # Power Management Controller
+		#if IS_ENABLED(CONFIG_INCLUDE_SND_MAX98357_DA7219_NHLT)
    	device pci 1f.3 on
    		chip drivers/generic/max98357a
    			register "sdmode_gpio" =  "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D16)"
@@ -151,6 +173,7 @@
    			device generic 0 on end
    		end
    	end # Intel HDA
+		#endif
    	device pci 1f.4 on  end # SMBus
    	device pci 1f.5 on  end # PCH SPI
    	device pci 1f.6 off end # GbE