Date: Sat, 26 Mar 2016 10:09:28 +0000 (UTC) From: Michal Meloun <mmel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297288 - head/sys/arm/nvidia Message-ID: <201603261009.u2QA9SYA035278@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mmel Date: Sat Mar 26 10:09:28 2016 New Revision: 297288 URL: https://svnweb.freebsd.org/changeset/base/297288 Log: TEGRA: Fixes for UART driver: - add mising 'or' in tegra_uart_attach() Pointed by: kan - fix indentation of tegra_softc - remove forgoten debug printf Modified: head/sys/arm/nvidia/tegra_uart.c Modified: head/sys/arm/nvidia/tegra_uart.c ============================================================================== --- head/sys/arm/nvidia/tegra_uart.c Sat Mar 26 08:59:56 2016 (r297287) +++ head/sys/arm/nvidia/tegra_uart.c Sat Mar 26 10:09:28 2016 (r297288) @@ -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)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603261009.u2QA9SYA035278>