From nobody Thu Oct 2 23:05:50 2025 Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (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 68D0D322A1F for ; Wed, 10 Sep 2025 13:59:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757512768; cv=none; b=GYZqpmmuvCs17U5dA4hivWLGcyrfvCdlQeBtpLss0QkZiPlRl8h7X3CNRvFUSvlyOm84z0zzyXT0nMVRy8lcxVB6EOlJjbhVoxRi7HrW/Hh25j9byN5xtKY13o+GcssS4gFSd420KB6sJ5o15BAh45sd7V79dKUNgv2emHRw6Co= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757512768; c=relaxed/simple; bh=544owQth2eYHOtuZem85B7R//X9yXkusHL8qgRLe1MY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ahOH6sSd1MKgE7J9KPz5/+Grx6Iy8m/Z/xPSSdxQXJ15a4MLZDyCY6XT0XaySS8BAZJkrgfv4yF/C8YMzPDIQ8S9ocJSUZ8ZMePRUrPWgakfcTzZtPrw4JjA0iZxKUAYi9f0Yff9RGaTaD3FTohj/950YxBslaoBsP6bjKQZ08w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com; spf=pass smtp.mailfrom=amarulasolutions.com; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b=LOVwIgKE; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amarulasolutions.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="LOVwIgKE" Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-b04ba3de760so530638166b.0 for ; Wed, 10 Sep 2025 06:59:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1757512765; x=1758117565; 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=2oVD/JfoNNaDmsm+Xmi5oDSaNjfSX3YkjZgxJuhnDRo=; b=LOVwIgKEfb+qeLAunhJPmRapPfQdHfw6J2G6/KHQ9IBHvqT4/O+pX0FqTjsNpSkoaC u9YTmktLcCjkVpuEIuEPqN/wGJvKTMv+x/4sfmmnXidK4Q+iKchweyrx4lLR0xFYJ3F6 TlLNZbBqwmIT06h7umsDisim/YdReeYHIh2BU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757512765; x=1758117565; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2oVD/JfoNNaDmsm+Xmi5oDSaNjfSX3YkjZgxJuhnDRo=; b=cPmKmzPzjcY9xEKQbG2n+8FR/gMppjYGpKZV0cdOwmyZSFG5dxCdrUOhGmW+g7hThM GqmeLZvTkA8XDV9lbuZJpxHXVV2c8TiNwR9lWcrE0fqCW2GNM01+6iCCNo6oH6jtpQfe SR9XCu9RC2o9rM+HItLbyDGaY+rCLGAL0lIcrhPY19vOY2S+T/nLUzXPxNH+eFLEtEEE gWu6G7O33K6/qJzagv8/beWEDs9N1gPivPn706TBiyATc87bp4LnuMYLBj01xkIc/utM kmyV3pyX4WdR5XhDCcqJ6rbVvPZE6CP61tpYDBdoHSD2RD7iAOEKE4GZ0ke4TCdxQK/1 ShLw== X-Gm-Message-State: AOJu0YyFjTlE/+6VKQxUs7YWAPqQ8yHyutqzlQv/8zN4NttNtrdmIHGT hcAvtkrXDTGgy3T9yBKaryYp593Kg9oWpbh/3RjiqSs9QIw10oG6aZPnGHlmJdDR6oIbf0M1WY/ 00Myg X-Gm-Gg: ASbGncsbUzhDK8ft6E2XA1DyvjZ6FcITlhVZzrzUTGRwcF7FL0v+gEllYdb6W+B5OeF WMfKIi0juLGp9bD8mqYbxL4vtaI53J9QcclcfJg0lFEXCKG9YKZJWId2uqXbbSGAbeXvgVLKSJC kOGaTwxn13wIaY3XE1kw5PCyFtyESHXISmOnI3DybJBVKxEpiD1wkZHk6n6FRwdpHNCO5BO7L2u Bc7C/O8i0MiUp47KGc8YFtnBWSvaqlvINySOdhNgIjmf4lZqoJmJwNxkrNzQw8ic8BuuSc5nfWO 0GvbeHyDM99MoEykbMMLHf5l10gvoYAUrPq+JSybp4mqPj/bA+dJp3uisQKtKw0Zg6GOe++GqZv snay2qlfEd06+Wl9K6ZTfIvNidae068kix+PsbFfLk5xN2ZIdkGbXktWcmzVPWAoVejMpTOK0Fd 4OYM1fyADdKJkNcXDOtPdhbnSKQMzlc6Uevqf1HPWfKpe/sKGxN4Ok5nMtuReww7pH X-Google-Smtp-Source: AGHT+IEWhjZ2aPH1n4PeOlOpHvhF2m0dujZUWB3Bjg2NXbj0JvYYMpYB5dzB9+tg4YV0EPPwyT2uzg== 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> 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" 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/touchsc= reen/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 =20 /* 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) =20 /* ADC registers */ #define REG_ADC_HC0 0x00 @@ -66,20 +64,26 @@ #define REG_TSC_DEBUG_MODE 0x70 #define REG_TSC_DEBUG_MODE2 0x80 =20 +/* 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) =20 struct imx6ul_tsc { struct device *dev; @@ -115,19 +119,20 @@ static int imx6ul_adc_init(struct imx6ul_tsc *tsc) =20 adc_cfg =3D readl(tsc->adc_regs + REG_ADC_CFG); adc_cfg &=3D ~(ADC_CONV_MODE_MASK | ADC_INPUT_CLK_MASK); - adc_cfg |=3D ADC_12BIT_MODE | ADC_IPG_CLK; - adc_cfg &=3D ~(ADC_CLK_DIV_MASK | ADC_SAMPLE_MODE_MASK); - adc_cfg |=3D ADC_CLK_DIV_8 | ADC_SHORT_SAMPLE_MODE; + adc_cfg |=3D FIELD_PREP(ADC_CONV_MODE_MASK, ADC_12BIT_MODE) | + FIELD_PREP(ADC_INPUT_CLK_MASK, ADC_IPG_CLK); + adc_cfg &=3D ~(ADC_CLK_DIV_MASK | ADC_SAMPLE_MODE); + adc_cfg |=3D FIELD_PREP(ADC_CLK_DIV_MASK, ADC_CLK_DIV_8); if (tsc->average_enable) { adc_cfg &=3D ~ADC_AVGS_MASK; - adc_cfg |=3D (tsc->average_select) << ADC_AVGS_SHIFT; + adc_cfg |=3D FIELD_PREP(ADC_AVGS_MASK, tsc->average_select); } adc_cfg &=3D ~ADC_HARDWARE_TRIGGER; writel(adc_cfg, tsc->adc_regs + REG_ADC_CFG); =20 /* enable calibration interrupt */ adc_hc |=3D ADC_AIEN; - adc_hc |=3D ADC_CONV_DISABLE; + adc_hc |=3D FIELD_PREP(ADC_ADCH_MASK, ADC_CONV_DISABLE); writel(adc_hc, tsc->adc_regs + REG_ADC_HC0); =20 /* start ADC calibration */ @@ -167,19 +172,21 @@ static void imx6ul_tsc_channel_config(struct imx6ul_t= sc *tsc) { u32 adc_hc0, adc_hc1, adc_hc2, adc_hc3, adc_hc4; =20 - adc_hc0 =3D DISABLE_CONVERSION_INT; + adc_hc0 =3D FIELD_PREP(ADC_AIEN, 0); writel(adc_hc0, tsc->adc_regs + REG_ADC_HC0); =20 - adc_hc1 =3D DISABLE_CONVERSION_INT | SELECT_CHANNEL_4; + adc_hc1 =3D FIELD_PREP(ADC_AIEN, 0) | + FIELD_PREP(ADC_ADCH_MASK, SELECT_CHANNEL_4); writel(adc_hc1, tsc->adc_regs + REG_ADC_HC1); =20 - adc_hc2 =3D DISABLE_CONVERSION_INT; + adc_hc2 =3D FIELD_PREP(ADC_AIEN, 0); writel(adc_hc2, tsc->adc_regs + REG_ADC_HC2); =20 - adc_hc3 =3D DISABLE_CONVERSION_INT | SELECT_CHANNEL_1; + adc_hc3 =3D FIELD_PREP(ADC_AIEN, 0) | + FIELD_PREP(ADC_ADCH_MASK, SELECT_CHANNEL_1); writel(adc_hc3, tsc->adc_regs + REG_ADC_HC3); =20 - adc_hc4 =3D DISABLE_CONVERSION_INT; + adc_hc4 =3D FIELD_PREP(ADC_AIEN, 0); writel(adc_hc4, tsc->adc_regs + REG_ADC_HC4); } =20 @@ -194,8 +201,9 @@ static void imx6ul_tsc_set(struct imx6ul_tsc *tsc) u32 debug_mode2; u32 start; =20 - basic_setting |=3D tsc->measure_delay_time << 8; - basic_setting |=3D DETECT_4_WIRE_MODE | AUTO_MEASURE; + basic_setting |=3D FIELD_PREP(MEASURE_DELAY_TIME_MASK, + tsc->measure_delay_time); + basic_setting |=3D AUTO_MEASURE; writel(basic_setting, tsc->tsc_regs + REG_TSC_BASIC_SETTING); =20 debug_mode2 =3D FIELD_PREP(DE_GLITCH_MASK, tsc->de_glitch); @@ -255,7 +263,7 @@ static bool tsc_wait_detect_mode(struct imx6ul_tsc *tsc) =20 usleep_range(200, 400); debug_mode2 =3D readl(tsc->tsc_regs + REG_TSC_DEBUG_MODE2); - state_machine =3D (debug_mode2 >> 20) & 0x7; + state_machine =3D FIELD_GET(STATE_MACHINE_MASK, debug_mode2); } while (state_machine !=3D DETECT_MODE); =20 usleep_range(200, 400); @@ -283,8 +291,8 @@ static irqreturn_t tsc_irq_fn(int irq, void *dev_id) =20 if (status & MEASURE_SIGNAL) { value =3D readl(tsc->tsc_regs + REG_TSC_MEASURE_VALUE); - x =3D (value >> 16) & 0x0fff; - y =3D value & 0x0fff; + x =3D FIELD_GET(X_VALUE_MASK, value); + y =3D FIELD_GET(Y_VALUE_MASK, value); =20 /* * In detect mode, we can get the xnur gpio value, --=20 2.43.0