From 09634d0328fdaa6a182a9467a9eb6e97ebcb8da9 Mon Sep 17 00:00:00 2001 From: Yidi Lin Date: Wed, 1 Mar 2017 15:41:38 +0800 Subject: google/oak: gpio: update RAM ID pins for Rowan RAMD_ID_1 moves to PAD_DSI_TE and RAM_ID_2 moves to PAD_RDP1_A on Rowan. BUG=chrome-os-partner:62672 BRANCH=none TEST=emerge-rowan coreboot Change-Id: Iae44934d8d669d696b83f9d3e3450a0e408fe062 Signed-off-by: Patrick Georgi Gerrit-Rebase-Ignore-CLs-Before: https://chromium-review.googlesource.com/539234 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/388068 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/453778 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/454921 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/455118 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/479613 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/487023 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/498587 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/506785 Ignore-CL-Reviewed-on: https://chromium-review.googlesource.com/520572 Original-Commit-Id: 4da19b3c00578f96ec933cff9ad0c9988a4c4a30 Original-Change-Id: I64fd29de607a0b360d355fd3724e3a649adc658b Original-Signed-off-by: Yidi Lin Original-Reviewed-on: https://chromium-review.googlesource.com/448397 Original-Reviewed-by: Julius Werner Reviewed-on: https://review.coreboot.org/18583 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Martin Roth --- src/mainboard/google/oak/gpio.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/mainboard/google/oak/gpio.h') diff --git a/src/mainboard/google/oak/gpio.h b/src/mainboard/google/oak/gpio.h index 35f47c6b6e7c..4bed95d5463e 100644 --- a/src/mainboard/google/oak/gpio.h +++ b/src/mainboard/google/oak/gpio.h @@ -21,6 +21,11 @@ : ((board_id() + CONFIG_BOARD_ID_ADJUSTMENT < 7) ? PAD_EINT12 \ : PAD_SPI_CK)) +#define RAM_ID_1 ((IS_ENABLED(CONFIG_BOARD_GOOGLE_ROWAN)) ? PAD_DSI_TE \ + : PAD_RCN_A) + +#define RAM_ID_2 ((IS_ENABLED(CONFIG_BOARD_GOOGLE_ROWAN)) ? PAD_RDP1_A \ + : PAD_RCP_A) enum { /* Board ID related GPIOS. */ @@ -29,8 +34,6 @@ enum { BOARD_ID_2 = PAD_RDN2_A, /* RAM ID related GPIOS. */ RAM_ID_0 = PAD_RDP2_A, - RAM_ID_1 = PAD_RCN_A, - RAM_ID_2 = PAD_RCP_A, RAM_ID_3 = PAD_RDN1_A, /* Write Protect */ WRITE_PROTECT = PAD_EINT4, -- cgit v1.2.3