From patchwork Wed Sep 10 13:58:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4275 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A15CD3F16F for ; Wed, 10 Sep 2025 15:59:27 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-61d1327a8besf4672254a12.1 for ; Wed, 10 Sep 2025 06:59:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1757512767; cv=pass; d=google.com; s=arc-20240605; b=c33lueSPLf8zvDJQZ5lelGRC/CBmPWjPqMIVCqMGGb4+d64Pf6ZI3tvna4VpJGFgbx MdgwJXHSU+CRg41f7EzUr3XIkczGY9NIxekol/D5xQHacYzbn3g7Lle91YC3ks11fYwU jgcPkNCZo0sDnVuz2EucodCakx1TLiSs3SEXKzBzYZ1Lh4fHOyUpCqhNc/+/fvZ9XTI6 4ujxiAxYB1WuFXvlExK5R2rybHLIDAJf/pr6K8Loq8iLtBwQefZ9WYO0tapdE536P+EN BjwaEdBpk2T4oa/COB7IrBe7q2t6ry3ub53o8LRvlwTx0xLtLpfgBjB5dgvqDcwXqU3h dUJw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=NwIYOPx+SivDsZ+fJEZfMbkbJ4KKzXEO3esPBItUo1E=; fh=fZhKhnEWUQleQ8fqURa3fIkQOmFO6cCsdPPHpqX5Vd8=; b=kpNVgm98dnv5GcxmSQmru3qXBpRrYdquhscMfbJoIj2wz3M80dn5RRfspcxvNJUBZX UudkuOvGHaRGWFUAXquaLH1AItxO9G2SZgfras5MjWyzPt4mZ1tvOf88LIVD2drmC1Vk wj8ZD9B2nGSvt+HYHvqOCRxBsDAdABg3NdrI9aTP3YBACTaOPu31Ddu1Xqqcxho3i4jG e/TIH9Mdzveq++dvIlash2HYEKp/zH5uWRrjLj9O7YXTc/Gl7dpED0H/HCF5n7n62ojT gMOM3YubZ2YVC8I+Gs1XVIrXdnY13cNrb8wqdZ6pfFV9jTOK6Gs4cphiSV/ujYJpDTKk tVTA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hbyOMPih; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1757512767; x=1758117567; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=NwIYOPx+SivDsZ+fJEZfMbkbJ4KKzXEO3esPBItUo1E=; b=em4Xtz8xNOyL4d0RBjqs8t0FjWm+3Zlsa7V4YAxH9D40yOWE6JvKjbrjpFN7jAsC0B QCwJcWz4e3cpHI+EgjOT5z79hrz8S7Av+RjB8KbCG3IcnddJbgTLIwhrNbimAY0wfMBc 2ZpdBUtRMxRt2v4oGeCdPVjYtVr/Hf796Jp/E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757512767; x=1758117567; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NwIYOPx+SivDsZ+fJEZfMbkbJ4KKzXEO3esPBItUo1E=; b=BLIxZk1UpQ5Cu5fIWjIPuHo9BCW9hRkhw7EscaQExcFW0/sn9NtCmHC/wNN4wwPs7c 83T54n4ia3ctjBdwW3t7VaOIR+6ITzhAaUK8npaKcc5r+meso1dOEzgUbgkAULl3Iae1 jm76M6kIZ9my5XcrTThjn5m6BYPcyOcEnLnrDWprzQqOC3Nf8wFQt1+NAsiPPL5k0XR5 eJ3kVwn4/lNWX77A6knhUQM3evJ1D+MmlXtOXw0PRlM8KUwVv6pHWYSsh0CRjSwp34+4 bT2hSrpVn/HL8wfSTqVOlI1MWHykjcFbpDTbM+tXyEXiXijn7UiBh0LAivXmUelIRn8p aiUA== X-Forwarded-Encrypted: i=2; AJvYcCWksB7gPLf1K/Gl7bDJPB6LxKNjUO3ylyNle8SxYjjCk64yJuvhD9q+2jgz5s9+gf9p1nuODC+v74OycrKx@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yx0wqrlCaL8IOqBJFAZMWhx5pNFGLdQ+PhwzHE5p/xJtJmOenvA ZV1bLsQ83E8dU1Q5lWHlB4D8wWbD9kTJDH8H5Mkar/3rIGGio105b5OWJ9H45jRbkwm6nw== X-Google-Smtp-Source: AGHT+IGMGDqbnjESD1rER2j/qktsPOpPXZAtmEuwR3ELPGlFdj/rm67ARULWI3oDg3wL3OACya90Ow== X-Received: by 2002:a05:6402:358f:b0:628:bee2:b31d with SMTP id 4fb4d7f45d1cf-628bee2b6e7mr10862528a12.3.1757512767266; Wed, 10 Sep 2025 06:59:27 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=ARHlJd4lq9lUveGq+YQhmmaEBGTLkcvHFWEszs4e2sUisw5sZw== Received: by 2002:a50:9fee:0:b0:615:7125:5fa3 with SMTP id 4fb4d7f45d1cf-62148956631ls4606007a12.1.-pod-prod-02-eu; Wed, 10 Sep 2025 06:59:25 -0700 (PDT) X-Received: by 2002:a17:907:1c28:b0:b04:9854:981f with SMTP id a640c23a62f3a-b04b16bf13dmr1495438466b.43.1757512764788; Wed, 10 Sep 2025 06:59:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1757512764; cv=none; d=google.com; s=arc-20240605; b=RNESj/RzjmNhAh2GfscJAa1k9bW7NiysP+9CKsG0WeqDtvOTxRNKtFmWmyubSng72y oL+InmM6xLoJvaXrseWurdI9ARpQl0UYb4HNNbGiHFrVF+UWZQNC717YTCZaYGs4gylN lpBM216MgJ3K8Kic7lEbyfXhvhkMC+F3+qjtF6obYHt2c0fnnxranOnt/DKZVHyhP6z/ Zw5nWCYDT5V+a8wGP681cKc6H/W9rxPmsQnuE1xqr8om8WZb2g/AeTtlD/Msgtgp7qoX tuftvNuinUzVx8TU+teDewFKgsp+FlC8AT2n5IZaFVJ+iZ9YISAkBh1GUYbq2Zxstw5Z Tk1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=2oVD/JfoNNaDmsm+Xmi5oDSaNjfSX3YkjZgxJuhnDRo=; fh=4gXLHhtG5blgxpWML+oiv0GiMs5uzMuOuNd/RJVWDWw=; b=VBXrnjQy8BRzo6ZDzJt5+aw6LAejcr5QsOdSll68F2RmFfkl+4t2T42itrp9q69vIu DhFrYuLZc+z3mDM00lL6LjP+PL12aDz4+sqSejbQBSZ0hrVN2cJiCHitCq4pI3/0dyID T7+4EOXsIOY2jkuVujQRIotlbbupNoOmjXDJbRGq8Cb7iTsmFejdtkV+fEP1H1vkBema mD+i/jLagHVXBzD3qQ2H/Ebezd2vRtZOUaw452ZY7cMuufclnn2asP/sAcmjvLXogvb7 85GSBt8MODdKtfeVkDW3NKU9lboSh1E76epIdWnqa5QTMEpnJ4GA2zulU1zNOVP0+GYk 3GPQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hbyOMPih; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-b076e727424sor182774066b.6.2025.09.10.06.59.24 for (Google Transport Security); Wed, 10 Sep 2025 06:59:24 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Gm-Gg: ASbGnctZyACw6W+C7W5kqvv787k1BZZsXOU8hlDRP5xGwnKs3TGiu7I8bIhVXASZZZY yy+VsNDoDtdrmD+T7yEWp0U2S3eQFUAoz4zobHUtby1IbRb1rJps4HNxD1H3BesL3c81mYCAVK+ VaVlaL7O5zbhhNEIWjfQ4ZAVdRMzmZR2GxX/NB00BxgqEAB38Z7ypjPHCmgdcpmQMSxyZVbWJWx rtBmMUli47FWsRFOCLg37vo5mzWv1bWfqXrhrXLaBMx6mPbYT8qUhTpKjxI0Lvc95xLyTMwcV61 paIjdJkXPOqPHMy1EyEvrlTO1YPKb6SFDd0tc76+W5kQ03a5wrqqfFQU/wJ1oOl7ApIBW6i9+55 Jmear9IZ50weaintWvD51s+uBGyQTR/jOs4Sx7WPnR0NBXORTQc9fQAq0w219sVukK2ruFojOkv GLTnFtWeYZQBZfn2oj1qTdfb2TCBa8wBQd8mF88zcoKApTZNWFCgIafAo4xxU16BlP X-Received: by 2002:a17:907:3d16:b0:b04:59d5:fb78 with SMTP id a640c23a62f3a-b04b1702bbemr1507295166b.62.1757512764270; Wed, 10 Sep 2025 06:59:24 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-82-56-38-125.retail.telecomitalia.it. [82.56.38.125]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b07833a4e37sm172523066b.76.2025.09.10.06.59.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Sep 2025 06:59:23 -0700 (PDT) From: Dario Binacchi To: linux-kernel@vger.kernel.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi , Dmitry Torokhov , Fabio Estevam , Michael Trimarchi , Pengutronix Kernel Team , Sascha Hauer , Shawn Guo , imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-input@vger.kernel.org Subject: [RESEND PATCH 4/4] Input: imx6ul_tsc - use BIT, FIELD_{GET,PREP} and GENMASK macros Date: Wed, 10 Sep 2025 15:58:38 +0200 Message-ID: <20250910135916.3939502-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250910135916.3939502-1-dario.binacchi@amarulasolutions.com> References: <20250910135916.3939502-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hbyOMPih; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Replace opencoded masking and shifting, with BIT(), GENMASK(), FIELD_GET() and FIELD_PREP() macros. Signed-off-by: Dario Binacchi Reviewed-by: Frank Li --- drivers/input/touchscreen/imx6ul_tsc.c | 88 ++++++++++++++------------ 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/drivers/input/touchscreen/imx6ul_tsc.c b/drivers/input/touchscreen/imx6ul_tsc.c index a6066643bd48..e74999c5e22f 100644 --- a/drivers/input/touchscreen/imx6ul_tsc.c +++ b/drivers/input/touchscreen/imx6ul_tsc.c @@ -21,25 +21,23 @@ #include /* ADC configuration registers field define */ -#define ADC_AIEN (0x1 << 7) +#define ADC_AIEN BIT(7) +#define ADC_ADCH_MASK GENMASK(4, 0) #define ADC_CONV_DISABLE 0x1F -#define ADC_AVGE (0x1 << 5) -#define ADC_CAL (0x1 << 7) -#define ADC_CALF 0x2 -#define ADC_12BIT_MODE (0x2 << 2) -#define ADC_CONV_MODE_MASK (0x3 << 2) +#define ADC_AVGE BIT(5) +#define ADC_CAL BIT(7) +#define ADC_CALF BIT(1) +#define ADC_CONV_MODE_MASK GENMASK(3, 2) +#define ADC_12BIT_MODE 0x2 #define ADC_IPG_CLK 0x00 -#define ADC_INPUT_CLK_MASK 0x3 -#define ADC_CLK_DIV_8 (0x03 << 5) -#define ADC_CLK_DIV_MASK (0x3 << 5) -#define ADC_SHORT_SAMPLE_MODE (0x0 << 4) -#define ADC_SAMPLE_MODE_MASK (0x1 << 4) -#define ADC_HARDWARE_TRIGGER (0x1 << 13) -#define ADC_AVGS_SHIFT 14 -#define ADC_AVGS_MASK (0x3 << 14) +#define ADC_INPUT_CLK_MASK GENMASK(1, 0) +#define ADC_CLK_DIV_8 0x03 +#define ADC_CLK_DIV_MASK GENMASK(6, 5) +#define ADC_SAMPLE_MODE BIT(4) +#define ADC_HARDWARE_TRIGGER BIT(13) +#define ADC_AVGS_MASK GENMASK(15, 14) #define SELECT_CHANNEL_4 0x04 #define SELECT_CHANNEL_1 0x01 -#define DISABLE_CONVERSION_INT (0x0 << 7) /* ADC registers */ #define REG_ADC_HC0 0x00 @@ -66,20 +64,26 @@ #define REG_TSC_DEBUG_MODE 0x70 #define REG_TSC_DEBUG_MODE2 0x80 +/* TSC_MEASURE_VALUE register field define */ +#define X_VALUE_MASK GENMASK(27, 16) +#define Y_VALUE_MASK GENMASK(11, 0) + /* TSC configuration registers field define */ -#define DETECT_4_WIRE_MODE (0x0 << 4) -#define AUTO_MEASURE 0x1 -#define MEASURE_SIGNAL 0x1 -#define DETECT_SIGNAL (0x1 << 4) -#define VALID_SIGNAL (0x1 << 8) -#define MEASURE_INT_EN 0x1 -#define MEASURE_SIG_EN 0x1 -#define VALID_SIG_EN (0x1 << 8) +#define MEASURE_DELAY_TIME_MASK GENMASK(31, 8) +#define DETECT_5_WIRE_MODE BIT(4) +#define AUTO_MEASURE BIT(0) +#define MEASURE_SIGNAL BIT(0) +#define DETECT_SIGNAL BIT(4) +#define VALID_SIGNAL BIT(8) +#define MEASURE_INT_EN BIT(0) +#define MEASURE_SIG_EN BIT(0) +#define VALID_SIG_EN BIT(8) #define DE_GLITCH_MASK GENMASK(30, 29) #define DE_GLITCH_DEF 0x02 -#define START_SENSE (0x1 << 12) -#define TSC_DISABLE (0x1 << 16) +#define START_SENSE BIT(12) +#define TSC_DISABLE BIT(16) #define DETECT_MODE 0x2 +#define STATE_MACHINE_MASK GENMASK(22, 20) struct imx6ul_tsc { struct device *dev; @@ -115,19 +119,20 @@ static int imx6ul_adc_init(struct imx6ul_tsc *tsc) adc_cfg = readl(tsc->adc_regs + REG_ADC_CFG); adc_cfg &= ~(ADC_CONV_MODE_MASK | ADC_INPUT_CLK_MASK); - adc_cfg |= ADC_12BIT_MODE | ADC_IPG_CLK; - adc_cfg &= ~(ADC_CLK_DIV_MASK | ADC_SAMPLE_MODE_MASK); - adc_cfg |= ADC_CLK_DIV_8 | ADC_SHORT_SAMPLE_MODE; + adc_cfg |= FIELD_PREP(ADC_CONV_MODE_MASK, ADC_12BIT_MODE) | + FIELD_PREP(ADC_INPUT_CLK_MASK, ADC_IPG_CLK); + adc_cfg &= ~(ADC_CLK_DIV_MASK | ADC_SAMPLE_MODE); + adc_cfg |= FIELD_PREP(ADC_CLK_DIV_MASK, ADC_CLK_DIV_8); if (tsc->average_enable) { adc_cfg &= ~ADC_AVGS_MASK; - adc_cfg |= (tsc->average_select) << ADC_AVGS_SHIFT; + adc_cfg |= FIELD_PREP(ADC_AVGS_MASK, tsc->average_select); } adc_cfg &= ~ADC_HARDWARE_TRIGGER; writel(adc_cfg, tsc->adc_regs + REG_ADC_CFG); /* enable calibration interrupt */ adc_hc |= ADC_AIEN; - adc_hc |= ADC_CONV_DISABLE; + adc_hc |= FIELD_PREP(ADC_ADCH_MASK, ADC_CONV_DISABLE); writel(adc_hc, tsc->adc_regs + REG_ADC_HC0); /* start ADC calibration */ @@ -167,19 +172,21 @@ static void imx6ul_tsc_channel_config(struct imx6ul_tsc *tsc) { u32 adc_hc0, adc_hc1, adc_hc2, adc_hc3, adc_hc4; - adc_hc0 = DISABLE_CONVERSION_INT; + adc_hc0 = FIELD_PREP(ADC_AIEN, 0); writel(adc_hc0, tsc->adc_regs + REG_ADC_HC0); - adc_hc1 = DISABLE_CONVERSION_INT | SELECT_CHANNEL_4; + adc_hc1 = FIELD_PREP(ADC_AIEN, 0) | + FIELD_PREP(ADC_ADCH_MASK, SELECT_CHANNEL_4); writel(adc_hc1, tsc->adc_regs + REG_ADC_HC1); - adc_hc2 = DISABLE_CONVERSION_INT; + adc_hc2 = FIELD_PREP(ADC_AIEN, 0); writel(adc_hc2, tsc->adc_regs + REG_ADC_HC2); - adc_hc3 = DISABLE_CONVERSION_INT | SELECT_CHANNEL_1; + adc_hc3 = FIELD_PREP(ADC_AIEN, 0) | + FIELD_PREP(ADC_ADCH_MASK, SELECT_CHANNEL_1); writel(adc_hc3, tsc->adc_regs + REG_ADC_HC3); - adc_hc4 = DISABLE_CONVERSION_INT; + adc_hc4 = FIELD_PREP(ADC_AIEN, 0); writel(adc_hc4, tsc->adc_regs + REG_ADC_HC4); } @@ -194,8 +201,9 @@ static void imx6ul_tsc_set(struct imx6ul_tsc *tsc) u32 debug_mode2; u32 start; - basic_setting |= tsc->measure_delay_time << 8; - basic_setting |= DETECT_4_WIRE_MODE | AUTO_MEASURE; + basic_setting |= FIELD_PREP(MEASURE_DELAY_TIME_MASK, + tsc->measure_delay_time); + basic_setting |= AUTO_MEASURE; writel(basic_setting, tsc->tsc_regs + REG_TSC_BASIC_SETTING); debug_mode2 = FIELD_PREP(DE_GLITCH_MASK, tsc->de_glitch); @@ -255,7 +263,7 @@ static bool tsc_wait_detect_mode(struct imx6ul_tsc *tsc) usleep_range(200, 400); debug_mode2 = readl(tsc->tsc_regs + REG_TSC_DEBUG_MODE2); - state_machine = (debug_mode2 >> 20) & 0x7; + state_machine = FIELD_GET(STATE_MACHINE_MASK, debug_mode2); } while (state_machine != DETECT_MODE); usleep_range(200, 400); @@ -283,8 +291,8 @@ static irqreturn_t tsc_irq_fn(int irq, void *dev_id) if (status & MEASURE_SIGNAL) { value = readl(tsc->tsc_regs + REG_TSC_MEASURE_VALUE); - x = (value >> 16) & 0x0fff; - y = value & 0x0fff; + x = FIELD_GET(X_VALUE_MASK, value); + y = FIELD_GET(Y_VALUE_MASK, value); /* * In detect mode, we can get the xnur gpio value,