diff options
| author | hathach <[email protected]> | 2018-12-04 18:38:01 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-12-04 18:38:01 +0700 |
| commit | fe8346e642c369ad0e0b5bbf3a10d8e7d16a10fc (patch) | |
| tree | db3ca83de3886c2cf35e27ad7c307a7e5882f239 | |
| parent | 6c2404ca49772430585edda57c0b90064af02ab6 (diff) | |
move pinmux out of dcd into bsp
| -rw-r--r-- | hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c | 23 | ||||
| -rw-r--r-- | src/portable/nxp/lpc17_40/hal_lpc17_40.c | 10 |
2 files changed, 16 insertions, 17 deletions
diff --git a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c b/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c index 34e05932a..257c74b63 100644 --- a/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c +++ b/hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c @@ -53,16 +53,21 @@ const uint32_t RTCOscRateIn = 32768; /* Pin muxing configuration */ static const PINMUX_GRP_T pinmuxing[] = { - {0, 0, IOCON_MODE_INACT | IOCON_FUNC2}, /* TXD3 */ - {0, 1, IOCON_MODE_INACT | IOCON_FUNC2}, /* RXD3 */ - {0, 22, IOCON_MODE_INACT | IOCON_FUNC0}, /* Led 0 */ + {0, 0, IOCON_MODE_INACT | IOCON_FUNC2}, /* TXD3 */ + {0, 1, IOCON_MODE_INACT | IOCON_FUNC2}, /* RXD3 */ + {0, 22, IOCON_MODE_INACT | IOCON_FUNC0}, /* Led 0 */ - /* Joystick buttons. */ - {2, 3, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_UP */ - {0, 15, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_DOWN */ - {2, 4, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_LEFT */ - {0, 16, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_RIGHT */ - {0, 17, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_PRESS */ + /* Joystick buttons. */ + {2, 3, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_UP */ + {0, 15, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_DOWN */ + {2, 4, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_LEFT */ + {0, 16, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_RIGHT */ + {0, 17, IOCON_MODE_INACT | IOCON_FUNC0}, /* JOYSTICK_PRESS */ + + // USB + {0, 29, IOCON_MODE_INACT | IOCON_FUNC1}, // D+ + {0, 30, IOCON_MODE_INACT | IOCON_FUNC1}, // D- + {2, 9, IOCON_MODE_INACT | IOCON_FUNC1}, // Connect }; enum { diff --git a/src/portable/nxp/lpc17_40/hal_lpc17_40.c b/src/portable/nxp/lpc17_40/hal_lpc17_40.c index 668cabd80..cebddd883 100644 --- a/src/portable/nxp/lpc17_40/hal_lpc17_40.c +++ b/src/portable/nxp/lpc17_40/hal_lpc17_40.c @@ -66,24 +66,18 @@ bool tusb_hal_init(void) Chip_USB_Init(); - /* Configure P0.29 as D+, P0.30 as D- */ - Chip_IOCON_PinMux(LPC_IOCON, 0, 29, IOCON_MODE_INACT, IOCON_FUNC1); - Chip_IOCON_PinMux(LPC_IOCON, 0, 30, IOCON_MODE_INACT, IOCON_FUNC1); - #if MODE_HOST_SUPPORTED + // TODO move pin config to BSP PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 1, .Pinnum = 22, .Funcnum = 2} ); // P1.22 as USB_PWRD PINSEL_ConfigPin( &(PINSEL_CFG_Type) { .Portnum = 1, .Pinnum = 19, .Funcnum = 2} ); // P1.19 as USB_PPWR // Enable host LPC_USB->USBClkCtrl = USBCLK_HOST; while ((LPC_USB->USBClkSt & USBCLK_HOST) != USBCLK_HOST); - LPC_USB->OTGStCtrl = 0x3; + LPC_USB->OTGClkSt = 0x3; #endif #if TUSB_OPT_DEVICE_ENABLED - // P2_9 as USB Connect - Chip_IOCON_PinMux(LPC_IOCON, 2, 9, IOCON_MODE_INACT, IOCON_FUNC1); - // Enable Device LPC_USB->USBClkCtrl = USBCLK_DEVCIE; while ((LPC_USB->USBClkSt & USBCLK_DEVCIE) != USBCLK_DEVCIE); |