diff options
| author | Julius Werner <jwerner@chromium.org> | 2014-09-26 21:01:08 -0700 |
|---|---|---|
| committer | Aaron Durbin <adurbin@google.com> | 2015-04-02 20:46:26 +0200 |
| commit | 8f3883d5f444d3b72661d585e4671d0996771305 (patch) | |
| tree | 9443ef37ec8e4cfd7e3f8e14838adf0b3dd00472 /src/mainboard/google/veyron_pinky/chromeos.c | |
| parent | 5c2988c4616d8326f56037e7ef5e8280c134ef7d (diff) | |
veyron_pinky: Add rev2 support, clean up mainboard.c
This patch adds support for the board changes in rev2 (board_id = 0001).
It also moves the existing mainboard.c code around a bit to group it by
component.
BUG=chrome-os-partner:32139
TEST=Booted on rev1. Confirmed SD card still works. Confirmed power
button was still as broken as before.
Original-Change-Id: Ifc4876687db64ca50e41d009d911446129d57b1b
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/220251
(cherry picked from commit 9428e0d1b784b27790b3b3dbbb18a769e51c6fd3)
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Change-Id: I8d3479aa314f8c6f1591c1b69b0a3827234fc730
Reviewed-on: http://review.coreboot.org/9237
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/mainboard/google/veyron_pinky/chromeos.c')
| -rw-r--r-- | src/mainboard/google/veyron_pinky/chromeos.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mainboard/google/veyron_pinky/chromeos.c b/src/mainboard/google/veyron_pinky/chromeos.c index 50dc4947dc..827b004394 100644 --- a/src/mainboard/google/veyron_pinky/chromeos.c +++ b/src/mainboard/google/veyron_pinky/chromeos.c @@ -25,8 +25,10 @@ #include <vendorcode/google/chromeos/chromeos.h> #include <soc/rockchip/rk3288/gpio.h> +#include "board.h" + #define GPIO_WP GPIO(7, A, 6) -#define GPIO_LID GPIO(7, B, 5) +#define GPIO_LID (board_id() > 0 ? GPIO(0, A, 6) : GPIO(7, B, 5)) #define GPIO_POWER GPIO(0, A, 5) #define GPIO_RECOVERY GPIO(0, B, 1) @@ -34,7 +36,7 @@ void setup_chromeos_gpios(void) { gpio_input(GPIO_WP); gpio_input_pullup(GPIO_LID); - gpio_input_pullup(GPIO_POWER); + gpio_input(GPIO_POWER); gpio_input_pullup(GPIO_RECOVERY); } |