From patchwork Tue Jul 22 10:36:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4222 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D159E3F165 for ; Tue, 22 Jul 2025 12:37:23 +0200 (CEST) Received: by mail-ed1-f72.google.com with SMTP id 4fb4d7f45d1cf-606ee65164fsf5716424a12.1 for ; Tue, 22 Jul 2025 03:37:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1753180643; cv=pass; d=google.com; s=arc-20240605; b=Z5v8RuvS8UvkfSkAAyWqkrsjYrI72mdavJ+loJgMJfALwypgwKnTRv0BuXk1nt1WD3 V+26JCVxqUZpk9QFf2l9CgnhJBLHLz1tENAGoVBTAxy3ABd1tiha5e3VLqVCR05OoY97 SYqCl4PEnK00SVvQ3SUkXLn0rhnJptaioWXvhVvzbMy9HEpnV/dl92V7UpgHz1FNSrUt I1TVUZw9Os0e7xEZt/fVpH83OtjhwgBUDW/mNkBvM4pnwy1fOEIT2Cok02Dar1f0nsen R7vYEiQyBl0OJ9yC2fPjnfzwV4M8kelT8ndJyJhxOXFeUZmM7IkqtahUBpZ0OyPMnyNW dmTQ== 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=esN95S88be7IJFq5A0dB3/mtpZJA3m0leKRzmW7Jf2Y=; b=k7Qd8egW/Eme7a3scjZ75m+php8BUPK9rZPZc/Q6wzsKCsbeWxAy+iNYdpGupkQZ3q vtfMceAjG8HjFvrEUs4JKuxxB06xWrKkpP06mZcbjh6PrcTlOKC3Maaj87UHG36HZGye 2TxhZEWFGRv5iIvcEEWYvzDwcNtEiQVCWMhWEc/4UMzIveqV3zstXq3FfoSdrHG+xWb0 MQdd3lTPyx5DVHMzRfWPHE3ugARF4TEbA14xtcrKVZqM2VA5OCu9JWIL6mPx0n2UaM1m SYQatW2dDwEj0J56iN5m5UgetnMll121X8jJzNQSJdZNPQJUIu55ROYUztwr9wnkjAMh zC7A==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GgXbR74x; 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=1753180643; x=1753785443; 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=hSFHgSZl81ioRa37fLFdGtlYyC7PeT7Pajy4wtib/LkWW2M4QOIrkA2BWi5dqBwb9w +vfP19ierAfzSB5+FSLzPH36NIxCxbAvYqnwCmIDZLQyL+3ur0go7rggk31VP8i4Yh0N jNq9eRSXhZQPZXMmYRnPS2x2iHxUvbVXAOjps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753180643; x=1753785443; 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=DuR9/+b+d8fnfjCPQUfUoc8Us+poEsd1DvLZeO2NBDxggoAOunwr0iFVIiJTG2ES5P FbzzHKOvGWEDYwxaSn6d9LJyTThE5PhGQJRYu7OiminmTDlhLJeFPrjWyJB0LIJfenqp YuBd6UjGQgN7AS18NhKmEaXuOyiXxmrcKkZpLa7AgbFizihBt2q7jYtVIVT8KnBeEVNX pjLUmYluphBE0uqkkfeSyxpJxt1mwszre2RsVhq3oNBSFU+oO3fPR3QRNQh0qsbPP9K4 p4RV72Y9PHyy7Hha5p3crWph7eLyTIvP0L5wJ4ZIowC7w17mvGyonB39OgY+s9V66u+q tS9w== X-Forwarded-Encrypted: i=2; AJvYcCVBuBaoTySKuR0p2dbfLOFHpAfoQ/BF98jF7v2/t08Rv9YrwvwHyTcq4Ovc58pZD2draEhtXREjF5smdhJc@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzfKCtDaMslEs2x3NdGYiKmuHouFtn2zlaUcvn2X/sUnt85koZk sOiAoEG39zNFYUAHaz2TDFaCo+qABgXgtAHO3LB7yq3mBmnyTW0njV1tK4SVDGrpGWLXtw== X-Google-Smtp-Source: AGHT+IGDWyenAar4srVO0H7JVqaFNCMdoZrEQCxeTSnRnAAde8hKN3I/e4q48+UNwH1giY8mQJNV5Q== X-Received: by 2002:a05:6402:2350:b0:5e6:e842:f9d2 with SMTP id 4fb4d7f45d1cf-612c74072c5mr12492930a12.29.1753180642867; Tue, 22 Jul 2025 03:37:22 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZf9uOcjbEDDtwcFeieB4w8ZlMtw6WaEE8Dow6lvSleI/g== Received: by 2002:a05:6402:2344:b0:60c:397b:eeae with SMTP id 4fb4d7f45d1cf-612a02cfb87ls4542393a12.0.-pod-prod-04-eu; Tue, 22 Jul 2025 03:37:20 -0700 (PDT) X-Received: by 2002:a17:906:6a0e:b0:ae0:c497:c5ca with SMTP id a640c23a62f3a-aec6a492febmr1547988666b.3.1753180640106; Tue, 22 Jul 2025 03:37:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1753180640; cv=none; d=google.com; s=arc-20240605; b=fjTQ8f6zUIK88ZxtnUBq0oy6NZ6/tPH//s1eHb6qCuPWekGDFP/CnZka1hcbrrNrqX s9DEC6pf/I6QWoJPq1fELaeioqb69PCM7mODcIqsbA16fgtGu6pl6nFgXKxJbFHkCnAJ 2Bnuy8iKNn3Drdvqcb89dgEIdKuCxAHy2V1WgZLGNi0z+4eroll66RFbXmmQ6A83xYJi haqrQp2HrQm9dmHct5nVmdCVVDfJdGopbEYRYuWHcNhyhKZIWHlO6/HkaS68F8UVADnx sxbJdaoaWTaK5AfClahjP2UdBc/nBose0ayLLVSxQtdfuBZvQezOMzRb3RFrEXu2SArF 3t3A== 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=Pr+QuypTEYHytLA4lxMeEOthoxLy/yojMYWM63UclUP6SJXIVumhana+gN//efN/YY CPG5rnz2Hc9vSbwsIdsMuAp4Lus8oBtLKM4xtQqPD5c5uKuEY4o0bo2vqgiOkFI/9Wm1 6eCNorpp7qSvFu6Ay1uAH6sLbOE3dfniubc5bDjnk8hmMpuLZect+G/1+gVu4+katqVy AR2QkPjfoVqpqmR9D5cQsDdG2C4hQF1g2rG5OllyMcQXj6ofsGlYFVGXCj248zGS1itX lT50eKSmvtZzuTLT6azKOWqj7nRZ4c+UqYaQiulOPUz8NoeJAbZfDQv1WaAxsLRPZXSw DJ5g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=GgXbR74x; 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-af188164a09sor98230266b.10.2025.07.22.03.37.20 for (Google Transport Security); Tue, 22 Jul 2025 03:37:20 -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: ASbGncshBeOLMFWQSTtF9WYI84drLVJ5qz7f+MyfWn8pusnunRNrHy5eEtJSjCOVmAh 8h22DRA0hxyhAE1E0ROgQqQwgIQKQa283EDma8vhPaUUJLvb93sniFAs/79BXwswO/XWXrydfhR h4JXdtJzQxBcjE+tOS+vT82txa+pwGVAKaSfwoL+ZgqDQ07qe575qy7pBanzi3M2cfIulpUGWQ1 mFYu4QL7EXoP8jKGa0EKcLig6dvcc3WcJxZhzgmE6R6hMpSIJql3djMBqAvEskoce6+771puLPe x98QLqNf/0QbivmaFnjb0CmR6w54383Gc3QaZF9YqaHCU1GTB4w3w2NIuVRhE4UbUVYNu+r9o2M 6yMfQ/+6AOCjPD2/7FXXQ0GH1UhHH5RG1qqb7GMYF2E3kbR+qpDxM3in4m84= X-Received: by 2002:a17:907:3e93:b0:ae3:d026:36cd with SMTP id a640c23a62f3a-aec6a6235eemr1682182966b.42.1753180639487; Tue, 22 Jul 2025 03:37:19 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:2bba:d7b0:8e79:c982]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-aec6ca310e2sm844568766b.79.2025.07.22.03.37.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Jul 2025 03:37:19 -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: [PATCH 4/4] Input: imx6ul_tsc - use BIT, FIELD_{GET,PREP} and GENMASK macros Date: Tue, 22 Jul 2025 12:36:18 +0200 Message-ID: <20250722103706.3440777-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250722103706.3440777-1-dario.binacchi@amarulasolutions.com> References: <20250722103706.3440777-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=GgXbR74x; 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 --- 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,