diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-04-24 16:05:58 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-05-05 17:56:24 +0200 |
| commit | b9cd5ece14f0aeaa713299d114fcdca46276acf9 (patch) | |
| tree | 040a8d4983bf2919b97424d10d6579938cbcec19 /src/mainboard/samsung/lumpy | |
| parent | 168eda5f0d26a233bd997e0b0597926e80df57a3 (diff) | |
sandy/ivy boards: Rename defines from onboard.h for ACPI
Adopted style from later Chromebooks.
Change-Id: I4993b8f40489b6bf5d08e00089f36f293853629e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/9992
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/mainboard/samsung/lumpy')
| -rw-r--r-- | src/mainboard/samsung/lumpy/acpi/mainboard.asl | 18 | ||||
| -rw-r--r-- | src/mainboard/samsung/lumpy/mainboard.c | 12 | ||||
| -rw-r--r-- | src/mainboard/samsung/lumpy/onboard.h | 15 |
3 files changed, 26 insertions, 19 deletions
diff --git a/src/mainboard/samsung/lumpy/acpi/mainboard.asl b/src/mainboard/samsung/lumpy/acpi/mainboard.asl index b1ab678310..435dd5160a 100644 --- a/src/mainboard/samsung/lumpy/acpi/mainboard.asl +++ b/src/mainboard/samsung/lumpy/acpi/mainboard.asl @@ -19,6 +19,8 @@ * MA 02110-1301 USA */ +#include <mainboard/samsung/lumpy/onboard.h> + Scope (\_SB) { Device (LID0) { @@ -45,15 +47,18 @@ Scope (\_SB) { Name(_HID, EisaId("PNP0C0E")) // Trackpad Wake is GPIO11 - Name(_PRW, Package(){0x1b, 0x03}) + Name(_PRW, Package() { BOARD_TRACKPAD_WAKE_GPIO, 0x03 }) Name(_CRS, ResourceTemplate() { // PIRQF -> GSI21 - Interrupt (ResourceConsumer, Edge, ActiveLow) {21} + Interrupt (ResourceConsumer, Edge, ActiveLow) + { + BOARD_TRACKPAD_IRQ + } // SMBUS Address 0x67 - VendorShort (ADDR) {0x67} + VendorShort (ADDR) { BOARD_TRACKPAD_I2C_ADDR } }) } @@ -65,10 +70,13 @@ Scope (\_SB) { Name(_CRS, ResourceTemplate() { // PIRQE -> GSI20 - Interrupt (ResourceConsumer, Edge, ActiveLow) {20} + Interrupt (ResourceConsumer, Edge, ActiveLow) + { + BOARD_LIGHTSENSOR_IRQ + } // SMBUS Address 0x44 - VendorShort (ADDR) {0x44} + VendorShort (ADDR) { BOARD_LIGHTSENSOR_I2C_ADDR } }) } } diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c index 3bdd4d9815..6967a2b271 100644 --- a/src/mainboard/samsung/lumpy/mainboard.c +++ b/src/mainboard/samsung/lumpy/mainboard.c @@ -86,14 +86,14 @@ static int lumpy_onboard_smbios_data(device_t dev, int *handle, int len = 0; len += lumpy_smbios_type41_irq(handle, current, - LUMPY_LIGHTSENSOR_NAME, - LUMPY_LIGHTSENSOR_IRQ, - LUMPY_LIGHTSENSOR_I2C_ADDR); + BOARD_LIGHTSENSOR_NAME, + BOARD_LIGHTSENSOR_IRQ, + BOARD_LIGHTSENSOR_I2C_ADDR); len += lumpy_smbios_type41_irq(handle, current, - LUMPY_TRACKPAD_NAME, - LUMPY_TRACKPAD_IRQ, - LUMPY_TRACKPAD_I2C_ADDR); + BOARD_TRACKPAD_NAME, + BOARD_TRACKPAD_IRQ, + BOARD_TRACKPAD_I2C_ADDR); return len; } diff --git a/src/mainboard/samsung/lumpy/onboard.h b/src/mainboard/samsung/lumpy/onboard.h index 6bdf057eaa..500161267a 100644 --- a/src/mainboard/samsung/lumpy/onboard.h +++ b/src/mainboard/samsung/lumpy/onboard.h @@ -20,14 +20,13 @@ #ifndef LUMPY_ONBOARD_H #define LUMPY_ONBOARD_H -#include <arch/smp/mpspec.h> +#define BOARD_LIGHTSENSOR_NAME "lightsensor" +#define BOARD_LIGHTSENSOR_I2C_ADDR 0x44 +#define BOARD_LIGHTSENSOR_IRQ 20 -#define LUMPY_LIGHTSENSOR_NAME "lightsensor" -#define LUMPY_LIGHTSENSOR_I2C_ADDR 0x44 -#define LUMPY_LIGHTSENSOR_IRQ 20 - -#define LUMPY_TRACKPAD_NAME "trackpad" -#define LUMPY_TRACKPAD_I2C_ADDR 0x67 -#define LUMPY_TRACKPAD_IRQ 21 +#define BOARD_TRACKPAD_NAME "trackpad" +#define BOARD_TRACKPAD_I2C_ADDR 0x67 +#define BOARD_TRACKPAD_IRQ 21 +#define BOARD_TRACKPAD_WAKE_GPIO 0x1b #endif |