From owner-dev-commits-src-all@freebsd.org Mon Jun 14 06:48:44 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 496D0653203; Mon, 14 Jun 2021 06:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4G3MVN1Knvz4Rs7; Mon, 14 Jun 2021 06:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 11F257BE3; Mon, 14 Jun 2021 06:48:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15E6mhrH067194; Mon, 14 Jun 2021 06:48:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15E6mhl6067193; Mon, 14 Jun 2021 06:48:43 GMT (envelope-from git) Date: Mon, 14 Jun 2021 06:48:43 GMT Message-Id: <202106140648.15E6mhl6067193@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Oskar Holmlund Subject: git: ac6dcaf8f4c4 - main - arm: TI am335x ehrpwm fix bitmask MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: oh X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac6dcaf8f4c41c20d5e5097afadaab18ec62f220 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 06:48:44 -0000 The branch main has been updated by oh: URL: https://cgit.FreeBSD.org/src/commit/?id=ac6dcaf8f4c41c20d5e5097afadaab18ec62f220 commit ac6dcaf8f4c41c20d5e5097afadaab18ec62f220 Author: Oskar Holmlund AuthorDate: 2021-06-14 08:38:06 +0000 Commit: Oskar Holmlund CommitDate: 2021-06-14 08:38:06 +0000 arm: TI am335x ehrpwm fix bitmask Bitfield HSPCLKDIV and CLKDIV are 3 bit wide. Chapter 15.2.4.1 https://www.ti.com/lit/ug/spruh73q/spruh73q.pdf Approved by: manu (mentor) Reported by: Stefan Forsberg Differential revision: https://reviews.freebsd.org/D30746 --- sys/arm/ti/am335x/am335x_ehrpwm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/ti/am335x/am335x_ehrpwm.c b/sys/arm/ti/am335x/am335x_ehrpwm.c index 47a86aee8dcb..49d0c01ca5f4 100644 --- a/sys/arm/ti/am335x/am335x_ehrpwm.c +++ b/sys/arm/ti/am335x/am335x_ehrpwm.c @@ -83,9 +83,9 @@ __FBSDID("$FreeBSD$"); #define TBCTL_PHDIR_UP (1 << 13) #define TBCTL_PHDIR_DOWN (0 << 13) #define TBCTL_CLKDIV(x) ((x) << 10) -#define TBCTL_CLKDIV_MASK (3 << 10) +#define TBCTL_CLKDIV_MASK (7 << 10) #define TBCTL_HSPCLKDIV(x) ((x) << 7) -#define TBCTL_HSPCLKDIV_MASK (3 << 7) +#define TBCTL_HSPCLKDIV_MASK (7 << 7) #define TBCTL_SYNCOSEL_DISABLED (3 << 4) #define TBCTL_PRDLD_SHADOW (0 << 3) #define TBCTL_PRDLD_IMMEDIATE (1 << 3)