diff options
| author | Chris Sosa <sosa@chromium.org> | 2012-04-13 15:58:12 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-04-13 15:58:12 -0700 |
| commit | bf2fad0a254894aabb0aca2fb3ab155b4ab81203 (patch) | |
| tree | 587d6c00a09e3601aac44cd834d54c549a3b7ed1 | |
| parent | 4fd27c69196651497f25843fe93718f6b27bbec0 (diff) | |
| parent | f6d9b193586209674cd585304df2e7ff58272ae7 (diff) | |
| download | chrome-ec-bf2fad0a254894aabb0aca2fb3ab155b4ab81203.tar.gz | |
Merge "Remove DDR shunt signal, which is no longer present on proto1"
| -rw-r--r-- | board/link/board.c | 1 | ||||
| -rw-r--r-- | board/link/board.h | 2 | ||||
| -rw-r--r-- | common/x86_power.c | 3 |
3 files changed, 0 insertions, 6 deletions
diff --git a/board/link/board.c b/board/link/board.c index 2cb8fe41d0..ad432015c3 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -90,7 +90,6 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"PCH_RSMRSTn", LM4_GPIO_F, (1<<1), GPIO_OUT_LOW, NULL}, {"PCH_SMIn", LM4_GPIO_F, (1<<4), GPIO_OUT_HIGH, NULL}, {"PCH_SUSACKn", LM4_GPIO_F, (1<<3), GPIO_OUT_HIGH, NULL}, - {"SHUNT_1_5V_DDR", LM4_GPIO_F, (1<<6), GPIO_OUT_HIGH, NULL}, {"TOUCHSCREEN_RESETn", LM4_GPIO_B, (1<<0), GPIO_OUT_LOW, NULL}, {"USB1_CTL1", LM4_GPIO_E, (1<<2), GPIO_OUT_LOW, NULL}, {"USB1_CTL2", LM4_GPIO_E, (1<<3), GPIO_OUT_LOW, NULL}, diff --git a/board/link/board.h b/board/link/board.h index 235c8d099b..44db8e1af3 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -155,8 +155,6 @@ enum gpio_signal { GPIO_PCH_RSMRSTn, /* Reset PCH resume power plane logic */ GPIO_PCH_SMIn, /* System management interrupt to PCH */ GPIO_PCH_SUSACKn, /* Acknowledge PCH SUSWARN# signal */ - GPIO_SHUNT_1_5V_DDR, /* Shunt +1.5V_DDR (Proto0 only) */ - /* TODO: remove once we move to proto1 */ GPIO_TOUCHSCREEN_RESETn, /* Reset touch screen (Proto1+) */ GPIO_USB1_CTL1, /* USB charger port 1 CTL1 output */ GPIO_USB1_CTL2, /* USB charger port 1 CTL2 output */ diff --git a/common/x86_power.c b/common/x86_power.c index f82b4ff0d3..8cb1daaa55 100644 --- a/common/x86_power.c +++ b/common/x86_power.c @@ -266,7 +266,6 @@ int x86_power_init(void) gpio_set_level(GPIO_ENABLE_TOUCHPAD, 0); gpio_set_level(GPIO_TOUCHSCREEN_RESETn, 0); gpio_set_level(GPIO_ENABLE_1_5V_DDR, 0); - gpio_set_level(GPIO_SHUNT_1_5V_DDR, 1); gpio_set_level(GPIO_PCH_RSMRSTn, 0); gpio_set_level(GPIO_PCH_DPWROK, 0); } @@ -330,7 +329,6 @@ void x86_power_task(void) case X86_S5S3: /* Turn on power to RAM */ - gpio_set_level(GPIO_SHUNT_1_5V_DDR, 0); gpio_set_level(GPIO_ENABLE_1_5V_DDR, 1); /* Enable touchpad power and take touchscreen out of @@ -410,7 +408,6 @@ void x86_power_task(void) /* Turn off power to RAM */ gpio_set_level(GPIO_ENABLE_1_5V_DDR, 0); - gpio_set_level(GPIO_SHUNT_1_5V_DDR, 1); state = X86_S5; break; |