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

ryu: remove SH UART debug and leftovers

Browse Source 
Remove the last pieces of external Sensor Hub support:
- Sensor hub UART exported over case closed debugging
- Sensor hub related GPIOs

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>

BRANCH=smaug
BUG=chrome-os-partner:38333
TEST=plug Suzy-Q to Smaug and test debug UARTs and SPI flashing

Change-Id: I47b42f63647735bae37b9256e2704303c48b5854
Reviewed-on: https://chromium-review.googlesource.com/290115
Reviewed-by: Gwendal Grignou <gwendal@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>
Trybot-Ready: Vincent Palatin <vpalatin@chromium.org>
Tested-by: Vincent Palatin <vpalatin@chromium.org>
This commit is contained in:
Vincent Palatin
2015-07-31 12:19:35 -07:00
committed by ChromeOS Commit Bot
parent ddc7145e08
commit b7d3f4e284
3 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
board/ryu/board.c
View File

@@ -104,20 +104,17 @@ const void *const usb_strings[] = {
[USB_STR_VERSION] = USB_STRING_DESC(CROS_EC_VERSION32),
[USB_STR_CONSOLE_NAME] = USB_STRING_DESC("EC_PD"),
[USB_STR_AP_STREAM_NAME] = USB_STRING_DESC("AP"),
[USB_STR_SH_STREAM_NAME] = USB_STRING_DESC("SH"),
};
BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT);
/*
* Define AP and SH console forwarding queues and associated USART and USB
* Define AP console forwarding queue and associated USART and USB
* stream endpoints.
*/
static struct usart_config const ap_usart;
static struct usart_config const sh_usart;
struct usb_stream_config const ap_usb;
struct usb_stream_config const sh_usb;
static struct queue const ap_usart_to_usb = QUEUE_DIRECT(64, uint8_t,
ap_usart.producer,
@@ -125,12 +122,6 @@ static struct queue const ap_usart_to_usb = QUEUE_DIRECT(64, uint8_t,
static struct queue const ap_usb_to_usart = QUEUE_DIRECT(64, uint8_t,
ap_usb.producer,
ap_usart.consumer);
static struct queue const sh_usart_to_usb = QUEUE_DIRECT(64, uint8_t,
sh_usart.producer,
sh_usb.consumer);
static struct queue const sh_usb_to_usart = QUEUE_DIRECT(64, uint8_t,
sh_usb.producer,
sh_usart.consumer);
static struct usart_tx_dma const ap_usart_tx_dma =
USART_TX_DMA(STM32_DMAC_USART1_TX, 16);
@@ -143,13 +134,6 @@ static struct usart_config const ap_usart =
ap_usart_to_usb,
ap_usb_to_usart);
static struct usart_config const sh_usart = USART_CONFIG(usart3_hw,
usart_rx_interrupt,
usart_tx_interrupt,
115200,
sh_usart_to_usb,
sh_usb_to_usart);
#define AP_USB_STREAM_RX_SIZE 16
#define AP_USB_STREAM_TX_SIZE 16
@@ -162,18 +146,6 @@ USB_STREAM_CONFIG(ap_usb,
ap_usb_to_usart,
ap_usart_to_usb)
#define SH_USB_STREAM_RX_SIZE 16
#define SH_USB_STREAM_TX_SIZE 16
USB_STREAM_CONFIG(sh_usb,
USB_IFACE_SH_STREAM,
USB_STR_SH_STREAM_NAME,
USB_EP_SH_STREAM,
SH_USB_STREAM_RX_SIZE,
SH_USB_STREAM_TX_SIZE,
sh_usb_to_usart,
sh_usart_to_usb)
struct pi3usb9281_config pi3usb9281_chips[] = {
{
.i2c_port = I2C_PORT_PERICOM,
@@ -214,14 +186,11 @@ static void board_init(void)
gpio_enable_interrupt(GPIO_USBC_BC12_INT_L);
/*
* Initialize AP and SH console forwarding USARTs and queues.
* Initialize AP console forwarding USART and queues.
*/
queue_init(&ap_usart_to_usb);
queue_init(&ap_usb_to_usart);
queue_init(&sh_usart_to_usb);
queue_init(&sh_usb_to_usart);
usart_init(&ap_usart);
usart_init(&sh_usart);
/*
* Enable CC lines after all GPIO have been initialized. Note, it is

6
board/ryu/board.h
View File

@@ -107,7 +107,6 @@
/* USART and USB stream drivers */
#define CONFIG_STREAM_USART
#define CONFIG_STREAM_USART1
#define CONFIG_STREAM_USART3
#define CONFIG_STREAM_USB
/* USB Configuration */
@@ -120,7 +119,7 @@
/* USB interface indexes (use define rather than enum to expand them) */
#define USB_IFACE_CONSOLE 0
#define USB_IFACE_AP_STREAM 1
#define USB_IFACE_SH_STREAM 2
#define USB_IFACE_UNUSED 2 /* former SH UART interface */
#define USB_IFACE_SPI 3
#define USB_IFACE_COUNT 4
@@ -128,7 +127,7 @@
#define USB_EP_CONTROL 0
#define USB_EP_CONSOLE 1
#define USB_EP_AP_STREAM 2
#define USB_EP_SH_STREAM 3
#define USB_EP_UNUSED 3 /* former SH UART endpoint */
#define USB_EP_SPI 4
#define USB_EP_COUNT 5
@@ -209,7 +208,6 @@ enum usb_strings {
USB_STR_VERSION,
USB_STR_CONSOLE_NAME,
USB_STR_AP_STREAM_NAME,
USB_STR_SH_STREAM_NAME,
USB_STR_COUNT
};

3
board/ryu/gpio.inc
View File

@@ -81,7 +81,6 @@ GPIO(USBC_DP_HPD, PIN(C, 1), GPIO_ODR_LOW)
/* Inputs */
GPIO(BOARD_ID0, PIN(E, 11), GPIO_INPUT)
GPIO(BOARD_ID1, PIN(E, 12), GPIO_INPUT)
GPIO(SH_SIGNAL, PIN(E, 2), GPIO_INPUT)
/* Lightbar reset */
GPIO(LB_RST_L, PIN(D, 15), GPIO_ODR_HIGH | GPIO_PULL_UP)
@@ -112,8 +111,6 @@ GPIO(PD_DISABLE_DEBUG, PIN(C, 6), GPIO_OUT_LOW)
GPIO(SPI_FLASH_NSS, PIN(B, 9), GPIO_INPUT)
GPIO(VDDSPI_EN_0, PIN(C, 15), GPIO_OUT_LOW) /* on rev v0+ */
GPIO(VDDSPI_EN_OLD, PIN(C, 12), GPIO_OUT_LOW) /* on rev v6/7/8 */
GPIO(SH_RESET, PIN(C, 4), GPIO_ODR_HIGH)
GPIO(SH_BOOT, PIN(C, 9), GPIO_ODR_HIGH)
GPIO(EC_INT_L, PIN(F, 2), GPIO_ODR_HIGH)
GPIO(ENTERING_RW, PIN(E, 9), GPIO_OUT_LOW)
GPIO(WP_L, PIN(F, 6), GPIO_INPUT)