summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormmel <mmel@FreeBSD.org>2016-03-26 10:09:28 +0000
committermmel <mmel@FreeBSD.org>2016-03-26 10:09:28 +0000
commitb35be504b11209a0e5dc33342e7daa56fb3ef3ab (patch)
tree15cc4d23c26d76b60e7a805165adb70fa00c30a3
parent9143e02ee2ce1954c6252fa9c63151442553748a (diff)
downloadFreeBSD-src-b35be504b11209a0e5dc33342e7daa56fb3ef3ab.zip
FreeBSD-src-b35be504b11209a0e5dc33342e7daa56fb3ef3ab.tar.gz
TEGRA: Fixes for UART driver:
- add mising 'or' in tegra_uart_attach() Pointed by: kan - fix indentation of tegra_softc - remove forgoten debug printf
-rw-r--r--sys/arm/nvidia/tegra_uart.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arm/nvidia/tegra_uart.c b/sys/arm/nvidia/tegra_uart.c
index 88b750c..86972f0 100644
--- a/sys/arm/nvidia/tegra_uart.c
+++ b/sys/arm/nvidia/tegra_uart.c
@@ -60,8 +60,8 @@ __FBSDID("$FreeBSD$");
* High-level UART interface.
*/
struct tegra_softc {
- struct ns8250_softc ns8250_base;
- clk_t clk;
+ struct ns8250_softc ns8250_base;
+ clk_t clk;
hwreset_t reset;
};
@@ -82,7 +82,7 @@ tegra_uart_attach(struct uart_softc *sc)
ns8250->ier_rxbits = 0x1d;
ns8250->ier_mask = 0xc0;
ns8250->ier = uart_getreg(bas, REG_IER) & ns8250->ier_mask;
- ns8250->ier = ns8250->ier_rxbits;
+ ns8250->ier |= ns8250->ier_rxbits;
uart_setreg(bas, REG_IER, ns8250->ier);
uart_barrier(bas);
return (0);
@@ -217,7 +217,6 @@ tegra_uart_probe(device_t dev)
device_printf(dev, "Cannot enable UART clock: %d\n", rv);
return (ENXIO);
}
- device_printf(dev, "got UART clock: %lld\n", freq);
return (uart_bus_probe(dev, shift, (int)freq, 0, 0));
}
OpenPOWER on IntegriCloud