ryu: switch default firmware to use STM32F373

This simply renames ryu to ryu_p1, and ryu_p2 to ryu. 'ryu_p1' will be
kept for a while and will be decommisioned when most developers make
switch to the new boards.

BRANCH=None
BUG=chrome-os-partner:33583
TEST=Build ryu and boot on P2 board.

Change-Id: Ief61c64c6aefdaeae76ac7b86e0ea28131810aa1
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/229291
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>

1 files changed, 28 insertions, 27 deletions

diff --git a/board/ryu/gpio.inc b/board/ryu/gpio.inc
index b7d4193f3d..099a3c09c6 100644
--- a/board/ryu/gpio.inc
+++ b/board/ryu/gpio.inc
@@ -6,21 +6,21 @@
  */
 
 /* Interrupts */
-GPIO(CHGR_ACOK,            A, 2,  GPIO_INT_BOTH | GPIO_PULL_UP,    vbus_evt)
-GPIO(BC_TEMP_ALERT_L,      A, 13, GPIO_INT_FALLING,                unhandled_evt)
+GPIO(CHGR_ACOK,            D, 4,  GPIO_INT_BOTH | GPIO_PULL_UP,    vbus_evt)
+GPIO(BC_TEMP_ALERT_L,      C, 5,  GPIO_INT_FALLING,                unhandled_evt)
 GPIO(POWER_BUTTON_L,       C, 13, GPIO_INT_BOTH,                   power_button_interrupt) /* active high, the name is for compatibility with existing code */
 GPIO(USBC_BC12_INT_L,      D, 11, GPIO_INT_FALLING | GPIO_PULL_UP, unhandled_evt)
 GPIO(LID_OPEN,             E, 1,  GPIO_INT_BOTH | GPIO_PULL_UP,    lid_interrupt)
 GPIO(CHARGE_DONE,          E, 6,  GPIO_INT_BOTH,                   inductive_charging_interrupt)
 GPIO(LB_INT_L,             E, 7,  GPIO_INT_FALLING | GPIO_PULL_UP, unhandled_evt)
 GPIO(LIGHTBAR_EN_L,        E, 8,  GPIO_INT_FALLING | GPIO_PULL_UP, unhandled_evt)
-GPIO(AP_IN_SUSPEND,        E, 9,  GPIO_INT_BOTH,                   power_signal_interrupt)
+GPIO(AP_IN_SUSPEND,        F, 9,  GPIO_INT_BOTH,                   power_signal_interrupt)
 GPIO(BASE_PRES_L,          E, 10, GPIO_INT_BOTH | GPIO_PULL_UP,    unhandled_evt)
-GPIO(AP_HOLD,              E, 14, GPIO_INT_BOTH, power_signal_interrupt)
+GPIO(AP_HOLD,              E, 3,  GPIO_INT_BOTH, power_signal_interrupt)
 
 /* Buttons */
 GPIO(BTN_VOLD_L,           C, 0,  GPIO_INPUT | GPIO_PULL_UP,       NULL)
-GPIO(BTN_VOLU_L,           C, 1,  GPIO_INPUT | GPIO_PULL_UP,       NULL)
+GPIO(BTN_VOLU_L,           A, 2,  GPIO_INPUT | GPIO_PULL_UP,       NULL)
 
 /* PD RX/TX */
 GPIO(USBC_CC1_PD,          A, 1,  GPIO_ANALOG,   NULL)
@@ -52,18 +52,18 @@ GPIO(BASE_CHG_VDD_EN,      E, 5,  GPIO_OUT_LOW,  NULL)
 
 /* USB-C Power and muxes control */
 GPIO(USBC_CHARGE_EN_L,     A, 7,  GPIO_OUT_LOW,  NULL)
-GPIO(USBC_5V_EN,           A, 10, GPIO_OUT_LOW,  NULL)
+GPIO(USBC_5V_EN,           D, 8,  GPIO_OUT_LOW,  NULL)
 GPIO(USBC_VCONN1_EN_L,     F, 10, GPIO_OUT_HIGH, NULL)
 GPIO(USBC_VCONN2_EN_L,     D, 10, GPIO_OUT_HIGH, NULL)
 
 GPIO(USBC_CC1_DEVICE_ODL,  A, 5,  GPIO_ODR_LOW,  NULL)
-GPIO(USBC_CC2_DEVICE_ODL,  F, 9,  GPIO_ODR_LOW,  NULL)
+GPIO(USBC_CC2_DEVICE_ODL,  E, 14, GPIO_ODR_LOW,  NULL)
 
 GPIO(USBC_DP_MODE_L,       D, 1,  GPIO_OUT_HIGH, NULL)
 GPIO(USBC_DP_POLARITY,     D, 2,  GPIO_OUT_HIGH, NULL)
 GPIO(USBC_SS1_USB_MODE_L,  D, 3,  GPIO_OUT_HIGH, NULL)
-GPIO(USBC_SS2_USB_MODE_L,  D, 5,  GPIO_OUT_HIGH, NULL)
-GPIO(USBC_SS_EN_L,         D, 6,  GPIO_OUT_HIGH, NULL)
+GPIO(USBC_SS2_USB_MODE_L,  D, 9,  GPIO_OUT_HIGH, NULL)
+GPIO(USBC_SS_EN_L,         E, 0,  GPIO_OUT_HIGH, NULL)
 
 /* Inputs */
 GPIO(BOARD_ID0,            E, 11,  GPIO_INPUT,    NULL)
@@ -77,33 +77,33 @@ GPIO(LB_RST_L,             D, 15, GPIO_ODR_HIGH | GPIO_PULL_UP, NULL)
 /* Alternate functions */
 GPIO(USB_DM,               A, 11, GPIO_ANALOG,   NULL)
 GPIO(USB_DP,               A, 12, GPIO_ANALOG,   NULL)
-GPIO(UART_TX,              A, 14, GPIO_OUT_LOW,  NULL)
-GPIO(UART_RX,              A, 15, GPIO_OUT_LOW,  NULL)
+GPIO(UART_TX,              D, 5,  GPIO_OUT_LOW,  NULL)
+GPIO(UART_RX,              D, 6,  GPIO_OUT_LOW,  NULL)
 #endif
 
 /*
  * I2C pins should be configured as inputs until I2C module is
  * initialized. This will avoid driving the lines unintentionally.
  */
-GPIO(MASTER_I2C_SCL,       B, 8,  GPIO_INPUT,    NULL)
-GPIO(MASTER_I2C_SDA,       B, 9,  GPIO_INPUT,    NULL)
-GPIO(SLAVE_I2C_SCL,        B, 10, GPIO_INPUT,    NULL)
-GPIO(SLAVE_I2C_SDA,        B, 11, GPIO_INPUT,    NULL)
+GPIO(MASTER_I2C_SCL,       A, 15, GPIO_INPUT,    NULL)
+GPIO(MASTER_I2C_SDA,       A, 14, GPIO_INPUT,    NULL)
+GPIO(SLAVE_I2C_SCL,        A, 9,  GPIO_INPUT,    NULL)
+GPIO(SLAVE_I2C_SDA,        A, 10, GPIO_INPUT,    NULL)
 
 /* SCL gating for PI3USB9281 */
 GPIO(PERICOM_CLK_EN,       C, 15, GPIO_OUT_LOW,  NULL)
 
 /* Case closed debugging. */
-GPIO(PD_DISABLE_DEBUG,     C, 5,  GPIO_OUT_HIGH, NULL)
-GPIO(SPI_FLASH_NSS,        B, 12, GPIO_INPUT,    NULL)
-GPIO(SPI_FLASH_SCK,        B, 13, GPIO_INPUT,    NULL)
-GPIO(SPI_FLASH_MOSI,       B, 14, GPIO_INPUT,    NULL)
-GPIO(SPI_FLASH_MISO,       B, 15, GPIO_INPUT,    NULL)
+GPIO(PD_DISABLE_DEBUG,     C, 6,  GPIO_OUT_HIGH, NULL)
+GPIO(SPI_FLASH_NSS,        B, 9,  GPIO_INPUT,    NULL)
+GPIO(SPI_FLASH_SCK,        B, 10, GPIO_INPUT,    NULL)
+GPIO(SPI_FLASH_MOSI,       B, 15, GPIO_INPUT,    NULL)
+GPIO(SPI_FLASH_MISO,       B, 14, GPIO_INPUT,    NULL)
 GPIO(VDDSPI_EN,            C, 12, GPIO_OUT_LOW,  NULL)
 GPIO(SH_RESET_L,           C, 4,  GPIO_ODR_HIGH, NULL)
 GPIO(SH_BOOT,              C, 9,  GPIO_ODR_HIGH, NULL)
 GPIO(EC_INT_L,             F, 2,  GPIO_ODR_HIGH, NULL)
-GPIO(ENTERING_RW,          F, 3,  GPIO_OUT_LOW,  NULL)
+GPIO(ENTERING_RW,          E, 15, GPIO_OUT_LOW,  NULL)
 GPIO(WP_L,                 F, 6,  GPIO_INPUT,    NULL)
 
 #if 0
@@ -116,9 +116,10 @@ GPIO(AP_UART_RX,           B, 7,  GPIO_INPUT,    NULL)
 
 UNIMPLEMENTED(AP_RESET_L)
 
-ALTERNATE(B, 0x0008, 0, MODULE_USB_PD, 0)            /* SPI1: SCK(PB3) */
-ALTERNATE(B, 0x0002, 0, MODULE_USB_PD, 0)            /* TIM14_CH1: PB1 */
-ALTERNATE(B, 0x00C0, 0, MODULE_UART,   0)            /* USART1: PB6/PB7 */
-ALTERNATE(A, 0xC000, 1, MODULE_UART,   GPIO_PULL_UP) /* USART2: PA14/PA15 */
-ALTERNATE(C, 0x0C00, 1, MODULE_UART,   0)            /* USART3: PC10/PC11 */
-ALTERNATE(B, 0x0F00, 1, MODULE_I2C,    0)            /* I2C SLAVE:PB10/11 MASTER:PB8/9 */
+ALTERNATE(B, 0x0008, 5, MODULE_USB_PD, 0)            /* SPI1: SCK(PB3) */
+ALTERNATE(B, 0x0002, 2, MODULE_USB_PD, 0)            /* TIM3_CH4: PB1 */
+ALTERNATE(B, 0x00C0, 7, MODULE_UART,   0)            /* USART1: PB6/PB7 */
+ALTERNATE(D, 0x0060, 7, MODULE_UART,   GPIO_PULL_UP) /* USART2: PD4/PD5 */
+ALTERNATE(C, 0x0C00, 7, MODULE_UART,   0)            /* USART3: PC10/PC11 */
+ALTERNATE(A, 0xC600, 4, MODULE_I2C,    0)            /* I2C SLAVE:PA9/10 MASTER:PA14/15 */
+ALTERNATE(A, 0x1800,14, MODULE_USB,    0)            /* USB: PA11/12 */