[S] Change in coreboot[main]: tgl mainboards: Move audio related settings into hda device scope

[Felix Singer (Code Review)]

Felix Singer has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/83251?usp=email )

Change subject: tgl mainboards: Move audio related settings into hda device scope
......................................................................

tgl mainboards: Move audio related settings into hda device scope

Change-Id: I1992c20dcdc5e974143690d44ee199d7c3394cfd
Signed-off-by: Felix Singer 
---
M src/mainboard/google/volteer/variants/baseboard/devicetree.cb
M src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
M src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
3 files changed, 26 insertions(+), 21 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/83251/1

diff --git a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
index df13fef..4775b0f 100644
--- a/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/volteer/variants/baseboard/devicetree.cb
@@ -192,9 +192,6 @@
    #	- PM_CFG.SLP_LAN_MIN_ASST_WDTH
    register "PchPmPwrCycDur" = "1"       # 1s

-	# HD Audio
-	register "PchHdaDspEnable" = "1"
-
    # TCSS USB3
    register "UsbTcPortEn" = "0x3"
    register "TcssXhciEn" = "1"
@@ -513,6 +510,8 @@
    		end
    	end
    	device ref hda on
+			register "PchHdaDspEnable" = "1"
+
    		chip drivers/sof
    			register "spkr_tplg" = "max98373"
    			register "jack_tplg" = "rt5682"
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb b/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
index 1434bcd..9c5fa6d 100644
--- a/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
+++ b/src/mainboard/intel/tglrvp/variants/tglrvp_up3/devicetree.cb
@@ -104,14 +104,6 @@
    	.tdp_pl4 = 105,
    }"

-	#HD Audio
-	register "PchHdaDspEnable" = "1"
-	register "PchHdaAudioLinkDmicEnable[0]" = "1"
-	register "PchHdaAudioLinkDmicEnable[1]" = "1"
-	register "PchHdaAudioLinkSspEnable[0]" = "1"
-	register "PchHdaAudioLinkSspEnable[2]" = "1"
-	register "PchHdaAudioLinkSndwEnable[0]" = "1"
-
    # Intel Common SoC Config
    register "common_soc_config" = "{
    	.gspi[1] = {
@@ -331,7 +323,18 @@
    			end
    		end
    	end
-		device ref hda on  end
+		device ref hda on
+			register "PchHdaDspEnable" = "1"
+			register "PchHdaAudioLinkDmicEnable" = "{
+				[0] = 1,
+				[1] = 1,
+			}"
+			register "PchHdaAudioLinkSspEnable" = "{
+				[0] = 1,
+				[2] = 1,
+			}"
+			register "PchHdaAudioLinkSndwEnable[0]" = "1"
+		end
    	device ref smbus on  end
    	device ref fast_spi on  end
    	device ref gbe off end
diff --git a/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb b/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
index 83451ec..578eb98 100644
--- a/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
+++ b/src/mainboard/intel/tglrvp/variants/tglrvp_up4/devicetree.cb
@@ -111,14 +111,6 @@
    	.tdp_pl4 = 83,
    }"

-	#HD Audio
-	register "PchHdaDspEnable" = "1"
-	register "PchHdaAudioLinkDmicEnable[0]" = "1"
-	register "PchHdaAudioLinkDmicEnable[1]" = "1"
-	register "PchHdaAudioLinkSspEnable[0]" = "1"
-	register "PchHdaAudioLinkSspEnable[2]" = "1"
-	register "PchHdaAudioLinkSndwEnable[0]" = "1"
-
    # Intel Common SoC Config
    register "common_soc_config" = "{
    	.gspi[1] = {
@@ -333,7 +325,18 @@
    			end
    		end
    	end
-		device ref hda on  end
+		device ref hda on
+			register "PchHdaDspEnable" = "1"
+			register "PchHdaAudioLinkDmicEnable" = "{
+				[0] = 1,
+				[1] = 1,
+			}"
+			register "PchHdaAudioLinkSspEnable" = "{
+				[0] = 1,
+				[2] = 1,
+			}"
+			register "PchHdaAudioLinkSndwEnable[0]" = "1"
+		end
    	device ref smbus on  end
    	device ref fast_spi on  end
    	device ref gbe off end