From owner-svn-src-all@freebsd.org Sat Mar 26 10:09:29 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A66F8ADBEB2; Sat, 26 Mar 2016 10:09:29 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 73DC31EA3; Sat, 26 Mar 2016 10:09:29 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2QA9SiO035279; Sat, 26 Mar 2016 10:09:28 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2QA9SYA035278; Sat, 26 Mar 2016 10:09:28 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <201603261009.u2QA9SYA035278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Sat, 26 Mar 2016 10:09:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297288 - head/sys/arm/nvidia X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Mar 2016 10:09:29 -0000 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)); }