From: Graeme Gregory graeme.gregory@linaro.org

This file was mismerged scope _PR should have been removed and SCK0 should have been in scope _SB.

Signed-off-by: Graeme Gregory graeme.gregory@linaro.org Reported-by: Hanjun Guo hanjun.guo@linaro.org --- arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl | 118 ++++++++++---------- 1 file changed, 56 insertions(+), 62 deletions(-)

diff --git a/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl b/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl index c67aeec..2cca765 100644 --- a/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl +++ b/arch/arm/boot/asl/exynos5250-arndale.acpi/dsdt.asl @@ -14,12 +14,6 @@ DefinitionBlock ( "ARNDALE ", // table ID 0x00000002) // OEM revision { - Scope (_PR) - { - Processor (CPU0, 0x01, 0x00000410, 0x06) {} - Processor (CPU1, 0x02, 0x00000410, 0x06) {} - } - Scope (_SB) { Device (GPB3) { @@ -51,105 +45,105 @@ DefinitionBlock ( Return (20000) } } - } - - Device (SCK0) - { - Name (_HID, "ACPI0004") - Name (_UID, 0x00) - Method (_STA, 0, NotSerialized) - { - Return (0x0F) - }

- Device (PRC0) + Device (SCK0) { - Name (_HID, "ACPI0007") + Name (_HID, "ACPI0004") Name (_UID, 0x00) - - /* CPU0 will be always present */ Method (_STA, 0, NotSerialized) { Return (0x0F) }

- Name (MAT0, Buffer (0x28) + Device (PRC0) { + Name (_HID, "ACPI0007") + Name (_UID, 0x00) + + /* CPU0 will be always present */ + Method (_STA, 0, NotSerialized) + { + Return (0x0F) + } + + Name (MAT0, Buffer (0x28) + { /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* type, len, reserved, gic_id */ /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, /* uid, flags */ /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parking_version, performance_interrupt */ /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parked_address */ /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* base_address */ - }) + })

- Name (MAT1, Buffer (0x28) - { + Name (MAT1, Buffer (0x28) + { /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0008 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }) + })

- Method (_MAT, 0, NotSerialized) - { - If (_STA()) - { - Return (MAT0) - } - Else + Method (_MAT, 0, NotSerialized) { - Return (MAT1) + If (_STA()) + { + Return (MAT0) + } + Else + { + Return (MAT1) + } } } - }

- Device (PRC1) - { - Name (_HID, "ACPI0007") - Name (_UID, 0x01) - - Name (STA1, 0x0F) - Method (_STA, 0, NotSerialized) + Device (PRC1) { - Return (STA1) - } + Name (_HID, "ACPI0007") + Name (_UID, 0x01)

- Method (_EJ0, 1, NotSerialized) - { - If (LEqual (STA1, 0x0F)) + Name (STA1, 0x0F) + Method (_STA, 0, NotSerialized) { - Store (0x00, STA1) + Return (STA1) } - }

- Name (MAT0, Buffer (0x28) - { + Method (_EJ0, 1, NotSerialized) + { + If (LEqual (STA1, 0x0F)) + { + Store (0x00, STA1) + } + } + + Name (MAT0, Buffer (0x28) + { /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, /* type, len, reserved, gic_id */ /* 0008 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, /* uid, flags */ /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parking_version, performance_interrupt */ /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* parked_address */ /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 /* base_address */ - }) + })

- Name (MAT1, Buffer (0x28) - { + Name (MAT1, Buffer (0x28) + { /* 0000 */ 0x0B, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, /* 0008 */ 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, /* 0010 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0018 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0020 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }) + })

- Method (_MAT, 0, NotSerialized) - { - If (_STA()) - { - Return (MAT0) - } - Else + Method (_MAT, 0, NotSerialized) { - Return (MAT1) + If (_STA()) + { + Return (MAT0) + } + Else + { + Return (MAT1) + } } } }