mb/asus: Get rid of whitespace before tab

Change-Id: Id572144827b515e9e84c51aa3e4f8a20baf1c212
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/26610
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Elyes HAOUAS 2018-05-28 13:18:17 +02:00 committed by Patrick Georgi
parent 7c073979e6
commit d54e859ace
20 changed files with 102 additions and 102 deletions

View File

@ -45,7 +45,7 @@ DefinitionBlock (
/* System Bus */ /* System Bus */
Scope(\_SB) { /* Start \_SB scope */ Scope(\_SB) { /* Start \_SB scope */
/* global utility methods expected within the \_SB scope */ /* global utility methods expected within the \_SB scope */
#include <arch/x86/acpi/globutil.asl> #include <arch/x86/acpi/globutil.asl>
/* Describe IRQ Routing mapping for this platform (within the \_SB scope) */ /* Describe IRQ Routing mapping for this platform (within the \_SB scope) */

View File

@ -69,4 +69,4 @@ Scope(\_GPE) { /* Start Scope GPE */
Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */ Notify(\_SB.PCI0.AZHD, 0x02) /* NOTIFY_DEVICE_WAKE */
Notify(\_SB.PWRB, 0x02) /* NOTIFY_DEVICE_WAKE */ Notify(\_SB.PWRB, 0x02) /* NOTIFY_DEVICE_WAKE */
} }
} /* End Scope GPE */ } /* End Scope GPE */

View File

@ -44,7 +44,7 @@ Method(\_PTS, 1) {
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\_SB.SBRI, 0x13)) { /*if (LLessEqual(\_SB.SBRI, 0x13)) {
* Store(0,\_SB.PWDE) * Store(0,\_SB.PWDE)
*} *}
*/ */

View File

@ -170,8 +170,8 @@
#if IS_ENABLED(CONFIG_GFXUMA) #if IS_ENABLED(CONFIG_GFXUMA)
#define BLDCFG_UMA_ALIGNMENT UMA_4MB_ALIGNED #define BLDCFG_UMA_ALIGNMENT UMA_4MB_ALIGNED
#define BLDCFG_UMA_ALLOCATION_MODE UMA_SPECIFIED #define BLDCFG_UMA_ALLOCATION_MODE UMA_SPECIFIED
//#define BLDCFG_UMA_ALLOCATION_SIZE 0x1000//0x1800//0x1000 /* (1000 << 16) = 256M*/ //#define BLDCFG_UMA_ALLOCATION_SIZE 0x1000//0x1800//0x1000 /* (1000 << 16) = 256M*/
#define BLDCFG_UMA_ALLOCATION_SIZE 0x2000//512M #define BLDCFG_UMA_ALLOCATION_SIZE 0x2000//512M
#define BLDCFG_UMA_ABOVE4G_SUPPORT FALSE #define BLDCFG_UMA_ABOVE4G_SUPPORT FALSE
#endif #endif

View File

@ -129,9 +129,9 @@ IndexField (PIOI, PIOD, ByteAcc, NoLock, Preserve) {
PWMK, 1, PWMK, 1,
PWNS, 1, PWNS, 1,
/* Offset(0x61), */ /* Options_1 */ /* Offset(0x61), */ /* Options_1 */
/* ,7, */ /* ,7, */
/* R617,1, */ /* R617,1, */
Offset(0x65), /* UsbPMControl */ Offset(0x65), /* UsbPMControl */
, 4, , 4,

View File

@ -113,7 +113,7 @@ DefinitionBlock (
Notify (\_SB.PCI0.PCE4, 0x02) /* NOTIFY_DEVICE_WAKE */ Notify (\_SB.PCI0.PCE4, 0x02) /* NOTIFY_DEVICE_WAKE */
} }
} /* End Scope GPE */ } /* End Scope GPE */
/* Root of the bus hierarchy */ /* Root of the bus hierarchy */
Scope (\_SB) Scope (\_SB)

View File

@ -226,7 +226,7 @@ static void setup_mb_resource_map(void)
* This field defines the start of PCI I/O region n * This field defines the start of PCI I/O region n
* [31:25] Reserved * [31:25] Reserved
*/ */
// PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013, // PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000,
@ -481,7 +481,7 @@ static void setup_mb_resource_map(void)
* This field defines the start of PCI I/O region n * This field defines the start of PCI I/O region n
* [31:25] Reserved * [31:25] Reserved
*/ */
// PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013, // PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000,

View File

@ -546,7 +546,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
*/ */
if (IS_ENABLED(CONFIG_DEBUG_SMBUS)) { if (IS_ENABLED(CONFIG_DEBUG_SMBUS)) {
dump_spd_registers(&cpu[0]); dump_spd_registers(&cpu[0]);
dump_smbus_registers(); dump_smbus_registers();
} }
#endif #endif

View File

@ -129,9 +129,9 @@ IndexField (PIOI, PIOD, ByteAcc, NoLock, Preserve) {
PWMK, 1, PWMK, 1,
PWNS, 1, PWNS, 1,
/* Offset(0x61), */ /* Options_1 */ /* Offset(0x61), */ /* Options_1 */
/* ,7, */ /* ,7, */
/* R617,1, */ /* R617,1, */
Offset(0x65), /* UsbPMControl */ Offset(0x65), /* UsbPMControl */
, 4, , 4,

View File

@ -115,7 +115,7 @@ DefinitionBlock (
Notify (\_SB.PCI0.PCE3, 0x02) /* NOTIFY_DEVICE_WAKE */ Notify (\_SB.PCI0.PCE3, 0x02) /* NOTIFY_DEVICE_WAKE */
} }
} /* End Scope GPE */ } /* End Scope GPE */
/* Root of the bus hierarchy */ /* Root of the bus hierarchy */
Scope (\_SB) Scope (\_SB)

View File

@ -226,7 +226,7 @@ static void setup_mb_resource_map(void)
* This field defines the start of PCI I/O region n * This field defines the start of PCI I/O region n
* [31:25] Reserved * [31:25] Reserved
*/ */
// PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013, // PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000,
@ -481,7 +481,7 @@ static void setup_mb_resource_map(void)
* This field defines the start of PCI I/O region n * This field defines the start of PCI I/O region n
* [31:25] Reserved * [31:25] Reserved
*/ */
// PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013, // PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC0), 0xFE000FCC, 0x00001013,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xC8), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD0), 0xFE000FCC, 0x00000000,
PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000, PCI_ADDR(CONFIG_CBB, CONFIG_CDB, 1, 0xD8), 0xFE000FCC, 0x00000000,

View File

@ -587,7 +587,7 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
*/ */
if (IS_ENABLED(CONFIG_DEBUG_SMBUS)) { if (IS_ENABLED(CONFIG_DEBUG_SMBUS)) {
dump_spd_registers(&cpu[0]); dump_spd_registers(&cpu[0]);
dump_smbus_registers(); dump_smbus_registers();
} }
#endif #endif

View File

@ -9,7 +9,7 @@ chip northbridge/amd/amdfam10/root_complex
chip northbridge/amd/amdfam10 chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge device pci 18.0 on # northbridge
chip southbridge/amd/rs780 chip southbridge/amd/rs780
device pci 0.0 on end # HT 0x9600 device pci 0.0 on end # HT 0x9600
device pci 1.0 on end # Internal Graphics P2P bridge 0x9602 device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603 device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
device pci 3.0 on end # PCIE P2P bridge 0x960b device pci 3.0 on end # PCIE P2P bridge 0x960b
@ -40,7 +40,7 @@ chip northbridge/amd/amdfam10/root_complex
device pci 13.0 on end # USB device pci 13.0 on end # USB
device pci 13.1 on end # USB device pci 13.1 on end # USB
device pci 13.2 on end # USB device pci 13.2 on end # USB
device pci 14.0 on # SM device pci 14.0 on # SM
chip drivers/generic/generic #dimm 0-0-0 chip drivers/generic/generic #dimm 0-0-0
device i2c 50 on end device i2c 50 on end
end end

View File

@ -239,9 +239,9 @@ DefinitionBlock (
PWMK, 1, PWMK, 1,
PWNS, 1, PWNS, 1,
/* Offset(0x61), */ /* Options_1 */ /* Offset(0x61), */ /* Options_1 */
/* ,7, */ /* ,7, */
/* R617,1, */ /* R617,1, */
Offset(0x65), /* UsbPMControl */ Offset(0x65), /* UsbPMControl */
, 4, , 4,
@ -837,7 +837,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\_SB.SBRI, 0x13)) { /*if (LLessEqual(\_SB.SBRI, 0x13)) {
* Store(0,\_SB.PWDE) * Store(0,\_SB.PWDE)
*} *}
*/ */
@ -853,13 +853,13 @@ DefinitionBlock (
* used, so it could be removed. * used, so it could be removed.
* *
* *
* \_GTS OEM Going To Sleep method * \_GTS OEM Going To Sleep method
* *
* Entry: * Entry:
* Arg0=The value of the sleeping state S1=1, S2=2 * Arg0=The value of the sleeping state S1=1, S2=2
* *
* Exit: * Exit:
* -none- * -none-
* *
* Method(\_GTS, 1) { * Method(\_GTS, 1) {
* DBGO("\\_GTS\n") * DBGO("\\_GTS\n")
@ -1026,7 +1026,7 @@ DefinitionBlock (
/* PCIe HotPlug event */ /* PCIe HotPlug event */
/* Method(_L0F) { /* Method(_L0F) {
* DBGO("\\_GPE\\_L0F\n") * DBGO("\\_GPE\\_L0F\n")
* } * }
*/ */
@ -1049,19 +1049,19 @@ DefinitionBlock (
/* GPM0 SCI event - Moved to USB.asl */ /* GPM0 SCI event - Moved to USB.asl */
/* Method(_L13) { /* Method(_L13) {
* DBGO("\\_GPE\\_L13\n") * DBGO("\\_GPE\\_L13\n")
* } * }
*/ */
/* GPM1 SCI event - Moved to USB.asl */ /* GPM1 SCI event - Moved to USB.asl */
/* Method(_L14) { /* Method(_L14) {
* DBGO("\\_GPE\\_L14\n") * DBGO("\\_GPE\\_L14\n")
* } * }
*/ */
/* GPM2 SCI event - Moved to USB.asl */ /* GPM2 SCI event - Moved to USB.asl */
/* Method(_L15) { /* Method(_L15) {
* DBGO("\\_GPE\\_L15\n") * DBGO("\\_GPE\\_L15\n")
* } * }
*/ */
@ -1073,7 +1073,7 @@ DefinitionBlock (
/* GPM8 SCI event - Moved to USB.asl */ /* GPM8 SCI event - Moved to USB.asl */
/* Method(_L17) { /* Method(_L17) {
* DBGO("\\_GPE\\_L17\n") * DBGO("\\_GPE\\_L17\n")
* } * }
*/ */
@ -1090,7 +1090,7 @@ DefinitionBlock (
/* GPM4 SCI event - Moved to USB.asl */ /* GPM4 SCI event - Moved to USB.asl */
/* Method(_L19) { /* Method(_L19) {
* DBGO("\\_GPE\\_L19\n") * DBGO("\\_GPE\\_L19\n")
* } * }
*/ */
@ -1121,7 +1121,7 @@ DefinitionBlock (
/* GPIO2 or GPIO66 SCI event */ /* GPIO2 or GPIO66 SCI event */
/* Method(_L1E) { /* Method(_L1E) {
* DBGO("\\_GPE\\_L1E\n") * DBGO("\\_GPE\\_L1E\n")
* } * }
*/ */
@ -1131,7 +1131,7 @@ DefinitionBlock (
* } * }
*/ */
} /* End Scope GPE */ } /* End Scope GPE */
#include "acpi/usb.asl" #include "acpi/usb.asl"
@ -1520,7 +1520,7 @@ DefinitionBlock (
) )
Memory32Fixed(READWRITE, 0, 0xA0000, BSMM) Memory32Fixed(READWRITE, 0, 0xA0000, BSMM)
Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */ Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */
Memory32Fixed(READONLY, 0x000C0000, 0x00020000, EMM1) /* Assume C0000-E0000 empty */ Memory32Fixed(READONLY, 0x000C0000, 0x00020000, EMM1) /* Assume C0000-E0000 empty */
Memory32Fixed(READONLY, 0x000E0000, 0x00020000, RDBS) /* BIOS ROM area */ Memory32Fixed(READONLY, 0x000E0000, 0x00020000, RDBS) /* BIOS ROM area */
@ -1634,7 +1634,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) { /*if (LLessEqual(\SBRI, 0x13)) {
* Store(0,\PWDE) * Store(0,\PWDE)
* } * }
*/ */
} /* End Method(_SB._INI) */ } /* End Method(_SB._INI) */

View File

@ -9,7 +9,7 @@ chip northbridge/amd/amdfam10/root_complex
chip northbridge/amd/amdfam10 chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge device pci 18.0 on # northbridge
chip southbridge/amd/rs780 chip southbridge/amd/rs780
device pci 0.0 on end # HT 0x9600 device pci 0.0 on end # HT 0x9600
device pci 1.0 on end # Internal Graphics P2P bridge 0x9602 device pci 1.0 on end # Internal Graphics P2P bridge 0x9602
device pci 2.0 off end # PCIE P2P bridge (external graphics) 0x9603 device pci 2.0 off end # PCIE P2P bridge (external graphics) 0x9603
device pci 3.0 off end # PCIE P2P bridge 0x960b device pci 3.0 off end # PCIE P2P bridge 0x960b
@ -40,7 +40,7 @@ chip northbridge/amd/amdfam10/root_complex
device pci 13.0 on end # USB device pci 13.0 on end # USB
device pci 13.1 on end # USB device pci 13.1 on end # USB
device pci 13.2 on end # USB device pci 13.2 on end # USB
device pci 14.0 on # SM device pci 14.0 on # SM
chip drivers/generic/generic #dimm 0-0-0 chip drivers/generic/generic #dimm 0-0-0
device i2c 50 on end device i2c 50 on end
end end

View File

@ -239,9 +239,9 @@ DefinitionBlock (
PWMK, 1, PWMK, 1,
PWNS, 1, PWNS, 1,
/* Offset(0x61), */ /* Options_1 */ /* Offset(0x61), */ /* Options_1 */
/* ,7, */ /* ,7, */
/* R617,1, */ /* R617,1, */
Offset(0x65), /* UsbPMControl */ Offset(0x65), /* UsbPMControl */
, 4, , 4,
@ -837,7 +837,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\_SB.SBRI, 0x13)) { /*if (LLessEqual(\_SB.SBRI, 0x13)) {
* Store(0,\_SB.PWDE) * Store(0,\_SB.PWDE)
*} *}
*/ */
@ -853,13 +853,13 @@ DefinitionBlock (
* used, so it could be removed. * used, so it could be removed.
* *
* *
* \_GTS OEM Going To Sleep method * \_GTS OEM Going To Sleep method
* *
* Entry: * Entry:
* Arg0=The value of the sleeping state S1=1, S2=2 * Arg0=The value of the sleeping state S1=1, S2=2
* *
* Exit: * Exit:
* -none- * -none-
* *
* Method(\_GTS, 1) { * Method(\_GTS, 1) {
* DBGO("\\_GTS\n") * DBGO("\\_GTS\n")
@ -1026,7 +1026,7 @@ DefinitionBlock (
/* PCIe HotPlug event */ /* PCIe HotPlug event */
/* Method(_L0F) { /* Method(_L0F) {
* DBGO("\\_GPE\\_L0F\n") * DBGO("\\_GPE\\_L0F\n")
* } * }
*/ */
@ -1049,19 +1049,19 @@ DefinitionBlock (
/* GPM0 SCI event - Moved to USB.asl */ /* GPM0 SCI event - Moved to USB.asl */
/* Method(_L13) { /* Method(_L13) {
* DBGO("\\_GPE\\_L13\n") * DBGO("\\_GPE\\_L13\n")
* } * }
*/ */
/* GPM1 SCI event - Moved to USB.asl */ /* GPM1 SCI event - Moved to USB.asl */
/* Method(_L14) { /* Method(_L14) {
* DBGO("\\_GPE\\_L14\n") * DBGO("\\_GPE\\_L14\n")
* } * }
*/ */
/* GPM2 SCI event - Moved to USB.asl */ /* GPM2 SCI event - Moved to USB.asl */
/* Method(_L15) { /* Method(_L15) {
* DBGO("\\_GPE\\_L15\n") * DBGO("\\_GPE\\_L15\n")
* } * }
*/ */
@ -1073,7 +1073,7 @@ DefinitionBlock (
/* GPM8 SCI event - Moved to USB.asl */ /* GPM8 SCI event - Moved to USB.asl */
/* Method(_L17) { /* Method(_L17) {
* DBGO("\\_GPE\\_L17\n") * DBGO("\\_GPE\\_L17\n")
* } * }
*/ */
@ -1090,7 +1090,7 @@ DefinitionBlock (
/* GPM4 SCI event - Moved to USB.asl */ /* GPM4 SCI event - Moved to USB.asl */
/* Method(_L19) { /* Method(_L19) {
* DBGO("\\_GPE\\_L19\n") * DBGO("\\_GPE\\_L19\n")
* } * }
*/ */
@ -1121,7 +1121,7 @@ DefinitionBlock (
/* GPIO2 or GPIO66 SCI event */ /* GPIO2 or GPIO66 SCI event */
/* Method(_L1E) { /* Method(_L1E) {
* DBGO("\\_GPE\\_L1E\n") * DBGO("\\_GPE\\_L1E\n")
* } * }
*/ */
@ -1131,7 +1131,7 @@ DefinitionBlock (
* } * }
*/ */
} /* End Scope GPE */ } /* End Scope GPE */
#include "acpi/usb.asl" #include "acpi/usb.asl"
@ -1520,7 +1520,7 @@ DefinitionBlock (
) )
Memory32Fixed(READWRITE, 0, 0xA0000, BSMM) Memory32Fixed(READWRITE, 0, 0xA0000, BSMM)
Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */ Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */
Memory32Fixed(READONLY, 0x000C0000, 0x00020000, EMM1) /* Assume C0000-E0000 empty */ Memory32Fixed(READONLY, 0x000C0000, 0x00020000, EMM1) /* Assume C0000-E0000 empty */
Memory32Fixed(READONLY, 0x000E0000, 0x00020000, RDBS) /* BIOS ROM area */ Memory32Fixed(READONLY, 0x000E0000, 0x00020000, RDBS) /* BIOS ROM area */
@ -1634,7 +1634,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) { /*if (LLessEqual(\SBRI, 0x13)) {
* Store(0,\PWDE) * Store(0,\PWDE)
* } * }
*/ */
} /* End Method(_SB._INI) */ } /* End Method(_SB._INI) */

View File

@ -9,7 +9,7 @@ chip northbridge/amd/amdfam10/root_complex
chip northbridge/amd/amdfam10 chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge device pci 18.0 on # northbridge
chip southbridge/amd/rs780 chip southbridge/amd/rs780
device pci 0.0 on end # HT 0x9600 device pci 0.0 on end # HT 0x9600
device pci 1.0 on # Internal Graphics P2P bridge 0x9602 device pci 1.0 on # Internal Graphics P2P bridge 0x9602
device pci 5.0 on end # onboard VGA device pci 5.0 on end # onboard VGA
end end
@ -42,7 +42,7 @@ chip northbridge/amd/amdfam10/root_complex
device pci 13.0 on end # USB device pci 13.0 on end # USB
device pci 13.1 on end # USB device pci 13.1 on end # USB
device pci 13.2 on end # USB device pci 13.2 on end # USB
device pci 14.0 on # SM device pci 14.0 on # SM
chip drivers/generic/generic #dimm 0-0-0 chip drivers/generic/generic #dimm 0-0-0
device i2c 50 on end device i2c 50 on end
end end

View File

@ -239,9 +239,9 @@ DefinitionBlock (
PWMK, 1, PWMK, 1,
PWNS, 1, PWNS, 1,
/* Offset(0x61), */ /* Options_1 */ /* Offset(0x61), */ /* Options_1 */
/* ,7, */ /* ,7, */
/* R617,1, */ /* R617,1, */
Offset(0x65), /* UsbPMControl */ Offset(0x65), /* UsbPMControl */
, 4, , 4,
@ -837,7 +837,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\_SB.SBRI, 0x13)) { /*if (LLessEqual(\_SB.SBRI, 0x13)) {
* Store(0,\_SB.PWDE) * Store(0,\_SB.PWDE)
*} *}
*/ */
@ -853,13 +853,13 @@ DefinitionBlock (
* used, so it could be removed. * used, so it could be removed.
* *
* *
* \_GTS OEM Going To Sleep method * \_GTS OEM Going To Sleep method
* *
* Entry: * Entry:
* Arg0=The value of the sleeping state S1=1, S2=2 * Arg0=The value of the sleeping state S1=1, S2=2
* *
* Exit: * Exit:
* -none- * -none-
* *
* Method(\_GTS, 1) { * Method(\_GTS, 1) {
* DBGO("\\_GTS\n") * DBGO("\\_GTS\n")
@ -1026,7 +1026,7 @@ DefinitionBlock (
/* PCIe HotPlug event */ /* PCIe HotPlug event */
/* Method(_L0F) { /* Method(_L0F) {
* DBGO("\\_GPE\\_L0F\n") * DBGO("\\_GPE\\_L0F\n")
* } * }
*/ */
@ -1049,19 +1049,19 @@ DefinitionBlock (
/* GPM0 SCI event - Moved to USB.asl */ /* GPM0 SCI event - Moved to USB.asl */
/* Method(_L13) { /* Method(_L13) {
* DBGO("\\_GPE\\_L13\n") * DBGO("\\_GPE\\_L13\n")
* } * }
*/ */
/* GPM1 SCI event - Moved to USB.asl */ /* GPM1 SCI event - Moved to USB.asl */
/* Method(_L14) { /* Method(_L14) {
* DBGO("\\_GPE\\_L14\n") * DBGO("\\_GPE\\_L14\n")
* } * }
*/ */
/* GPM2 SCI event - Moved to USB.asl */ /* GPM2 SCI event - Moved to USB.asl */
/* Method(_L15) { /* Method(_L15) {
* DBGO("\\_GPE\\_L15\n") * DBGO("\\_GPE\\_L15\n")
* } * }
*/ */
@ -1073,7 +1073,7 @@ DefinitionBlock (
/* GPM8 SCI event - Moved to USB.asl */ /* GPM8 SCI event - Moved to USB.asl */
/* Method(_L17) { /* Method(_L17) {
* DBGO("\\_GPE\\_L17\n") * DBGO("\\_GPE\\_L17\n")
* } * }
*/ */
@ -1090,7 +1090,7 @@ DefinitionBlock (
/* GPM4 SCI event - Moved to USB.asl */ /* GPM4 SCI event - Moved to USB.asl */
/* Method(_L19) { /* Method(_L19) {
* DBGO("\\_GPE\\_L19\n") * DBGO("\\_GPE\\_L19\n")
* } * }
*/ */
@ -1121,7 +1121,7 @@ DefinitionBlock (
/* GPIO2 or GPIO66 SCI event */ /* GPIO2 or GPIO66 SCI event */
/* Method(_L1E) { /* Method(_L1E) {
* DBGO("\\_GPE\\_L1E\n") * DBGO("\\_GPE\\_L1E\n")
* } * }
*/ */
@ -1131,7 +1131,7 @@ DefinitionBlock (
* } * }
*/ */
} /* End Scope GPE */ } /* End Scope GPE */
#include "acpi/usb.asl" #include "acpi/usb.asl"
@ -1505,7 +1505,7 @@ DefinitionBlock (
) )
Memory32Fixed(READWRITE, 0, 0xA0000, BSMM) Memory32Fixed(READWRITE, 0, 0xA0000, BSMM)
Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */ Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */
/* memory space for PCI BARs below 4GB */ /* memory space for PCI BARs below 4GB */
Memory32Fixed(ReadOnly, 0x00000000, 0x00000000, MMIO) Memory32Fixed(ReadOnly, 0x00000000, 0x00000000, MMIO)
}) /* End Name(_SB.PCI0.CRES) */ }) /* End Name(_SB.PCI0.CRES) */
@ -1557,7 +1557,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) { /*if (LLessEqual(\SBRI, 0x13)) {
* Store(0,\PWDE) * Store(0,\PWDE)
* } * }
*/ */
} /* End Method(_SB._INI) */ } /* End Method(_SB._INI) */

View File

@ -10,7 +10,7 @@ chip northbridge/amd/amdfam10/root_complex
chip northbridge/amd/amdfam10 chip northbridge/amd/amdfam10
device pci 18.0 on # northbridge device pci 18.0 on # northbridge
chip southbridge/amd/rs780 chip southbridge/amd/rs780
device pci 0.0 on end # HT 0x9600 device pci 0.0 on end # HT 0x9600
device pci 1.0 on end # Internal Graphics P2P bridge 0x9712 device pci 1.0 on end # Internal Graphics P2P bridge 0x9712
device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603 device pci 2.0 on end # PCIE P2P bridge (external graphics) 0x9603
device pci 3.0 off end # PCIE P2P bridge 0x960b device pci 3.0 off end # PCIE P2P bridge 0x960b

View File

@ -234,9 +234,9 @@ DefinitionBlock (
PWMK, 1, PWMK, 1,
PWNS, 1, PWNS, 1,
/* Offset(0x61), */ /* Options_1 */ /* Offset(0x61), */ /* Options_1 */
/* ,7, */ /* ,7, */
/* R617,1, */ /* R617,1, */
Offset(0x65), /* UsbPMControl */ Offset(0x65), /* UsbPMControl */
, 4, , 4,
@ -832,7 +832,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\_SB.SBRI, 0x13)) { /*if (LLessEqual(\_SB.SBRI, 0x13)) {
* Store(0,\_SB.PWDE) * Store(0,\_SB.PWDE)
*} *}
*/ */
@ -847,13 +847,13 @@ DefinitionBlock (
* used, so it could be removed. * used, so it could be removed.
* *
* *
* \_GTS OEM Going To Sleep method * \_GTS OEM Going To Sleep method
* *
* Entry: * Entry:
* Arg0=The value of the sleeping state S1=1, S2=2 * Arg0=The value of the sleeping state S1=1, S2=2
* *
* Exit: * Exit:
* -none- * -none-
* *
* Method(\_GTS, 1) { * Method(\_GTS, 1) {
* DBGO("\\_GTS\n") * DBGO("\\_GTS\n")
@ -1020,7 +1020,7 @@ DefinitionBlock (
/* PCIe HotPlug event */ /* PCIe HotPlug event */
/* Method(_L0F) { /* Method(_L0F) {
* DBGO("\\_GPE\\_L0F\n") * DBGO("\\_GPE\\_L0F\n")
* } * }
*/ */
@ -1043,19 +1043,19 @@ DefinitionBlock (
/* GPM0 SCI event - Moved to USB.asl */ /* GPM0 SCI event - Moved to USB.asl */
/* Method(_L13) { /* Method(_L13) {
* DBGO("\\_GPE\\_L13\n") * DBGO("\\_GPE\\_L13\n")
* } * }
*/ */
/* GPM1 SCI event - Moved to USB.asl */ /* GPM1 SCI event - Moved to USB.asl */
/* Method(_L14) { /* Method(_L14) {
* DBGO("\\_GPE\\_L14\n") * DBGO("\\_GPE\\_L14\n")
* } * }
*/ */
/* GPM2 SCI event - Moved to USB.asl */ /* GPM2 SCI event - Moved to USB.asl */
/* Method(_L15) { /* Method(_L15) {
* DBGO("\\_GPE\\_L15\n") * DBGO("\\_GPE\\_L15\n")
* } * }
*/ */
@ -1067,7 +1067,7 @@ DefinitionBlock (
/* GPM8 SCI event - Moved to USB.asl */ /* GPM8 SCI event - Moved to USB.asl */
/* Method(_L17) { /* Method(_L17) {
* DBGO("\\_GPE\\_L17\n") * DBGO("\\_GPE\\_L17\n")
* } * }
*/ */
@ -1084,7 +1084,7 @@ DefinitionBlock (
/* GPM4 SCI event - Moved to USB.asl */ /* GPM4 SCI event - Moved to USB.asl */
/* Method(_L19) { /* Method(_L19) {
* DBGO("\\_GPE\\_L19\n") * DBGO("\\_GPE\\_L19\n")
* } * }
*/ */
@ -1115,7 +1115,7 @@ DefinitionBlock (
/* GPIO2 or GPIO66 SCI event */ /* GPIO2 or GPIO66 SCI event */
/* Method(_L1E) { /* Method(_L1E) {
* DBGO("\\_GPE\\_L1E\n") * DBGO("\\_GPE\\_L1E\n")
* } * }
*/ */
@ -1125,7 +1125,7 @@ DefinitionBlock (
* } * }
*/ */
} /* End Scope GPE */ } /* End Scope GPE */
#include "acpi/usb.asl" #include "acpi/usb.asl"
@ -1477,7 +1477,7 @@ DefinitionBlock (
) )
#if 0 #if 0
Memory32Fixed(READWRITE, 0, 0xA0000, BSMM) Memory32Fixed(READWRITE, 0, 0xA0000, BSMM)
Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */ Memory32Fixed(READONLY, 0x000A0000, 0x00020000, VGAM) /* VGA memory space */
Memory32Fixed(READONLY, 0x000C0000, 0x00020000, EMM1) /* Assume C0000-E0000 empty */ Memory32Fixed(READONLY, 0x000C0000, 0x00020000, EMM1) /* Assume C0000-E0000 empty */
Memory32Fixed(READONLY, 0x000E0000, 0x00020000, RDBS) /* BIOS ROM area */ Memory32Fixed(READONLY, 0x000E0000, 0x00020000, RDBS) /* BIOS ROM area */
@ -1607,7 +1607,7 @@ DefinitionBlock (
/* On older chips, clear PciExpWakeDisEn */ /* On older chips, clear PciExpWakeDisEn */
/*if (LLessEqual(\SBRI, 0x13)) { /*if (LLessEqual(\SBRI, 0x13)) {
* Store(0,\PWDE) * Store(0,\PWDE)
* } * }
*/ */
} /* End Method(_SB._INI) */ } /* End Method(_SB._INI) */