[coreboot-gerrit] Change in coreboot[master]: soc/baytrail: fix scope for I2C ACPI devices
Matt DeVillier (Code Review)
gerrit at coreboot.org
Tue Jun 6 23:10:26 CEST 2017
Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/20056
Change subject: soc/baytrail: fix scope for I2C ACPI devices
......................................................................
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 at gmail.com>
---
M src/mainboard/google/rambi/acpi/mainboard.asl
M src/mainboard/google/rambi/acpi/touchscreen_atmel.asl
M src/mainboard/google/rambi/acpi/touchscreen_elan.asl
M src/mainboard/google/rambi/acpi/touchscreen_wdt.asl
M src/mainboard/google/rambi/acpi/trackpad_atmel.asl
M src/mainboard/google/rambi/acpi/trackpad_elan.asl
M src/soc/intel/baytrail/acpi/southcluster.asl
7 files changed, 19 insertions(+), 15 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/20056/1
diff --git a/src/mainboard/google/rambi/acpi/mainboard.asl b/src/mainboard/google/rambi/acpi/mainboard.asl
index 415065e..e75357d 100644
--- a/src/mainboard/google/rambi/acpi/mainboard.asl
+++ b/src/mainboard/google/rambi/acpi/mainboard.asl
@@ -81,7 +81,7 @@
#endif
}
-Scope (\_SB.I2C2)
+Scope (\_SB.PCI0.I2C2)
{
Device (CODC)
{
@@ -102,7 +102,7 @@
ControllerInitiated, // SlaveMode
400000, // ConnectionSpeed
AddressingMode7Bit, // AddressingMode
- "\\_SB.I2C2", // ResourceSource
+ "\\_SB.PCI0.I2C2", // ResourceSource
)
Interrupt (ResourceConsumer, Level, ActiveLow)
{
@@ -121,7 +121,7 @@
}
}
-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 1aec3ce..80b28e2 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 @@
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 ac0763d..feb6c92 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 @@
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 0b5c100..9732c10 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 @@
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 1d9fb46..20296bd 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 @@
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 4f800cd..d1adb13 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 @@
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 834f6ad..acf29d6 100644
--- a/src/soc/intel/baytrail/acpi/southcluster.asl
+++ b/src/soc/intel/baytrail/acpi/southcluster.asl
@@ -258,12 +258,16 @@
{
// GPIO Devices
#include "gpio.asl"
+}
+
+Scope (\_SB.PCI0)
+{
+ // SCC Devices
+ #include "scc.asl"
// LPSS Devices
#include "lpss.asl"
- // SCC Devices
- #include "scc.asl"
// LPE Device
#include "lpe.asl"
--
To view, visit https://review.coreboot.org/20056
To unsubscribe, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4ef978214aa36078dc04ee1c73b3e2b4bb22f692
Gerrit-Change-Number: 20056
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier at gmail.com>
More information about the coreboot-gerrit
mailing list