Emulation/switch-coreboot
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-coreboot.git synced 2025-05-04 01:39:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

UPSTREAM: soc/braswell: fix scope for I2C ACPI devices

Browse source 
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.

BUG=none
BRANCH=none
TEST=none

Change-Id: I39d845ba3b6d07d8bb5f63f663316750f03f20a6
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 6a67ffb6ea
Original-Change-Id: Iaf8211bd86d6261ee8c4d9c4262338f7fe19ef43
Original-Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/20055
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-on: https://chromium-review.googlesource.com/531193
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-06-02 12:30:07 -05:00 • committed by chrome-bot
parent a5b7b22ce0
commit 09ef487227
3 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mainboard/google/cyan/acpi/mainboard.asl
View file

@ -26,7 +26,7 @@ Scope (\_SB)
} }
} }
Scope (\_SB.I2C1) Scope (\_SB.PCI0.I2C1)
{ {
Device (ETSA) Device (ETSA)
{ {
@ -44,7 +44,7 @@ Scope (\_SB.I2C1)
ControllerInitiated, /* SlaveMode */ ControllerInitiated, /* SlaveMode */
400000, /* ConnectionSpeed */ 400000, /* ConnectionSpeed */
AddressingMode7Bit, /* AddressingMode */ AddressingMode7Bit, /* AddressingMode */
"\\_SB.I2C1", /* ResourceSource */ "\\_SB.PCI0.I2C1", /* ResourceSource */
) )
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,, GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
"\\_SB.GPSW") { BOARD_TOUCH_GPIO_INDEX } "\\_SB.GPSW") { BOARD_TOUCH_GPIO_INDEX }
@ -57,7 +57,7 @@ Scope (\_SB.I2C1)
ControllerInitiated, /* SlaveMode */ ControllerInitiated, /* SlaveMode */
400000, /* ConnectionSpeed */ 400000, /* ConnectionSpeed */
AddressingMode7Bit, /* AddressingMode */ AddressingMode7Bit, /* AddressingMode */
"\\_SB.I2C1", /* ResourceSource */ "\\_SB.PCI0.I2C1", /* ResourceSource */
) )
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,, GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
"\\_SB.GPNC") { BOARD_EVT_TOUCH_GPIO_INDEX } "\\_SB.GPNC") { BOARD_EVT_TOUCH_GPIO_INDEX }
@ -86,7 +86,7 @@ Scope (\_SB.I2C1)
} }
} }
Scope (\_SB.I2C2) Scope (\_SB.PCI0.I2C2)
{ {
/* Maxim Audio Codec */ /* Maxim Audio Codec */
Device (MAXM) /* Audio Codec driver I2C */ Device (MAXM) /* Audio Codec driver I2C */
@ -115,7 +115,7 @@ Scope (\_SB.I2C2)
ControllerInitiated, /* SlaveMode: default to ControllerInitiated */ ControllerInitiated, /* SlaveMode: default to ControllerInitiated */
400000, /* ConnectionSpeed: in Hz */ 400000, /* ConnectionSpeed: in Hz */
AddressingMode7Bit, /* Addressing Mode: default to 7 bit */ 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,, GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
@ -159,7 +159,7 @@ Scope (\_SB.I2C2)
ControllerInitiated, /* SlaveMode: default to ControllerInitiated */ ControllerInitiated, /* SlaveMode: default to ControllerInitiated */
400000, /* ConnectionSpeed: in Hz */ 400000, /* ConnectionSpeed: in Hz */
AddressingMode7Bit, /* Addressing Mode: default to 7 bit */ 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,, GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
@ -176,7 +176,7 @@ Scope (\_SB.I2C2)
} }
} }
Scope (\_SB.I2C6) Scope (\_SB.PCI0.I2C6)
{ {
Device (ETPA) Device (ETPA)
{ {
@ -192,7 +192,7 @@ Scope (\_SB.I2C6)
ControllerInitiated, /* SlaveMode */ ControllerInitiated, /* SlaveMode */
400000, /* ConnectionSpeed */ 400000, /* ConnectionSpeed */
AddressingMode7Bit, /* AddressingMode */ AddressingMode7Bit, /* AddressingMode */
"\\_SB.I2C6", /* ResourceSource */ "\\_SB.PCI0.I2C6", /* ResourceSource */
) )
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,, GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
"\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX } "\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX }
@ -214,7 +214,7 @@ Scope (\_SB.I2C6)
} }
} }
Scope (\_SB.LPEA) Scope (\_SB.PCI0.LPEA)
{ {
Name (GBUF, ResourceTemplate () Name (GBUF, ResourceTemplate ()
{ {

16
src/mainboard/intel/strago/acpi/mainboard.asl
View file

@ -26,7 +26,7 @@ Scope (\_SB)
} }
} }
Scope (\_SB.I2C1) Scope (\_SB.PCI0.I2C1)
{ {
Device (ATSB) Device (ATSB)
{ {
@ -44,7 +44,7 @@ Scope (\_SB.I2C1)
ControllerInitiated, /* SlaveMode */ ControllerInitiated, /* SlaveMode */
400000, /* ConnectionSpeed */ 400000, /* ConnectionSpeed */
AddressingMode7Bit, /* AddressingMode */ AddressingMode7Bit, /* AddressingMode */
"\\_SB.I2C1", /* ResourceSource */ "\\_SB.PCI0.I2C1", /* ResourceSource */
) )
Interrupt (ResourceConsumer, Edge, ActiveLow) Interrupt (ResourceConsumer, Edge, ActiveLow)
{ {
@ -83,7 +83,7 @@ Scope (\_SB.I2C1)
ControllerInitiated, /* SlaveMode */ ControllerInitiated, /* SlaveMode */
400000, /* ConnectionSpeed */ 400000, /* ConnectionSpeed */
AddressingMode7Bit, /* AddressingMode */ AddressingMode7Bit, /* AddressingMode */
"\\_SB.I2C1", /* ResourceSource */ "\\_SB.PCI0.I2C1", /* ResourceSource */
) )
Interrupt (ResourceConsumer, Edge, ActiveLow) Interrupt (ResourceConsumer, Edge, ActiveLow)
{ {
@ -109,7 +109,7 @@ Scope (\_SB.I2C1)
} }
} }
Scope (\_SB.I2C5) Scope (\_SB.PCI0.I2C5)
{ {
/* Realtek Audio Codec */ /* Realtek Audio Codec */
Device (RTEK) /* Audio Codec driver I2C */ Device (RTEK) /* Audio Codec driver I2C */
@ -129,7 +129,7 @@ Scope (\_SB.I2C5)
ControllerInitiated, /* SlaveMode: default to ControllerInitiated */ ControllerInitiated, /* SlaveMode: default to ControllerInitiated */
400000, /* ConnectionSpeed: in Hz */ 400000, /* ConnectionSpeed: in Hz */
AddressingMode7Bit, /* Addressing Mode: default to 7 bit */ 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) */ /* Jack Detect (index 0) */
@ -146,7 +146,7 @@ Scope (\_SB.I2C5)
} }
} }
Scope (\_SB.I2C6) Scope (\_SB.PCI0.I2C6)
{ {
Device (ETPA) Device (ETPA)
{ {
@ -162,7 +162,7 @@ Scope (\_SB.I2C6)
ControllerInitiated, /* SlaveMode */ ControllerInitiated, /* SlaveMode */
400000, /* ConnectionSpeed */ 400000, /* ConnectionSpeed */
AddressingMode7Bit, /* AddressingMode */ AddressingMode7Bit, /* AddressingMode */
"\\_SB.I2C6", /* ResourceSource */ "\\_SB.PCI0.I2C6", /* ResourceSource */
) )
GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,, GpioInt (Edge, ActiveLow, ExclusiveAndWake, PullNone,,
"\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX } "\\_SB.GPNC") { BOARD_TRACKPAD_GPIO_INDEX }
@ -183,7 +183,7 @@ Scope (\_SB.I2C6)
} }
} }
Scope (\_SB.LPEA) Scope (\_SB.PCI0.LPEA)
{ {
Name (GBUF, ResourceTemplate () Name (GBUF, ResourceTemplate ()
{ {

3
src/soc/intel/braswell/acpi/southcluster.asl
View file

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