From owner-svn-src-head@freebsd.org Thu May 31 15:36:28 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2573EF9044; Thu, 31 May 2018 15:36:27 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A60AB6CEAE; Thu, 31 May 2018 15:36:27 +0000 (UTC) (envelope-from manu@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6EC201C196; Thu, 31 May 2018 15:36:27 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4VFaRWC055642; Thu, 31 May 2018 15:36:27 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4VFaRXh055640; Thu, 31 May 2018 15:36:27 GMT (envelope-from manu@FreeBSD.org) Message-Id: <201805311536.w4VFaRXh055640@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Thu, 31 May 2018 15:36:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334433 - head/sys/arm/allwinner X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/arm/allwinner X-SVN-Commit-Revision: 334433 X-SVN-Commit-Repository: base 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.26 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: Thu, 31 May 2018 15:36:28 -0000 Author: manu Date: Thu May 31 15:36:26 2018 New Revision: 334433 URL: https://svnweb.freebsd.org/changeset/base/334433 Log: aw_mmc: Rename clock register defines consistently Modified: head/sys/arm/allwinner/aw_mmc.c head/sys/arm/allwinner/aw_mmc.h Modified: head/sys/arm/allwinner/aw_mmc.c ============================================================================== --- head/sys/arm/allwinner/aw_mmc.c Thu May 31 14:38:13 2018 (r334432) +++ head/sys/arm/allwinner/aw_mmc.c Thu May 31 15:36:26 2018 (r334433) @@ -885,13 +885,13 @@ aw_mmc_update_clock(struct aw_mmc_softc *sc, uint32_t int retry; reg = AW_MMC_READ_4(sc, AW_MMC_CKCR); - reg &= ~(AW_MMC_CKCR_CCLK_ENB | AW_MMC_CKCR_CCLK_CTRL | - AW_MMC_CKCR_CCLK_MASK_DATA0); + reg &= ~(AW_MMC_CKCR_ENB | AW_MMC_CKCR_LOW_POWER | + AW_MMC_CKCR_MASK_DATA0); if (clkon) - reg |= AW_MMC_CKCR_CCLK_ENB; + reg |= AW_MMC_CKCR_ENB; if (sc->aw_mmc_conf->mask_data0) - reg |= AW_MMC_CKCR_CCLK_MASK_DATA0; + reg |= AW_MMC_CKCR_MASK_DATA0; AW_MMC_WRITE_4(sc, AW_MMC_CKCR, reg); @@ -913,7 +913,7 @@ aw_mmc_update_clock(struct aw_mmc_softc *sc, uint32_t if (sc->aw_mmc_conf->mask_data0) { reg = AW_MMC_READ_4(sc, AW_MMC_CKCR); - reg &= ~AW_MMC_CKCR_CCLK_MASK_DATA0; + reg &= ~AW_MMC_CKCR_MASK_DATA0; AW_MMC_WRITE_4(sc, AW_MMC_CKCR, reg); } @@ -1030,7 +1030,7 @@ aw_mmc_update_ios(device_t bus, device_t child) /* Reset the divider. */ reg = AW_MMC_READ_4(sc, AW_MMC_CKCR); - reg &= ~AW_MMC_CKCR_CCLK_DIV; + reg &= ~AW_MMC_CKCR_DIV; reg |= div - 1; AW_MMC_WRITE_4(sc, AW_MMC_CKCR, reg); Modified: head/sys/arm/allwinner/aw_mmc.h ============================================================================== --- head/sys/arm/allwinner/aw_mmc.h Thu May 31 14:38:13 2018 (r334432) +++ head/sys/arm/allwinner/aw_mmc.h Thu May 31 15:36:26 2018 (r334433) @@ -82,10 +82,10 @@ (AW_MMC_GCTL_SOFT_RST | AW_MMC_GCTL_FIFO_RST | AW_MMC_GCTL_DMA_RST) /* AW_MMC_CKCR */ -#define AW_MMC_CKCR_CCLK_ENB (1U << 16) -#define AW_MMC_CKCR_CCLK_CTRL (1U << 17) -#define AW_MMC_CKCR_CCLK_MASK_DATA0 (1U << 31) -#define AW_MMC_CKCR_CCLK_DIV 0xff +#define AW_MMC_CKCR_DIV 0xff +#define AW_MMC_CKCR_ENB (1U << 16) +#define AW_MMC_CKCR_LOW_POWER (1U << 17) +#define AW_MMC_CKCR_MASK_DATA0 (1U << 31) /* AW_MMC_TMOR */ #define AW_MMC_TMOR_RTO_LMT_SHIFT(x) x /* Response timeout limit */