summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Campbell <leecam@google.com>2016-05-24 22:40:26 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-24 22:40:26 +0000
commite50fd3c85d5c229d687f847178578cd798d5f316 (patch)
treef373824bd1450c42b5c2bb1b8f95072e4012101a
parentf635c8336a281df00fe1c5b187aca9f3f673eae6 (diff)
parentffc818d90bbba450afb41fe435040fca392384e3 (diff)
downloadedison-e50fd3c85d5c229d687f847178578cd798d5f316.tar.gz
PIO HAL: Enable UART. am: 04e9493ab0
am: ffc818d90b * commit 'ffc818d90bbba450afb41fe435040fca392384e3': PIO HAL: Enable UART. Change-Id: I5876575fa2f2e55d4d757ff819ce8ef533e86c15
-rw-r--r--pio_hal/pio_hal.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/pio_hal/pio_hal.cc b/pio_hal/pio_hal.cc
index 1d778d3..d430108 100644
--- a/pio_hal/pio_hal.cc
+++ b/pio_hal/pio_hal.cc
@@ -276,9 +276,8 @@ static int register_device(const peripheral_io_module_t* dev,
const char* uart_pins[2] = {"IO0", "IO1"};
callbacks->register_simple_source("UART", uart_pins, 2);
- // TODO(leecam): Add UART back in once UART code lands
- //callbacks->register_uart_bus("UART1", "/dev/ttyMFD1");
- //callbacks->set_uart_pin_mux("UART1", "UART");
+ callbacks->register_uart_bus("UART1", "/dev/ttyMFD1");
+ callbacks->set_uart_pin_mux("UART1", "UART");
// Enable the Tri-State
set_pin_direction(214, "out");