diff options
| author | Mary Ruthven <mruthven@chromium.org> | 2016-04-12 14:34:41 -0700 |
|---|---|---|
| committer | Bill Richardson <wfrichar@chromium.org> | 2016-04-13 18:31:53 +0000 |
| commit | 52f7b3a0c842810d119b63894ce5c12d88363b5c (patch) | |
| tree | 905b767467cc37cc581681b002ba57da475e41e3 /board/cr50 | |
| parent | 7ce63a09f9137bb6e5edd19e506ed98e9967884c (diff) | |
| download | chrome-ec-52f7b3a0c842810d119b63894ce5c12d88363b5c.tar.gz | |
cr50: default to CCD PHY
While kevin is still in development default to connecting to the CCD PHY
instead of the AP PHY. This will automatically enable CCD instead of
having to rely on things working to detect the debug accessory and
switch to the proper PHY.
We also disable the TX lines to the AP and EC, in case servo is
connected. To turn them on manually, use these console commands:
rw 0x40060040 74
rw 0x400600c8 78
pinmux
gpiocfg
BUG=chrome-os-partner:50700,chrome-os-partner:52281,http://crosbug.com/p/52322
BRANCH=none
TEST=hook up suzy q to kevin. Run 'lsusb -vd 18d1:5014' and check that a
device appears.
Change-Id: Ic2802430680adc6186982022c995ee6f452b45fd
Signed-off-by: Mary Ruthven <mruthven@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/338680
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Trybot-Ready: Bill Richardson <wfrichar@chromium.org>
Tested-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'board/cr50')
| -rw-r--r-- | board/cr50/gpio.inc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/board/cr50/gpio.inc b/board/cr50/gpio.inc index 0430d25715..8e381d19f6 100644 --- a/board/cr50/gpio.inc +++ b/board/cr50/gpio.inc @@ -21,8 +21,9 @@ GPIO(AP_WP_L, PIN(0, 3), GPIO_INPUT) /* Drive high to reset the EC & AP */ GPIO(SYS_RST, PIN(0, 4), GPIO_INPUT) -/* Indicate to EC when CCD is enabled */ -GPIO(CCD_MODE, PIN(0, 5), GPIO_INPUT) +/* Indicate to EC when CCD is enabled. EC can pull this down too, to tell us if + * it decided instead. The pullup is on the EC's side. */ +GPIO(CCD_MODE_L, PIN(0, 5), GPIO_ODR_HIGH) /* Battery has a 10K pulldown on its side. We provide the pullup. */ GPIO(BATT_PRES, PIN(0, 6), GPIO_INPUT) @@ -47,15 +48,19 @@ PINMUX(GPIO(EC_FLASH_SELECT), B2, DIO_INPUT) PINMUX(GPIO(AP_FLASH_SELECT), B3, DIO_INPUT) PINMUX(GPIO(AP_WP_L), M3, 0) PINMUX(GPIO(SYS_RST), M0, DIO_INPUT) -PINMUX(GPIO(CCD_MODE), M1, DIO_INPUT) +PINMUX(GPIO(CCD_MODE_L), M1, DIO_INPUT) PINMUX(GPIO(BATT_PRES), M2, 0) /* UARTs */ PINMUX(FUNC(UART0_TX), A0, DIO_OUTPUT) /* Cr50 console */ PINMUX(FUNC(UART0_RX), A1, DIO_INPUT | DIO_WAKE_LOW) -PINMUX(FUNC(UART1_TX), A3, DIO_OUTPUT) /* AP console */ +/* AP console */ +/* TODO(crosbug.com/p/52281, crosbug.com/p/50700). Don't fight servo */ +/* PINMUX(FUNC(UART1_TX), A3, DIO_OUTPUT) */ PINMUX(FUNC(UART1_RX), A7, DIO_INPUT) -PINMUX(FUNC(UART2_TX), B5, DIO_OUTPUT) /* EC console */ +/* EC console */ +/* TODO(crosbug.com/p/52281, crosbug.com/p/50700). Don't fight servo */ +/* PINMUX(FUNC(UART2_TX), B5, DIO_OUTPUT) */ PINMUX(FUNC(UART2_RX), B6, DIO_INPUT) /* I2C pins are bi-directional */ |