From owner-svn-src-head@freebsd.org Mon Apr 3 22:36:47 2017 Return-Path: Delivered-To: svn-src-head@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 1652ED2DC49; Mon, 3 Apr 2017 22:36:47 +0000 (UTC) (envelope-from gavin@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 C0A34827; Mon, 3 Apr 2017 22:36:46 +0000 (UTC) (envelope-from gavin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v33MajRa021338; Mon, 3 Apr 2017 22:36:45 GMT (envelope-from gavin@FreeBSD.org) Received: (from gavin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v33MajLi021337; Mon, 3 Apr 2017 22:36:45 GMT (envelope-from gavin@FreeBSD.org) Message-Id: <201704032236.v33MajLi021337@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gavin set sender to gavin@FreeBSD.org using -f From: Gavin Atkinson Date: Mon, 3 Apr 2017 22:36:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316476 - head/sys/arm/broadcom/bcm2835 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Apr 2017 22:36:47 -0000 Author: gavin Date: Mon Apr 3 22:36:45 2017 New Revision: 316476 URL: https://svnweb.freebsd.org/changeset/base/316476 Log: Fix spelling mistake, BCM2835_PASWORD -> BCM2835_PASSWORD Modified: head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Modified: head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Mon Apr 3 21:19:12 2017 (r316475) +++ head/sys/arm/broadcom/bcm2835/bcm2835_wdog.c Mon Apr 3 22:36:45 2017 (r316476) @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include -#define BCM2835_PASWORD 0x5a +#define BCM2835_PASSWORD 0x5a #define BCM2835_WDOG_RESET 0 #define BCM2835_PASSWORD_MASK 0xff000000 @@ -115,7 +115,7 @@ bcmwd_attach(device_t dev) sc = device_get_softc(dev); sc->wdog_period = 7; - sc->wdog_passwd = BCM2835_PASWORD; + sc->wdog_passwd = BCM2835_PASSWORD; sc->wdog_armed = 0; sc->dev = dev; @@ -163,27 +163,27 @@ bcmwd_watchdog_fn(void *private, u_int c device_printf(sc->dev, "Can't arm, timeout must be between 1-15 seconds\n"); WRITE(sc, BCM2835_RSTC_REG, - (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | + (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | BCM2835_RSTC_RESET); mtx_unlock(&sc->mtx); return; } ticks = (sec << 16) & BCM2835_WDOG_TIME_MASK; - reg = (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | ticks; + reg = (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | ticks; WRITE(sc, BCM2835_WDOG_REG, reg); reg = READ(sc, BCM2835_RSTC_REG); reg &= BCM2835_RSTC_WRCFG_CLR; reg |= BCM2835_RSTC_WRCFG_FULL_RESET; - reg |= (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT); + reg |= (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT); WRITE(sc, BCM2835_RSTC_REG, reg); *error = 0; } else WRITE(sc, BCM2835_RSTC_REG, - (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | + (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | BCM2835_RSTC_RESET); mtx_unlock(&sc->mtx); @@ -197,11 +197,11 @@ bcmwd_watchdog_reset(void) return; WRITE(bcmwd_lsc, BCM2835_WDOG_REG, - (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | 10); + (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | 10); WRITE(bcmwd_lsc, BCM2835_RSTC_REG, (READ(bcmwd_lsc, BCM2835_RSTC_REG) & BCM2835_RSTC_WRCFG_CLR) | - (BCM2835_PASWORD << BCM2835_PASSWORD_SHIFT) | + (BCM2835_PASSWORD << BCM2835_PASSWORD_SHIFT) | BCM2835_RSTC_WRCFG_FULL_RESET); }