From b9cd5ece14f0aeaa713299d114fcdca46276acf9 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki 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/butterfly/acpi/mainboard.asl | 11 ++++++++--- src/mainboard/google/butterfly/mainboard.c | 6 +++--- src/mainboard/google/butterfly/onboard.h | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) (limited to 'src/mainboard/google/butterfly') diff --git a/src/mainboard/google/butterfly/acpi/mainboard.asl b/src/mainboard/google/butterfly/acpi/mainboard.asl index c6e35e8a84..342193fb26 100644 --- a/src/mainboard/google/butterfly/acpi/mainboard.asl +++ b/src/mainboard/google/butterfly/acpi/mainboard.asl @@ -19,6 +19,8 @@ * MA 02110-1301 USA */ +#include + Scope (\_SB) { Device (LID0) { @@ -45,15 +47,18 @@ Scope (\_SB) { Name(_HID, EisaId("PNP0C0E")) // Trackpad Wake is GPIO11, wake from S3 - Name(_PRW, Package(){0x1b, 0x03}) + Name(_PRW, Package() { BOARD_TRACKPAD_WAKE_GPIO, 0x03 }) Name(_CRS, ResourceTemplate() { // PIRQG -> GSI22 - Interrupt (ResourceConsumer, EDGE, ActiveLow) {22} + Interrupt (ResourceConsumer, EDGE, ActiveLow) + { + BOARD_TRACKPAD_IRQ + } // SMBUS Address 0x67 - VendorShort (ADDR) {0x67} + VendorShort (ADDR) { BOARD_TRACKPAD_I2C_ADDR } }) } diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c index 655fc2fc14..f83b33b5c0 100644 --- a/src/mainboard/google/butterfly/mainboard.c +++ b/src/mainboard/google/butterfly/mainboard.c @@ -265,10 +265,10 @@ static int butterfly_onboard_smbios_data(device_t dev, int *handle, len += smbios_write_type41( current, handle, - BUTTERFLY_TRACKPAD_NAME, /* name */ - BUTTERFLY_TRACKPAD_IRQ, /* instance */ + BOARD_TRACKPAD_NAME, /* name */ + BOARD_TRACKPAD_IRQ, /* instance */ 0, /* segment */ - BUTTERFLY_TRACKPAD_I2C_ADDR, /* bus */ + BOARD_TRACKPAD_I2C_ADDR, /* bus */ 0, /* device */ 0); /* function */ diff --git a/src/mainboard/google/butterfly/onboard.h b/src/mainboard/google/butterfly/onboard.h index e32e0237ef..08ba806db3 100644 --- a/src/mainboard/google/butterfly/onboard.h +++ b/src/mainboard/google/butterfly/onboard.h @@ -20,12 +20,12 @@ #ifndef BUTTERFLY_ONBOARD_H #define BUTTERFLY_ONBOARD_H -#include /* uses 7-bit I2C address */ /* must be set to edge triggered */ -#define BUTTERFLY_TRACKPAD_NAME "trackpad" -#define BUTTERFLY_TRACKPAD_I2C_ADDR 0x67 -#define BUTTERFLY_TRACKPAD_IRQ 22 /* PIRQG - 22 Edge triggered */ +#define BOARD_TRACKPAD_NAME "trackpad" +#define BOARD_TRACKPAD_I2C_ADDR 0x67 +#define BOARD_TRACKPAD_IRQ 22 /* PIRQG - 22 Edge triggered */ +#define BOARD_TRACKPAD_WAKE_GPIO 0x1b /* defines for programming the MAC address */ #define BUTTERFLY_NIC_VENDOR_ID 0x10EC -- cgit v1.2.3