commit 6580408a7e0a19c68f9705884c1bcaf4638cc914
author Marshall Dawson <marshalldawson3rd@gmail.com> Mon Oct 31 14:17:46 2016 -0400
committer Martin Roth <martinroth@google.com> Mon Nov 07 20:37:21 2016 +0100
tree 94fddfd5bdb28cfa5e9328b46eac1859d0a5a696
parent 21e5dd8a8503734e8f1199e5de0e3da1d84e3081

amd/pi/hudson: Move audio to northbridge

Carrizo (00660F01), Merlin Falcon (00660F01), and Stoney Ridge (00670F00)
locate the HD audio controller on the northbridge root complex at 9.2
instead of the FCH.  This duplicates the existing ASL into the northbridge
directories and reports the correct address.

Original-Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Original-Reviewed-by: Marc Jones <marcj303@gmail.com>
(cherry picked from commit f68206c2b42c90076efd968a99f4d3a49e403438)

Change-Id: I6d42bb40ad58c7f35e8c88ff27ebd327d656c021
Signed-off-by: Marc Jones <marcj303@gmail.com>
Reviewed-on: https://review.coreboot.org/17216
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>

src/southbridge/amd/pi/hudson/acpi/fch.asl

diff --git a/src/southbridge/amd/pi/hudson/acpi/fch.asl b/src/southbridge/amd/pi/hudson/acpi/fch.asl
index 0426b00..b8c0b35 100644
--- a/src/southbridge/amd/pi/hudson/acpi/fch.asl
+++ b/src/southbridge/amd/pi/hudson/acpi/fch.asl
@@ -51,7 +51,9 @@
 #include "usb.asl"
 
 /* 0:14.2 - HD Audio */
+#if !CONFIG_SOUTHBRIDGE_AMD_PI_KERN
 #include "audio.asl"
+#endif
 
 /* 0:14.3 - LPC */
 #include "lpc.asl"