From b9cd5ece14f0aeaa713299d114fcdca46276acf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 24 Apr 2015 16:05:58 +0300 Subject: sandy/ivy boards: Rename defines from onboard.h for ACPI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adopted style from later Chromebooks. Change-Id: I4993b8f40489b6bf5d08e00089f36f293853629e Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/9992 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/mainboard/google/parrot/acpi/mainboard.asl | 16 ++++++++++++---- src/mainboard/google/parrot/mainboard.c | 12 ++++++------ src/mainboard/google/parrot/onboard.h | 10 +++++----- 3 files changed, 23 insertions(+), 15 deletions(-) (limited to 'src/mainboard/google/parrot') diff --git a/src/mainboard/google/parrot/acpi/mainboard.asl b/src/mainboard/google/parrot/acpi/mainboard.asl index 503e44b620..9116c69ccd 100644 --- a/src/mainboard/google/parrot/acpi/mainboard.asl +++ b/src/mainboard/google/parrot/acpi/mainboard.asl @@ -19,6 +19,8 @@ * MA 02110-1301 USA */ +#include + Scope (\_GPE) { Method(_L1F, 0x0, NotSerialized) { @@ -59,19 +61,25 @@ Scope (\_SB) { Name(_HID, EisaId("PNP0C0E")) // Trackpad Wake is GPIO12, wake from S3 - Name(_PRW, Package(){0x1c, 0x03}) + Name(_PRW, Package() { BOARD_TRACKPAD_WAKE_GPIO, 0x03 }) Name(_CRS, ResourceTemplate() { // PIRQA -> GSI16 - Interrupt (ResourceConsumer, Level, ActiveLow) {16} + Interrupt (ResourceConsumer, Level, ActiveLow) + { + BOARD_TRACKPAD_IRQ_DVT + } // PIRQE -> GSI20 - Interrupt (ResourceConsumer, Edge, ActiveLow) {20} + Interrupt (ResourceConsumer, Edge, ActiveLow) + { + BOARD_TRACKPAD_IRQ_PVT + } // SMBUS Address 0x67 - VendorShort (ADDR) {0x67} + VendorShort (ADDR) { BOARD_TRACKPAD_I2C_ADDR } }) } diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c index 547680e7e2..39d2c8428f 100644 --- a/src/mainboard/google/parrot/mainboard.c +++ b/src/mainboard/google/parrot/mainboard.c @@ -62,19 +62,19 @@ static int parrot_onboard_smbios_data(device_t dev, int *handle, if (hardware_version < 0x2) { /* DVT vs PVT */ len += smbios_write_type41( current, handle, - PARROT_TRACKPAD_NAME, /* name */ - PARROT_TRACKPAD_IRQ_DVT, /* instance */ + BOARD_TRACKPAD_NAME, /* name */ + BOARD_TRACKPAD_IRQ_DVT, /* instance */ 0, /* segment */ - PARROT_TRACKPAD_I2C_ADDR, /* bus */ + BOARD_TRACKPAD_I2C_ADDR, /* bus */ 0, /* device */ 0); /* function */ } else { len += smbios_write_type41( current, handle, - PARROT_TRACKPAD_NAME, /* name */ - PARROT_TRACKPAD_IRQ_PVT, /* instance */ + BOARD_TRACKPAD_NAME, /* name */ + BOARD_TRACKPAD_IRQ_PVT, /* instance */ 0, /* segment */ - PARROT_TRACKPAD_I2C_ADDR, /* bus */ + BOARD_TRACKPAD_I2C_ADDR, /* bus */ 0, /* device */ 0); /* function */ } diff --git a/src/mainboard/google/parrot/onboard.h b/src/mainboard/google/parrot/onboard.h index f3d200d54e..1f878afc59 100644 --- a/src/mainboard/google/parrot/onboard.h +++ b/src/mainboard/google/parrot/onboard.h @@ -20,10 +20,10 @@ #ifndef PARROT_ONBOARD_H #define PARROT_ONBOARD_H -#include +#define BOARD_TRACKPAD_NAME "trackpad" +#define BOARD_TRACKPAD_I2C_ADDR 0x67 +#define BOARD_TRACKPAD_IRQ_DVT 16 +#define BOARD_TRACKPAD_IRQ_PVT 20 +#define BOARD_TRACKPAD_WAKE_GPIO 0x1c -#define PARROT_TRACKPAD_NAME "trackpad" -#define PARROT_TRACKPAD_I2C_ADDR 0x67 -#define PARROT_TRACKPAD_IRQ_DVT 16 -#define PARROT_TRACKPAD_IRQ_PVT 20 #endif -- cgit v1.2.3