From 33422ee34169123a53bf47366e3ce474a6acfb3a Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Wed, 9 May 2012 16:07:26 -0700 Subject: [PATCH] Fix polarity of radio-disable GPIOs Signed-off-by: Randall Spangler BUG=chrome-os-partner:8932 TEST=manual 1) gpioget with system off -> ENABLE_WLAN = 0, RADIO_ENABLE_* = 0 2) gpioget with system on -> ENABLE_WLAN = 1, RADIO_ENABLE_* = 1 Change-Id: I397a195b4539083c622b85d63703c334cae931fb --- board/link/board.c | 4 ++-- board/link/board.h | 4 ++-- common/x86_power.c | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/board/link/board.c b/board/link/board.c index 7e4b0273a6..9b01a72b05 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -100,8 +100,8 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"PCH_SMIn", LM4_GPIO_F, (1<<4), GPIO_OUT_HIGH, NULL}, {"PCH_SRTCRSTn", LM4_GPIO_C, (1<<7), GPIO_OUT_HIGH, NULL}, {"PCH_SUSACKn", LM4_GPIO_F, (1<<3), GPIO_OUT_HIGH, NULL}, - {"RADIO_DISABLE_WLAN", LM4_GPIO_D, (1<<0), GPIO_OUT_LOW, NULL}, - {"RADIO_DISABLE_BT", LM4_GPIO_D, (1<<1), GPIO_OUT_LOW, NULL}, + {"RADIO_ENABLE_WLAN", LM4_GPIO_D, (1<<0), GPIO_OUT_LOW, NULL}, + {"RADIO_ENABLE_BT", LM4_GPIO_D, (1<<1), GPIO_OUT_LOW, 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 3e72566808..bc9064af06 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -166,8 +166,8 @@ enum gpio_signal { GPIO_PCH_SMIn, /* System management interrupt to PCH */ GPIO_PCH_SRTCRSTn, /* Reset PCH ME RTC well */ GPIO_PCH_SUSACKn, /* Acknowledge PCH SUSWARN# signal */ - GPIO_RADIO_DISABLE_WLAN, /* Disable WLAN radio */ - GPIO_RADIO_DISABLE_BT, /* Disable bluetooth radio */ + GPIO_RADIO_ENABLE_WLAN, /* Enable WLAN radio */ + GPIO_RADIO_ENABLE_BT, /* Enable bluetooth radio */ 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 e8af63b349..a2dfa08cc7 100644 --- a/common/x86_power.c +++ b/common/x86_power.c @@ -367,6 +367,8 @@ void x86_power_task(void) /* Enable WLAN */ gpio_set_level(GPIO_ENABLE_WLAN, 1); + gpio_set_level(GPIO_RADIO_ENABLE_WLAN, 1); + gpio_set_level(GPIO_RADIO_ENABLE_BT, 1); /* Enable fan, now that +5VS is turned on */ /* TODO: On proto1+, fan is on +5VALW, so we can leave @@ -413,6 +415,8 @@ void x86_power_task(void) /* Disable WLAN */ gpio_set_level(GPIO_ENABLE_WLAN, 0); + gpio_set_level(GPIO_RADIO_ENABLE_WLAN, 0); + gpio_set_level(GPIO_RADIO_ENABLE_BT, 0); /* Turn off power rails */ gpio_set_level(GPIO_ENABLE_VS, 0);