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>
This commit is contained in:
		
				
					committed by
					
						 Martin Roth
						Martin Roth
					
				
			
			
				
	
			
			
			
						parent
						
							21e5dd8a85
						
					
				
				
					commit
					6580408a7e
				
			| @@ -129,3 +129,40 @@ Device(PBRC) { | |||||||
| 		Return (PSC)			/* PIC Mode */ | 		Return (PSC)			/* PIC Mode */ | ||||||
| 	} /* end _PRT */ | 	} /* end _PRT */ | ||||||
| } /* end PBR8 */ | } /* end PBR8 */ | ||||||
|  |  | ||||||
|  | Device(AZHD) {	/* 0:9.2 - HD Audio */ | ||||||
|  | 	Name(_ADR, 0x00090002) | ||||||
|  | 	OperationRegion(AZPD, PCI_Config, 0x00, 0x100) | ||||||
|  | 		Field(AZPD, AnyAcc, NoLock, Preserve) { | ||||||
|  | 		offset (0x42), | ||||||
|  | 		NSDI, 1, | ||||||
|  | 		NSDO, 1, | ||||||
|  | 		NSEN, 1, | ||||||
|  | 		offset (0x44), | ||||||
|  | 		IPCR, 4, | ||||||
|  | 		offset (0x54), | ||||||
|  | 		PWST, 2, | ||||||
|  | 		, 6, | ||||||
|  | 		PMEB, 1, | ||||||
|  | 		, 6, | ||||||
|  | 		PMST, 1, | ||||||
|  | 		offset (0x62), | ||||||
|  | 		MMCR, 1, | ||||||
|  | 		offset (0x64), | ||||||
|  | 		MMLA, 32, | ||||||
|  | 		offset (0x68), | ||||||
|  | 		MMHA, 32, | ||||||
|  | 		offset (0x6C), | ||||||
|  | 		MMDT, 16, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	Method (_INI, 0, NotSerialized) | ||||||
|  | 	{ | ||||||
|  | 		If (LEqual (OSVR, 0x03)) | ||||||
|  | 		{ | ||||||
|  | 			Store (Zero, NSEN) | ||||||
|  | 			Store (One, NSDO) | ||||||
|  | 			Store (One, NSDI) | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | } /* end AZHD */ | ||||||
|   | |||||||
| @@ -95,3 +95,40 @@ Device(PBR8) { | |||||||
| 		Return (PS8)			/* PIC Mode */ | 		Return (PS8)			/* PIC Mode */ | ||||||
| 	} /* end _PRT */ | 	} /* end _PRT */ | ||||||
| } /* end PBR8 */ | } /* end PBR8 */ | ||||||
|  |  | ||||||
|  | Device(AZHD) {	/* 0:9.2 - HD Audio */ | ||||||
|  | 	Name(_ADR, 0x00090002) | ||||||
|  | 	OperationRegion(AZPD, PCI_Config, 0x00, 0x100) | ||||||
|  | 		Field(AZPD, AnyAcc, NoLock, Preserve) { | ||||||
|  | 		offset (0x42), | ||||||
|  | 		NSDI, 1, | ||||||
|  | 		NSDO, 1, | ||||||
|  | 		NSEN, 1, | ||||||
|  | 		offset (0x44), | ||||||
|  | 		IPCR, 4, | ||||||
|  | 		offset (0x54), | ||||||
|  | 		PWST, 2, | ||||||
|  | 		, 6, | ||||||
|  | 		PMEB, 1, | ||||||
|  | 		, 6, | ||||||
|  | 		PMST, 1, | ||||||
|  | 		offset (0x62), | ||||||
|  | 		MMCR, 1, | ||||||
|  | 		offset (0x64), | ||||||
|  | 		MMLA, 32, | ||||||
|  | 		offset (0x68), | ||||||
|  | 		MMHA, 32, | ||||||
|  | 		offset (0x6C), | ||||||
|  | 		MMDT, 16, | ||||||
|  | 	} | ||||||
|  |  | ||||||
|  | 	Method (_INI, 0, NotSerialized) | ||||||
|  | 	{ | ||||||
|  | 		If (LEqual (OSVR, 0x03)) | ||||||
|  | 		{ | ||||||
|  | 			Store (Zero, NSEN) | ||||||
|  | 			Store (One, NSDO) | ||||||
|  | 			Store (One, NSDI) | ||||||
|  | 		} | ||||||
|  | 	} | ||||||
|  | } /* end AZHD */ | ||||||
|   | |||||||
| @@ -51,7 +51,9 @@ Device(SBUS) { | |||||||
| #include "usb.asl" | #include "usb.asl" | ||||||
|  |  | ||||||
| /* 0:14.2 - HD Audio */ | /* 0:14.2 - HD Audio */ | ||||||
|  | #if !CONFIG_SOUTHBRIDGE_AMD_PI_KERN | ||||||
| #include "audio.asl" | #include "audio.asl" | ||||||
|  | #endif | ||||||
|  |  | ||||||
| /* 0:14.3 - LPC */ | /* 0:14.3 - LPC */ | ||||||
| #include "lpc.asl" | #include "lpc.asl" | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user