scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2026-01-09 17:11:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cr50: control the AP uart with hooks

Browse Source 
This change attaches all events related to changes in the AP state to
hooks. Different boards will be using different mechanisms to detect the
AP state, so we shouldn't have anything tied directly to the detection
mechanism.

BUG=none
BRANCH=none
TEST=device detection still works and AP uart is still enabled/disabled
based on the AP and Servo state.

Change-Id: I423bb8a21a1d4adf06809437f646c563551fdb12
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/430389
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Mary Ruthven
2017-01-18 16:57:35 -08:00
committed by chrome-bot
parent 46ab85e60f
commit f6a7f07dc9
1 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
board/cr50/board.c
View File

@@ -647,7 +647,38 @@ static int servo_state_unknown(void)
return 0;
}
static int device_powered_off(enum device_type device, int uart)
static void enable_uart(int uart)
{
/* Enable RX and TX on the UART peripheral */
uartn_enable(uart);
/* Connect the TX pin to the UART TX Signal */
if (!uartn_enabled(uart))
uartn_tx_connect(uart);
}
static void disable_uart(int uart)
{
/* Disable RX and TX on the UART peripheral */
uartn_disable(uart);
/* Disconnect the TX pin from the UART peripheral */
uartn_tx_disconnect(uart);
}
static void enable_ap_uart(void)
{
enable_uart(UART_AP);
}
DECLARE_HOOK(HOOK_CHIPSET_RESUME, enable_ap_uart, HOOK_PRIO_DEFAULT);
static void disable_ap_uart(void)
{
disable_uart(UART_AP);
}
DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, disable_ap_uart, HOOK_PRIO_DEFAULT);
static int device_powered_off(enum device_type device)
{
if (device_get_state(device) == DEVICE_STATE_ON)
return EC_ERROR_UNKNOWN;
@@ -655,13 +686,6 @@ static int device_powered_off(enum device_type device, int uart)
if (!device_state_changed(device, DEVICE_STATE_OFF))
return EC_ERROR_UNKNOWN;
if (uart) {
/* Disable RX and TX on the UART peripheral */
uartn_disable(uart);
/* Disconnect the TX pin from the UART peripheral */
uartn_tx_disconnect(uart);
}
return EC_SUCCESS;
}
@@ -670,20 +694,21 @@ static void servo_deferred(void)
if (servo_state_unknown())
return;
device_powered_off(DEVICE_SERVO, 0);
device_powered_off(DEVICE_SERVO);
}
DECLARE_DEFERRED(servo_deferred);
static void ap_deferred(void)
{
if (device_powered_off(DEVICE_AP, UART_AP) == EC_SUCCESS)
if (device_powered_off(DEVICE_AP) == EC_SUCCESS)
hook_notify(HOOK_CHIPSET_SHUTDOWN);
}
DECLARE_DEFERRED(ap_deferred);
static void ec_deferred(void)
{
device_powered_off(DEVICE_EC, UART_EC);
if (device_powered_off(DEVICE_EC) == EC_SUCCESS)
disable_uart(UART_EC);
}
DECLARE_DEFERRED(ec_deferred);
@@ -706,24 +731,6 @@ struct device_config device_states[] = {
};
BUILD_ASSERT(ARRAY_SIZE(device_states) == DEVICE_COUNT);
/* Returns EC_SUCCESS if the device state changed to on */
static int device_powered_on(enum device_type device, int uart)
{
/* Update the device state */
if (!device_state_changed(device, DEVICE_STATE_ON))
return EC_ERROR_UNKNOWN;
/* Enable RX and TX on the UART peripheral */
uartn_enable(uart);
/* Connect the TX pin to the UART TX Signal */
if (device_get_state(DEVICE_SERVO) != DEVICE_STATE_ON &&
!uartn_enabled(uart))
uartn_tx_connect(uart);
return EC_SUCCESS;
}
static void servo_attached(void)
{
if (servo_state_unknown())
@@ -746,11 +753,12 @@ void device_state_on(enum gpio_signal signal)
switch (signal) {
case GPIO_DETECT_AP:
if (device_powered_on(DEVICE_AP, UART_AP) == EC_SUCCESS)
if (device_state_changed(DEVICE_AP, DEVICE_STATE_ON))
hook_notify(HOOK_CHIPSET_RESUME);
break;
case GPIO_DETECT_EC:
device_powered_on(DEVICE_EC, UART_EC);
if (device_state_changed(DEVICE_EC, DEVICE_STATE_ON))
enable_uart(UART_EC);
break;
case GPIO_DETECT_SERVO:
servo_attached();