From nobody Sun Feb 8 05:35:23 2026 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C852C225402 for ; Fri, 28 Nov 2025 00:38:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764290340; cv=none; b=KVTlp6QRMOHElO+63QIfvifxX6qB6uq010ehv4xio38kOoSix2uRWUhb+hUnsvm/YnseSCziM7Qs2ICy/D3AWr64wShEfbVYwaQDr27gt9zfs5VqvcxnwViq0FcdowB1iM6UL0ZAcRBH/vZhg8nsoY7yvZyYRsYiG7MXQGBHUKo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764290340; c=relaxed/simple; bh=bHKg8688KxIbIu3scsuk8kYDaEqkgSWMViJ2vaTFUT0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LFCu/k7J9El/WpBcLrhd6p/FCcEY0nFo+Hp/HiRfMeoxJzyvi9iKU27A1oYoJFQAVjftGNR4SKBVukiW5F6On+Uy8+hSKfh3KHb5MmC7e358fX06MGaR62r8fQLD/jCsjeDwkKyZDcAzfujbQI32NhLPOatmNp9lBofkjnbs9sc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Az36a0rc; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Az36a0rc" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-297d4a56f97so18786125ad.1 for ; Thu, 27 Nov 2025 16:38:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764290338; x=1764895138; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TtuDHKEV5UkQRRA9Aqhc0gyimLn41C2SrbraOXqSNvo=; b=Az36a0rci1of/3yt2kQNOdSnNSjwaHxcLHrbz0kMXF4L8l7yU3UkgWDSrhTNYJT9vW e92GcmAtxPbZlMDQt5EwyBPzJAb3rQLME15/7sWozOJpSmz3/xqrmO0wvkieISpBPVta MNUilHGlsuPHYIuDaTyltWl48g/4wjEKgfoiVRdC8n5ZIBnvt2y9Pj9UXhi2ir3qjSap lZynDASfxbOe3YyuwLAYWsvKMYzaA/7Ln1hT5B1zyQKP5ucqT8aEwX2/Twi1+o5pRssp 8rcDljoEUsMEQedqrwCIfzRh/b9dpzCPkvonznBDWOWC6KQzUVgQ8E8oeYtWoNHENQ+2 IzJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764290338; x=1764895138; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TtuDHKEV5UkQRRA9Aqhc0gyimLn41C2SrbraOXqSNvo=; b=BSWTBa3j2SqXYp4cb3ZxwrGyIXCq9/SndsQldqEPcf3U2U/Hcqk08o2fR8xjeJ/ely 4PL0WhyhJOuj33nuEfpFxi3T5iaGCWky1KqwxZc7H+2qal6QiNW1BNLEeKevFCyCRsnE lgBKGl1dRmM5z1KOu/qqmZNkVIY9IrOG8j2eRGEw68j1ALOkAy9BHfQHKZJljJYQZLGk I3RQDIq626SN1e+pMgCEqEK9+JpVdzUl5DQSM7IId6z43s7Mpb38avFAOA0A9Xmqn6Sr rnz52JkDdX+HBrNy+9gWifa5Fgzr2eEXYXxthvClmDxSa3LATA3IBPNmbJhC5TiNSiVw Dt+Q== X-Gm-Message-State: AOJu0YyX2tAZpcjZDSoB9muweY0lskAtbnQ1k1N2LuIy3xpyvtrkt6BI 6SKDnHhVd+ewkVHVmaHvYfmqeW0TUZFFTlSEcune5CEu9hZpluIZJGTE X-Gm-Gg: ASbGncuIiQIcbg00ZU1/Ddii+mfnVtcAs6cOKAPs959yDxtmqlFUAm5nio/taDjGn5y WnkD9GV/C+LVSL6VU1eXwUMs8puA7ZEYRxwteMuKu6rOrB3hzNP0ZtTuDF4TXl4uVCGQYX/wKN6 aRc5R0g2IGyqmtVb3g2PEnLcipVZo+dtYG/X/po2H8Dx5VX4TSCqYMOStqDurzplT8lndoKe2BL bsrERsUSzeefgn2W/HhxwjfJD8ooObxVLabeIo9Uhf8GWFW6uE7NtIR5/pyVyQLUKlR3eGMVs41 dGaECUdoWYQboQUd0FwMvVBZwfpOf+V/Yg+bg6vm1Tu2478r1UHbU5xBtkpx/j668FN6HoKN/YM kIvylQYDdEZygUIe5fW/K3G3IHRf33aPNoZq1YsrF/tG17+VyfSZMCQ0Ksf8y2NBa/quCUPjaNd xfTCUsW2pnskhKI6ftDEJMXqknDeMlHPhwdqGqyo8obsc= X-Google-Smtp-Source: AGHT+IHW+tPiN6CDXpO3aHyqH6Qyx9O/PsctZJUF41D9BYde7hvpZJ7PwzIliFHdrWa9qV7RDFbo2w== X-Received: by 2002:a05:7022:a92:b0:11b:1cae:a0fa with SMTP id a92af1059eb24-11c9d55469dmr21786825c88.0.1764290337952; Thu, 27 Nov 2025 16:38:57 -0800 (PST) Received: from ParadiseLost.localdomain (lohr.com.br. [177.69.253.233]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-11dcaee7076sm12404561c88.4.2025.11.27.16.38.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Nov 2025 16:38:57 -0800 (PST) From: "Rafael V. Volkmer" To: ukleinek@kernel.org Cc: linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, rafael.v.volkmer@gmail.com Subject: [PATCH v7 3/9] pwm: tiehrpwm: use GENMASK() and FIELD_PREP() for register fields Date: Thu, 27 Nov 2025 21:36:28 -0300 Message-ID: <20251128003634.247529-4-rafael.v.volkmer@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251128003634.247529-1-rafael.v.volkmer@gmail.com> References: <20251128003634.247529-1-rafael.v.volkmer@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Convert the TIEHRPWM TBCTL, AQCTL, AQSFRC and AQCSFRC field definitions to use GENMASK() and FIELD_PREP() instead of open-coded bit masks and shifted literals. This makes the eHRPWM register layout more explicit, reduces hand-rolled bit arithmetic and aligns the driver with common kernel bitfield patterns. No functional change intended. Signed-off-by: Rafael V. Volkmer --- drivers/pwm/pwm-tiehrpwm.c | 88 ++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 41 deletions(-) diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c index f8625394c056..0802f0553587 100644 --- a/drivers/pwm/pwm-tiehrpwm.c +++ b/drivers/pwm/pwm-tiehrpwm.c @@ -13,6 +13,7 @@ #include #include #include +#include =20 /* EHRPWM registers and bits definitions */ =20 @@ -21,15 +22,16 @@ #define TIEHRPWM_TBPRD 0x0A =20 #define TIEHRPWM_TBCTL_PRDLD BIT(3) -#define TIEHRPWM_TBCTL_PRDLD_SHDW 0 -#define TIEHRPWM_TBCTL_PRDLD_IMDT BIT(3) -#define TIEHRPWM_TBCTL_CLKDIV_MASK (BIT(12) | BIT(11) | BIT(10) | BIT(9) = | \ - BIT(8) | BIT(7)) -#define TIEHRPWM_TBCTL_CTRMODE_MASK (BIT(1) | BIT(0)) -#define TIEHRPWM_TBCTL_CTRMODE_UP 0 -#define TIEHRPWM_TBCTL_CTRMODE_DOWN BIT(0) -#define TIEHRPWM_TBCTL_CTRMODE_UPDOWN BIT(1) -#define TIEHRPWM_TBCTL_CTRMODE_FREEZE (BIT(1) | BIT(0)) +#define TIEHRPWM_TBCTL_PRDLD_SHDW FIELD_PREP(TIEHRPWM_TBCTL_PRDLD, 0) +#define TIEHRPWM_TBCTL_PRDLD_IMDT FIELD_PREP(TIEHRPWM_TBCTL_PRDLD, 1) + +#define TIEHRPWM_TBCTL_CLKDIV_MASK GENMASK(12, 7) + +#define TIEHRPWM_TBCTL_CTRMODE_MASK GENMASK(1, 0) +#define TIEHRPWM_TBCTL_CTRMODE_UP FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_MASK,= 0) +#define TIEHRPWM_TBCTL_CTRMODE_DOWN FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_MAS= K, 1) +#define TIEHRPWM_TBCTL_CTRMODE_UPDOWN FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_M= ASK, 2) +#define TIEHRPWM_TBCTL_CTRMODE_FREEZE FIELD_PREP(TIEHRPWM_TBCTL_CTRMODE_M= ASK, 3) =20 #define TIEHRPWM_TBCTL_HSPCLKDIV_SHIFT 7 #define TIEHRPWM_TBCTL_CLKDIV_SHIFT 10 @@ -48,22 +50,25 @@ #define TIEHRPWM_AQSFRC 0x1A #define TIEHRPWM_AQCSFRC 0x1C =20 -#define TIEHRPWM_AQCTL_CBU_MASK (BIT(9) | BIT(8)) -#define TIEHRPWM_AQCTL_CBU_FRCLOW BIT(8) -#define TIEHRPWM_AQCTL_CBU_FRCHIGH BIT(9) -#define TIEHRPWM_AQCTL_CBU_FRCTOGGLE (BIT(9) | BIT(8)) -#define TIEHRPWM_AQCTL_CAU_MASK (BIT(5) | BIT(4)) -#define TIEHRPWM_AQCTL_CAU_FRCLOW BIT(4) -#define TIEHRPWM_AQCTL_CAU_FRCHIGH BIT(5) -#define TIEHRPWM_AQCTL_CAU_FRCTOGGLE (BIT(5) | BIT(4)) -#define TIEHRPWM_AQCTL_PRD_MASK (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCTL_PRD_FRCLOW BIT(2) -#define TIEHRPWM_AQCTL_PRD_FRCHIGH BIT(3) -#define TIEHRPWM_AQCTL_PRD_FRCTOGGLE (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCTL_ZRO_MASK (BIT(1) | BIT(0)) -#define TIEHRPWM_AQCTL_ZRO_FRCLOW BIT(0) -#define TIEHRPWM_AQCTL_ZRO_FRCHIGH BIT(1) -#define TIEHRPWM_AQCTL_ZRO_FRCTOGGLE (BIT(1) | BIT(0)) +#define TIEHRPWM_AQCTL_CBU_MASK GENMASK(9, 8) +#define TIEHRPWM_AQCTL_CBU_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_CBU_MASK, 1) +#define TIEHRPWM_AQCTL_CBU_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_CBU_MASK, 2) +#define TIEHRPWM_AQCTL_CBU_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_CBU_MASK, = 3) + +#define TIEHRPWM_AQCTL_CAU_MASK GENMASK(5, 4) +#define TIEHRPWM_AQCTL_CAU_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_CAU_MASK, 1) +#define TIEHRPWM_AQCTL_CAU_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_CAU_MASK, 2) +#define TIEHRPWM_AQCTL_CAU_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_CAU_MASK, = 3) + +#define TIEHRPWM_AQCTL_PRD_MASK GENMASK(3, 2) +#define TIEHRPWM_AQCTL_PRD_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_PRD_MASK, 1) +#define TIEHRPWM_AQCTL_PRD_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_PRD_MASK, 2) +#define TIEHRPWM_AQCTL_PRD_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_PRD_MASK, = 3) + +#define TIEHRPWM_AQCTL_ZRO_MASK GENMASK(1, 0) +#define TIEHRPWM_AQCTL_ZRO_FRCLOW FIELD_PREP(TIEHRPWM_AQCTL_ZRO_MASK, 1) +#define TIEHRPWM_AQCTL_ZRO_FRCHIGH FIELD_PREP(TIEHRPWM_AQCTL_ZRO_MASK, 2) +#define TIEHRPWM_AQCTL_ZRO_FRCTOGGLE FIELD_PREP(TIEHRPWM_AQCTL_ZRO_MASK, = 3) =20 #define TIEHRPWM_AQCTL_CHANA_POLNORMAL (TIEHRPWM_AQCTL_CAU_FRCLOW | \ TIEHRPWM_AQCTL_ZRO_FRCHIGH) @@ -74,22 +79,23 @@ #define TIEHRPWM_AQCTL_CHANB_POLINVERSED (TIEHRPWM_AQCTL_CBU_FRCHIGH | \ TIEHRPWM_AQCTL_ZRO_FRCLOW) =20 -#define TIEHRPWM_AQSFRC_RLDCSF_MASK (BIT(7) | BIT(6)) -#define TIEHRPWM_AQSFRC_RLDCSF_ZRO 0 -#define TIEHRPWM_AQSFRC_RLDCSF_PRD BIT(6) -#define TIEHRPWM_AQSFRC_RLDCSF_ZROPRD BIT(7) -#define TIEHRPWM_AQSFRC_RLDCSF_IMDT (BIT(7) | BIT(6)) - -#define TIEHRPWM_AQCSFRC_CSFB_MASK (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCSFRC_CSFB_FRCDIS 0 -#define TIEHRPWM_AQCSFRC_CSFB_FRCLOW BIT(2) -#define TIEHRPWM_AQCSFRC_CSFB_FRCHIGH BIT(3) -#define TIEHRPWM_AQCSFRC_CSFB_DISSWFRC (BIT(3) | BIT(2)) -#define TIEHRPWM_AQCSFRC_CSFA_MASK (BIT(1) | BIT(0)) -#define TIEHRPWM_AQCSFRC_CSFA_FRCDIS 0 -#define TIEHRPWM_AQCSFRC_CSFA_FRCLOW BIT(0) -#define TIEHRPWM_AQCSFRC_CSFA_FRCHIGH BIT(1) -#define TIEHRPWM_AQCSFRC_CSFA_DISSWFRC (BIT(1) | BIT(0)) +#define TIEHRPWM_AQSFRC_RLDCSF_MASK GENMASK(7, 6) +#define TIEHRPWM_AQSFRC_RLDCSF_ZRO FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_MASK= , 0) +#define TIEHRPWM_AQSFRC_RLDCSF_PRD FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_MASK= , 1) +#define TIEHRPWM_AQSFRC_RLDCSF_ZROPRD FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_M= ASK, 2) +#define TIEHRPWM_AQSFRC_RLDCSF_IMDT FIELD_PREP(TIEHRPWM_AQSFRC_RLDCSF_MAS= K, 3) + +#define TIEHRPWM_AQCSFRC_CSFB_MASK GENMASK(3, 2) +#define TIEHRPWM_AQCSFRC_CSFB_FRCDIS FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_MAS= K, 0) +#define TIEHRPWM_AQCSFRC_CSFB_FRCLOW FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_MAS= K, 1) +#define TIEHRPWM_AQCSFRC_CSFB_FRCHIGH FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_MA= SK, 2) +#define TIEHRPWM_AQCSFRC_CSFB_DISSWFRC FIELD_PREP(TIEHRPWM_AQCSFRC_CSFB_M= ASK, 3) + +#define TIEHRPWM_AQCSFRC_CSFA_MASK GENMASK(1, 0) +#define TIEHRPWM_AQCSFRC_CSFA_FRCDIS FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_MAS= K, 0) +#define TIEHRPWM_AQCSFRC_CSFA_FRCLOW FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_MAS= K, 1) +#define TIEHRPWM_AQCSFRC_CSFA_FRCHIGH FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_MA= SK, 2) +#define TIEHRPWM_AQCSFRC_CSFA_DISSWFRC FIELD_PREP(TIEHRPWM_AQCSFRC_CSFA_M= ASK, 3) =20 #define TIEHRPWM_NUM_PWM_CHANNEL 2 /* EHRPWM channels */ =20 --=20 2.43.0