UPSTREAM: 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.

BUG=none
BRANCH=none
TEST=none

Change-Id: I3afebbfaf56aa8cc9756d8878f9dda458d81f679
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: e34a7705e6
Original-Change-Id: I4ef978214aa36078dc04ee1c73b3e2b4bb22f692
Original-Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/20056
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-on: https://chromium-review.googlesource.com/531720
Commit-Ready: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
This commit is contained in:
Matt DeVillier 2017-01-09 01:35:48 -06:00 committed by chrome-bot
parent e90a9d7278
commit 3dedd74385
7 changed files with 16 additions and 13 deletions

View file

@ -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 ()
{

View file

@ -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)
{

View file

@ -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)
{

View file

@ -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)
{

View file

@ -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)
{

View file

@ -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)
{

View file

@ -258,7 +258,10 @@ Scope (\_SB)
{
// GPIO Devices
#include "gpio.asl"
}
Scope (\_SB.PCI0)
{
// LPSS Devices
#include "lpss.asl"