soc/braswell: 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 intel/strago and google/cyan as to not break compilation. Change-Id: Iaf8211bd86d6261ee8c4d9c4262338f7fe19ef43 Signed-off-by: Matt DeVillier <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/20055 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
397c7b3411
commit
6a67ffb6ea
|
@ -26,7 +26,7 @@ Scope (\_SB)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.I2C1)
|
||||
Scope (\_SB.PCI0.I2C1)
|
||||
{
|
||||
Device (ETSA)
|
||||
{
|
||||
|
@ -44,7 +44,7 @@ Scope (\_SB.I2C1)
|
|||
ControllerInitiated, /* SlaveMode */
|
||||
400000, /* ConnectionSpeed */
|
||||
AddressingMode7Bit, /* AddressingMode */
|
||||
"\\_SB.I2C1", /* ResourceSource */
|
||||
"\\_SB.PCI0.I2C1", /* ResourceSource */
|
||||
)
|
||||
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
|
||||
"\\_SB.GPSW") { BOARD_TOUCH_GPIO_INDEX }
|
||||
|
@ -57,7 +57,7 @@ Scope (\_SB.I2C1)
|
|||
ControllerInitiated, /* SlaveMode */
|
||||
400000, /* ConnectionSpeed */
|
||||
AddressingMode7Bit, /* AddressingMode */
|
||||
"\\_SB.I2C1", /* ResourceSource */
|
||||
"\\_SB.PCI0.I2C1", /* ResourceSource */
|
||||
)
|
||||
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
|
||||
"\\_SB.GPNC") { BOARD_EVT_TOUCH_GPIO_INDEX }
|
||||
|
@ -86,7 +86,7 @@ Scope (\_SB.I2C1)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.I2C2)
|
||||
Scope (\_SB.PCI0.I2C2)
|
||||
{
|
||||
/* Maxim Audio Codec */
|
||||
Device (MAXM) /* Audio Codec driver I2C */
|
||||
|
@ -115,7 +115,7 @@ Scope (\_SB.I2C2)
|
|||
ControllerInitiated, /* SlaveMode: default to ControllerInitiated */
|
||||
400000, /* ConnectionSpeed: in Hz */
|
||||
AddressingMode7Bit, /* Addressing Mode: default to 7 bit */
|
||||
"\\_SB.I2C2", /* ResourceSource: I2C bus controller name */
|
||||
"\\_SB.PCI0.I2C2", /* ResourceSource: I2C bus controller name */
|
||||
)
|
||||
|
||||
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
|
||||
|
@ -159,7 +159,7 @@ Scope (\_SB.I2C2)
|
|||
ControllerInitiated, /* SlaveMode: default to ControllerInitiated */
|
||||
400000, /* ConnectionSpeed: in Hz */
|
||||
AddressingMode7Bit, /* Addressing Mode: default to 7 bit */
|
||||
"\\_SB.I2C2", /* ResourceSource: I2C bus controller name */
|
||||
"\\_SB.PCI0.I2C2", /* ResourceSource: I2C bus controller name */
|
||||
)
|
||||
|
||||
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
|
||||
|
@ -176,7 +176,7 @@ Scope (\_SB.I2C2)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.I2C6)
|
||||
Scope (\_SB.PCI0.I2C6)
|
||||
{
|
||||
Device (ETPA)
|
||||
{
|
||||
|
@ -192,7 +192,7 @@ Scope (\_SB.I2C6)
|
|||
ControllerInitiated, /* SlaveMode */
|
||||
400000, /* ConnectionSpeed */
|
||||
AddressingMode7Bit, /* AddressingMode */
|
||||
"\\_SB.I2C6", /* ResourceSource */
|
||||
"\\_SB.PCI0.I2C6", /* ResourceSource */
|
||||
)
|
||||
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
|
||||
"\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX }
|
||||
|
@ -214,7 +214,7 @@ Scope (\_SB.I2C6)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.LPEA)
|
||||
Scope (\_SB.PCI0.LPEA)
|
||||
{
|
||||
Name (GBUF, ResourceTemplate ()
|
||||
{
|
||||
|
|
|
@ -26,7 +26,7 @@ Scope (\_SB)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.I2C1)
|
||||
Scope (\_SB.PCI0.I2C1)
|
||||
{
|
||||
Device (ATSB)
|
||||
{
|
||||
|
@ -44,7 +44,7 @@ Scope (\_SB.I2C1)
|
|||
ControllerInitiated, /* SlaveMode */
|
||||
400000, /* ConnectionSpeed */
|
||||
AddressingMode7Bit, /* AddressingMode */
|
||||
"\\_SB.I2C1", /* ResourceSource */
|
||||
"\\_SB.PCI0.I2C1", /* ResourceSource */
|
||||
)
|
||||
Interrupt (ResourceConsumer, Edge, ActiveLow)
|
||||
{
|
||||
|
@ -83,7 +83,7 @@ Scope (\_SB.I2C1)
|
|||
ControllerInitiated, /* SlaveMode */
|
||||
400000, /* ConnectionSpeed */
|
||||
AddressingMode7Bit, /* AddressingMode */
|
||||
"\\_SB.I2C1", /* ResourceSource */
|
||||
"\\_SB.PCI0.I2C1", /* ResourceSource */
|
||||
)
|
||||
Interrupt (ResourceConsumer, Edge, ActiveLow)
|
||||
{
|
||||
|
@ -109,7 +109,7 @@ Scope (\_SB.I2C1)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.I2C5)
|
||||
Scope (\_SB.PCI0.I2C5)
|
||||
{
|
||||
/* Realtek Audio Codec */
|
||||
Device (RTEK) /* Audio Codec driver I2C */
|
||||
|
@ -129,7 +129,7 @@ Scope (\_SB.I2C5)
|
|||
ControllerInitiated, /* SlaveMode: default to ControllerInitiated */
|
||||
400000, /* ConnectionSpeed: in Hz */
|
||||
AddressingMode7Bit, /* Addressing Mode: default to 7 bit */
|
||||
"\\_SB.I2C5", /* ResourceSource: I2C bus controller name */
|
||||
"\\_SB.PCI0.I2C5" /* ResourceSource: I2C bus controller name */
|
||||
)
|
||||
|
||||
/* Jack Detect (index 0) */
|
||||
|
@ -146,7 +146,7 @@ Scope (\_SB.I2C5)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.I2C6)
|
||||
Scope (\_SB.PCI0.I2C6)
|
||||
{
|
||||
Device (ETPA)
|
||||
{
|
||||
|
@ -162,7 +162,7 @@ Scope (\_SB.I2C6)
|
|||
ControllerInitiated, /* SlaveMode */
|
||||
400000, /* ConnectionSpeed */
|
||||
AddressingMode7Bit, /* AddressingMode */
|
||||
"\\_SB.I2C6", /* ResourceSource */
|
||||
"\\_SB.PCI0.I2C6", /* ResourceSource */
|
||||
)
|
||||
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
|
||||
"\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX }
|
||||
|
@ -183,7 +183,7 @@ Scope (\_SB.I2C6)
|
|||
}
|
||||
}
|
||||
|
||||
Scope (\_SB.LPEA)
|
||||
Scope (\_SB.PCI0.LPEA)
|
||||
{
|
||||
Name (GBUF, ResourceTemplate ()
|
||||
{
|
||||
|
|
|
@ -253,7 +253,10 @@ Scope (\_SB)
|
|||
{
|
||||
/* GPIO Devices */
|
||||
#include "gpio.asl"
|
||||
}
|
||||
|
||||
Scope (\_SB.PCI0)
|
||||
{
|
||||
/* LPSS Devices */
|
||||
#include "lpss.asl"
|
||||
|
||||
|
|
Loading…
Reference in New Issue