From b3b795b97508a3a63e61114a112c03fb20618a4a Mon Sep 17 00:00:00 2001 From: Jay Kim Date: Mon, 8 Jul 2013 04:21:33 -0700 Subject: [PATCH] Revert "peppy: Flip RAM_ID GPIOs." This reverts commit e7e9b874e1f1d7aac17fbbd208fa989bb481a643 Let's revert this change. Quanta will change their BOM according to the original order. Without changing the schematic labels it will cause more confusion later. We will follow correct PC industry notation. Change-Id: Idc08f76f511e2e00b8d75afce1573da3fe4dd62e Reviewed-on: https://gerrit.chromium.org/gerrit/61083 Reviewed-by: Shawn Nematbakhsh Commit-Queue: Jay Kim Tested-by: Jay Kim --- src/mainboard/google/peppy/gpio.h | 4 ++-- src/mainboard/google/peppy/romstage.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mainboard/google/peppy/gpio.h b/src/mainboard/google/peppy/gpio.h index 296acd5062..32b1928072 100644 --- a/src/mainboard/google/peppy/gpio.h +++ b/src/mainboard/google/peppy/gpio.h @@ -36,7 +36,7 @@ const struct pch_lp_gpio_map mainboard_gpio_map[] = { LP_GPIO_ACPI_SCI, /* 10: WLAN_WAKE_L_Q */ LP_GPIO_UNUSED, /* 11: UNUSED */ LP_GPIO_INPUT_INVERT, /* 12: TRACKPAD_INT_L (WAKE) */ - LP_GPIO_INPUT, /* 13: RAM_ID2 */ + LP_GPIO_INPUT, /* 13: RAM_ID0 */ LP_GPIO_INPUT, /* 14: EC_IN_RW */ LP_GPIO_UNUSED, /* 15: UNUSED (STRAP) */ LP_GPIO_UNUSED, /* 16: UNUSED */ @@ -70,7 +70,7 @@ const struct pch_lp_gpio_map mainboard_gpio_map[] = { LP_GPIO_OUT_HIGH, /* 44: PP3300_SSD_EN */ LP_GPIO_OUT_HIGH, /* 45: PP3300_CODEC_EN */ LP_GPIO_OUT_HIGH, /* 46: WLAN_DISABLE_L */ - LP_GPIO_INPUT, /* 47: RAM_ID0 */ + LP_GPIO_INPUT, /* 47: RAM_ID2 */ LP_GPIO_UNUSED, /* 48: UNUSED */ LP_GPIO_UNUSED, /* 49: UNUSED */ LP_GPIO_UNUSED, /* 50: UNUSED */ diff --git a/src/mainboard/google/peppy/romstage.c b/src/mainboard/google/peppy/romstage.c index 73ad516a25..bfa168174c 100644 --- a/src/mainboard/google/peppy/romstage.c +++ b/src/mainboard/google/peppy/romstage.c @@ -74,7 +74,7 @@ const struct rcba_config_instruction rcba_config[] = { /* Copy SPD data for on-board memory */ static void copy_spd(struct pei_data *peid) { - const int gpio_vector[] = {47, 9, 13, -1}; + const int gpio_vector[] = {13, 9, 47, -1}; int spd_index = get_gpios(gpio_vector); struct cbfs_file *spd_file;