diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2017-01-09 01:35:48 -0600 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-06-12 04:07:32 +0200 |
| commit | e34a7705e64fab805d699bdb7ffa34c324696b38 (patch) | |
| tree | db16b971ec398ad860adcc0eec1c0b3e5ad94f70 | |
| parent | 4b18a922f0ab597fc010beeef01cee332fd48705 (diff) | |
| download | coreboot-e34a7705e64fab805d699bdb7ffa34c324696b38.tar.xz | |
soc/baytrail: fix scope for I2C ACPI devices
For an unknown reason, the I2C ACPI devices were placed
under \SB intead of \SB.PCI0, as with all other non-Atom
based Intel platforms. While Linux is tolerant of this,
Windows is not. Correct by moving I2C ACPI devices where
they belong.
Also, adjust I2C devices at board level for google/rambi
as to not break compilation.
Change-Id: I4ef978214aa36078dc04ee1c73b3e2b4bb22f692
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/20056
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
7 files changed, 16 insertions, 13 deletions
diff --git a/src/mainboard/google/rambi/acpi/mainboard.asl b/src/mainboard/google/rambi/acpi/mainboard.asl index 415065e22f..e75357d20b 100644 --- a/src/mainboard/google/rambi/acpi/mainboard.asl +++ b/src/mainboard/google/rambi/acpi/mainboard.asl @@ -81,7 +81,7 @@ Scope (\_SB) #endif } -Scope (\_SB.I2C2) +Scope (\_SB.PCI0.I2C2) { Device (CODC) { @@ -102,7 +102,7 @@ Scope (\_SB.I2C2) ControllerInitiated, // SlaveMode 400000, // ConnectionSpeed AddressingMode7Bit, // AddressingMode - "\\_SB.I2C2", // ResourceSource + "\\_SB.PCI0.I2C2", // ResourceSource ) Interrupt (ResourceConsumer, Level, ActiveLow) { @@ -121,7 +121,7 @@ Scope (\_SB.I2C2) } } -Scope (\_SB.LPEA) +Scope (\_SB.PCI0.LPEA) { Name (GBUF, ResourceTemplate () { diff --git a/src/mainboard/google/rambi/acpi/touchscreen_atmel.asl b/src/mainboard/google/rambi/acpi/touchscreen_atmel.asl index 1aec3ce083..80b28e21ef 100644 --- a/src/mainboard/google/rambi/acpi/touchscreen_atmel.asl +++ b/src/mainboard/google/rambi/acpi/touchscreen_atmel.asl @@ -14,7 +14,7 @@ #include <variant/onboard.h> -Scope (\_SB.I2C6) +Scope (\_SB.PCI0.I2C6) { Device (ATSA) { @@ -31,7 +31,7 @@ Scope (\_SB.I2C6) ControllerInitiated, // SlaveMode 400000, // ConnectionSpeed AddressingMode7Bit, // AddressingMode - "\\_SB.I2C6", // ResourceSource + "\\_SB.PCI0.I2C6", // ResourceSource ) Interrupt (ResourceConsumer, Level, ActiveLow) { diff --git a/src/mainboard/google/rambi/acpi/touchscreen_elan.asl b/src/mainboard/google/rambi/acpi/touchscreen_elan.asl index ac0763d947..feb6c9209d 100644 --- a/src/mainboard/google/rambi/acpi/touchscreen_elan.asl +++ b/src/mainboard/google/rambi/acpi/touchscreen_elan.asl @@ -14,7 +14,7 @@ #include <variant/onboard.h> -Scope (\_SB.I2C6) +Scope (\_SB.PCI0.I2C6) { Device (ETSA) { @@ -30,7 +30,7 @@ Scope (\_SB.I2C6) ControllerInitiated, // SlaveMode 400000, // ConnectionSpeed AddressingMode7Bit, // AddressingMode - "\\_SB.I2C6", // ResourceSource + "\\_SB.PCI0.I2C6", // ResourceSource ) Interrupt (ResourceConsumer, Level, ActiveLow) { diff --git a/src/mainboard/google/rambi/acpi/touchscreen_wdt.asl b/src/mainboard/google/rambi/acpi/touchscreen_wdt.asl index 0b5c100c7d..9732c1002b 100644 --- a/src/mainboard/google/rambi/acpi/touchscreen_wdt.asl +++ b/src/mainboard/google/rambi/acpi/touchscreen_wdt.asl @@ -14,7 +14,7 @@ #include <variant/onboard.h> -Scope (\_SB.I2C6) +Scope (\_SB.PCI0.I2C6) { Device (WTSA) { @@ -30,7 +30,7 @@ Scope (\_SB.I2C6) ControllerInitiated, // SlaveMode 400000, // ConnectionSpeed AddressingMode7Bit, // AddressingMode - "\\_SB.I2C6", // ResourceSource + "\\_SB.PCI0.I2C6", // ResourceSource ) Interrupt (ResourceConsumer, Level, ActiveLow) { diff --git a/src/mainboard/google/rambi/acpi/trackpad_atmel.asl b/src/mainboard/google/rambi/acpi/trackpad_atmel.asl index 1d9fb46197..20296bddf4 100644 --- a/src/mainboard/google/rambi/acpi/trackpad_atmel.asl +++ b/src/mainboard/google/rambi/acpi/trackpad_atmel.asl @@ -14,7 +14,7 @@ #include <variant/onboard.h> -Scope (\_SB.I2C1) +Scope (\_SB.PCI0.I2C1) { Device (ATPA) { @@ -30,7 +30,7 @@ Scope (\_SB.I2C1) ControllerInitiated, // SlaveMode 400000, // ConnectionSpeed AddressingMode7Bit, // AddressingMode - "\\_SB.I2C1", // ResourceSource + "\\_SB.PCI0.I2C1", // ResourceSource ) Interrupt (ResourceConsumer, Level, ActiveLow) { diff --git a/src/mainboard/google/rambi/acpi/trackpad_elan.asl b/src/mainboard/google/rambi/acpi/trackpad_elan.asl index 4f800cd906..d1adb138ef 100644 --- a/src/mainboard/google/rambi/acpi/trackpad_elan.asl +++ b/src/mainboard/google/rambi/acpi/trackpad_elan.asl @@ -14,7 +14,7 @@ #include <variant/onboard.h> -Scope (\_SB.I2C1) +Scope (\_SB.PCI0.I2C1) { Device (ETPA) { @@ -30,7 +30,7 @@ Scope (\_SB.I2C1) ControllerInitiated, // SlaveMode 400000, // ConnectionSpeed AddressingMode7Bit, // AddressingMode - "\\_SB.I2C1", // ResourceSource + "\\_SB.PCI0.I2C1", // ResourceSource ) Interrupt (ResourceConsumer, Level, ActiveLow) { diff --git a/src/soc/intel/baytrail/acpi/southcluster.asl b/src/soc/intel/baytrail/acpi/southcluster.asl index 834f6adff4..14731ee27c 100644 --- a/src/soc/intel/baytrail/acpi/southcluster.asl +++ b/src/soc/intel/baytrail/acpi/southcluster.asl @@ -258,7 +258,10 @@ Scope (\_SB) { // GPIO Devices #include "gpio.asl" +} +Scope (\_SB.PCI0) +{ // LPSS Devices #include "lpss.asl" |