The device number of SATA SB700 is 0x11, while the one of SB600 is 0x12.

We changed almost associated code when we ported but overlooked some.
Some legacy of SB600 are also fixed.

Signed-off-by: Zheng Bao <zheng.bao@amd.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5490 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

6 files changed, 9 insertions, 9 deletions

diff --git a/src/mainboard/amd/mahogany/acpi/sata.asl b/src/mainboard/amd/mahogany/acpi/sata.asl
index 7c4d13483f..b5e6fc5665 100644
--- a/src/mainboard/amd/mahogany/acpi/sata.asl
+++ b/src/mainboard/amd/mahogany/acpi/sata.asl
@@ -23,7 +23,7 @@
 Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
-			Name(_ADR, 0x00120000)
+			Name(_ADR, 0x00110000)
 			#include "sata.asl"
 		}
 	}
diff --git a/src/mainboard/amd/mahogany/dsdt.asl b/src/mainboard/amd/mahogany/dsdt.asl
index 381aa3242f..2b6857bcbe 100644
--- a/src/mainboard/amd/mahogany/dsdt.asl
+++ b/src/mainboard/amd/mahogany/dsdt.asl
@@ -271,7 +271,7 @@ DefinitionBlock (
 			 * ((bus number + 1) * ((device number * 8) * 4096)) + register offset
 			 * The 8 comes from 8 functions per device, and 4096 bytes per function config space
 			*/
-			Offset(0x00090024),	/* Byte offset to SATA register 24h - Bus 0, Device 18, Function 0 */
+			Offset(0x00088024),	/* Byte offset to SATA register 24h - Bus 0, Device 18, Function 0 */
 			STB5, 32,
 			Offset(0x00098042),	/* Byte offset to OHCI0 register 42h - Bus 0, Device 19, Function 0 */
 			PT0D, 1,
@@ -1447,7 +1447,7 @@ DefinitionBlock (
 				Store (0x02, SIOD)
 			}
 			/*
-			 * Keyboard PME is routed to SB600 Gevent3. We can wake
+			 * Keyboard PME is routed to SB700 Gevent3. We can wake
 			 * up the system by pressing the key.
 			 */
 			Method (SIOS, 1)
diff --git a/src/mainboard/amd/mahogany_fam10/acpi/sata.asl b/src/mainboard/amd/mahogany_fam10/acpi/sata.asl
index 7c4d13483f..b5e6fc5665 100644
--- a/src/mainboard/amd/mahogany_fam10/acpi/sata.asl
+++ b/src/mainboard/amd/mahogany_fam10/acpi/sata.asl
@@ -23,7 +23,7 @@
 Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
-			Name(_ADR, 0x00120000)
+			Name(_ADR, 0x00110000)
 			#include "sata.asl"
 		}
 	}
diff --git a/src/mainboard/amd/mahogany_fam10/dsdt.asl b/src/mainboard/amd/mahogany_fam10/dsdt.asl
index 48e0aeabb0..32fb7a0183 100644
--- a/src/mainboard/amd/mahogany_fam10/dsdt.asl
+++ b/src/mainboard/amd/mahogany_fam10/dsdt.asl
@@ -313,7 +313,7 @@ DefinitionBlock (
 			 * ((bus number + 1) * ((device number * 8) * 4096)) + register offset
 			 * The 8 comes from 8 functions per device, and 4096 bytes per function config space
 			*/
-			Offset(0x00090024),	/* Byte offset to SATA register 24h - Bus 0, Device 18, Function 0 */
+			Offset(0x00088024),	/* Byte offset to SATA register 24h - Bus 0, Device 18, Function 0 */
 			STB5, 32,
 			Offset(0x00098042),	/* Byte offset to OHCI0 register 42h - Bus 0, Device 19, Function 0 */
 			PT0D, 1,
@@ -1489,7 +1489,7 @@ DefinitionBlock (
 				Store (0x02, SIOD)
 			}
 			/*
-			 * Keyboard PME is routed to SB600 Gevent3. We can wake
+			 * Keyboard PME is routed to SB700 Gevent3. We can wake
 			 * up the system by pressing the key.
 			 */
 			Method (SIOS, 1)
diff --git a/src/mainboard/amd/tilapia_fam10/acpi/sata.asl b/src/mainboard/amd/tilapia_fam10/acpi/sata.asl
index 7c4d13483f..b5e6fc5665 100644
--- a/src/mainboard/amd/tilapia_fam10/acpi/sata.asl
+++ b/src/mainboard/amd/tilapia_fam10/acpi/sata.asl
@@ -23,7 +23,7 @@
 Scope (_SB) {
 	Device(PCI0) {
 		Device(SATA) {
-			Name(_ADR, 0x00120000)
+			Name(_ADR, 0x00110000)
 			#include "sata.asl"
 		}
 	}
diff --git a/src/mainboard/amd/tilapia_fam10/dsdt.asl b/src/mainboard/amd/tilapia_fam10/dsdt.asl
index ad676850c1..7176e6f36f 100644
--- a/src/mainboard/amd/tilapia_fam10/dsdt.asl
+++ b/src/mainboard/amd/tilapia_fam10/dsdt.asl
@@ -313,7 +313,7 @@ DefinitionBlock (
 			 * ((bus number + 1) * ((device number * 8) * 4096)) + register offset
 			 * The 8 comes from 8 functions per device, and 4096 bytes per function config space
 			*/
-			Offset(0x00090024),	/* Byte offset to SATA register 24h - Bus 0, Device 18, Function 0 */
+			Offset(0x00088024),	/* Byte offset to SATA register 24h - Bus 0, Device 18, Function 0 */
 			STB5, 32,
 			Offset(0x00098042),	/* Byte offset to OHCI0 register 42h - Bus 0, Device 19, Function 0 */
 			PT0D, 1,
@@ -1489,7 +1489,7 @@ DefinitionBlock (
 				Store (0x02, SIOD)
 			}
 			/*
-			 * Keyboard PME is routed to SB600 Gevent3. We can wake
+			 * Keyboard PME is routed to SB700 Gevent3. We can wake
 			 * up the system by pressing the key.
 			 */
 			Method (SIOS, 1)