diff options
Diffstat (limited to 'src/mainboard/google/glados/acpi')
-rw-r--r-- | src/mainboard/google/glados/acpi/chromeos.asl | 4 | ||||
-rw-r--r-- | src/mainboard/google/glados/acpi/ec.asl | 1 | ||||
-rw-r--r-- | src/mainboard/google/glados/acpi/mainboard.asl | 18 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/mainboard/google/glados/acpi/chromeos.asl b/src/mainboard/google/glados/acpi/chromeos.asl index 09f7ed1de4..b8cef5ea91 100644 --- a/src/mainboard/google/glados/acpi/chromeos.asl +++ b/src/mainboard/google/glados/acpi/chromeos.asl @@ -17,11 +17,11 @@ * Foundation, Inc. */ -#include <soc/gpio.h> +#include <mainboard/google/glados/gpio.h> Name (OIPG, Package () { /* No physical recovery GPIO. */ Package () { 0x0001, 0, 0xFFFFFFFF, "INT344B:00" }, /* Firmware write protect GPIO. */ - Package () { 0x0003, 1, GPP_C23, "INT344B:00" }, + Package () { 0x0003, 1, GPIO_PCH_WP, "INT344B:00" }, }) diff --git a/src/mainboard/google/glados/acpi/ec.asl b/src/mainboard/google/glados/acpi/ec.asl index 8e7532de34..321b2ce600 100644 --- a/src/mainboard/google/glados/acpi/ec.asl +++ b/src/mainboard/google/glados/acpi/ec.asl @@ -19,6 +19,7 @@ /* mainboard configuration */ #include <mainboard/google/glados/ec.h> +#include <mainboard/google/glados/gpio.h> /* Enable EC backed PD MCU device in ACPI */ #define EC_ENABLE_PD_MCU_DEVICE diff --git a/src/mainboard/google/glados/acpi/mainboard.asl b/src/mainboard/google/glados/acpi/mainboard.asl index e2a1b5f0f8..8e512596f5 100644 --- a/src/mainboard/google/glados/acpi/mainboard.asl +++ b/src/mainboard/google/glados/acpi/mainboard.asl @@ -17,15 +17,16 @@ * Foundation, Inc. */ -#include <soc/gpio.h> +#include <mainboard/google/glados/gpio.h> #define BOARD_TOUCHPAD_I2C_ADDR 0x15 -#define BOARD_TOUCHPAD_IRQ GPP_B3_IRQ +#define BOARD_TOUCHPAD_IRQ TOUCHPAD_INT_L #define BOARD_TOUCHSCREEN_I2C_ADDR 0x10 -#define BOARD_TOUCHSCREEN_IRQ GPP_E7_IRQ +#define BOARD_TOUCHSCREEN_IRQ TOUCHSCREEN_INT_L #define BOARD_HP_MIC_CODEC_I2C_ADDR 0x1a +#define BOARD_HP_MIC_CODEC_IRQ MIC_INT_L #define BOARD_LEFT_SPEAKER_AMP_I2C_ADDR 0x34 #define BOARD_RIGHT_SPEAKER_AMP_I2C_ADDR 0x35 @@ -33,19 +34,18 @@ Scope (\_SB) { Device (LID0) { - Name (_HID, EisaId("PNP0C0D")) + Name (_HID, EisaId ("PNP0C0D")) Method (_LID, 0) { Return (\_SB.PCI0.LPCB.EC0.LIDS) } - /* EC wake is LAN_WAKE# which is a special DeepSX wake pin */ - Name (_PRW, Package(){ GPE0_LAN_WAK, 5 }) + Name (_PRW, Package () { GPE_EC_WAKE, 5 }) } Device (PWRB) { - Name(_HID, EisaId("PNP0C0C")) + Name (_HID, EisaId ("PNP0C0C")) } /* Keyboard Backlight interface via EC */ @@ -157,6 +157,10 @@ Scope (\_SB.PCI0.I2C4) AddressingMode7Bit, "\\_SB.PCI0.I2C4", ) + Interrupt (ResourceConsumer, Edge, ActiveLow) + { + BOARD_HP_MIC_CODEC_IRQ + } }) Method (_STA) |