From nobody Mon Dec 1 22:05:47 2025 Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (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 41C94302CC7 for ; Mon, 1 Dec 2025 10:00:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764583238; cv=none; b=uHOEBwcstXUTMlxRKlRPDmBU/V7xPh3XmUacPzMhtM8qUdBHX1FHMw0AC7TAV8pt7tXD0U4x/mk/08aJ7EFgiBUvVsqTeGfIn+VEqx0WxgoOl7+oUV4I1B5ujp3zJZn0LcyMOGygJKDweOztA+6Biwr2E9M3Sv42Z9oVXkq5D60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764583238; c=relaxed/simple; bh=h/L2zhPfn2Gbd634jm4+Ta6MvmpxMumLED/InTCkazs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=MmQaSadPX/Zv+4IVDIj8fZ3AaDvvTuAm0t70L7POEwXY6qfF9e1mAj2glQYVm+joXHOkzf6L7X8Pm6hwb7kBF5XBf746JQHQs/bKb7O1fDtYUnzXIRwwoJJsJhkGvnedk562783rPqxpMZtUVU7UArZ24bvu0XLf7ghXPehJo/Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=T9T8iShB; arc=none smtp.client-ip=209.85.210.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="T9T8iShB" Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-7c7503c73b4so2302167a34.3 for ; Mon, 01 Dec 2025 02:00:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1764583235; x=1765188035; 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=vttCzqYG+Cs7YHIz7IHkrbbgN3J8iVBx1Ck/rBWwG+E=; b=T9T8iShB8aRpu+jvoV6hvCzjhXjPHvYLotqbQwyZOykGwHignw87vRsYdD1d9dwV2s vGcZ3MyUm7PzvhlM7D9z+rDPPPiTDL7e+l1y/vaaGxXMyWcmrMgeT51R3NLyIxoATu/S QB3Sthl9jTDiQfp7K3REYi9s/8DC312VJYR9heVpGKuEJbLZ1i0N4TaV7OOhrK9gGO41 A9IafUEUPW9TSJ/1+k+/q7gJePTqpgJhiNIMKcRBLs4yGFr4vv/RaMWexAwA2NtF8YUD pR6T3eVstkjfJWyqE2Sa7WN04zKSvaxGB8NamTKqikYkW0YO/glqp4eHz/26VMUAf0UM NnQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764583235; x=1765188035; 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=vttCzqYG+Cs7YHIz7IHkrbbgN3J8iVBx1Ck/rBWwG+E=; b=t9AicGMxYBtL6T3bINwlyApBoC72aLgSD9bwk6RIVPt4bJpDuwfU7x0tMa2tWIWOHj XY/NDfRZLcafqqB2Wj60RE9roy9ad0g1fJ+6VKlCBYPEPx6nLZomL8S3GBI4j6ZrDdqL F1zuQB53uFOYulB6u7pGDE/dutW/RCPisYKVpdJau4jtasKPVAsAPCAIpAVZWyX00fy7 9XeglAaPgihKuAZkOy3hiZL03dFmD+YW5w/Omu51d9YL+i28jCuwsgJBb3tSuGbCQHWw JZQ7ubZHNI/hIwv/ollnLoi9Lx4pJ1SdEulpctVxJS4/4x2P0Vd6XSaGZACt86eSYU9P GkHA== X-Forwarded-Encrypted: i=1; AJvYcCWsmvNdIiHWb+I4pL1Ss9IDwvon/xYD+5tkaY9P3KAlgVH9LRoV9z0Fnimvgf+7ktePFbUF6/uWajkeaHQ=@vger.kernel.org X-Gm-Message-State: AOJu0YySTDXtOxao4o4M6KnkPpBFnXp+/SodLFJ+6F2j6jerWBuXmNAR R6uOjtWny47QpWwCPlm7xwHo/jDXWhMY8o3TXw/tV0c7eBMkxNb7awIioIiyRJQ8Zdw= X-Gm-Gg: ASbGnctlntlriwa43Twh3A18YU2B0oH3h8GqPmbGDHpSVfq/z8n9tRS6QnbrYhf1+Qm U8vv0Zmo8I5X1XryhxF3XIwIVeEPxUmsZP4GY/MI8aET3vG7NqC3llPugyHnlYgG6YrP1qNOM5J B75QuvRkWJBY8+YE/pHlRoCKu+DJMhn0KqWKl29LPYbXf5Olp23FnJYvcjC6kEqdLA1sLdgEDdc 5mDp7BdwIc+FoiXcPkhRUiS9AGRQFgXPtOHDd5Lvf7FaJYJSfLk3PuLG/m4gn4j7NtHoVErBs/t tQt8Q9MJZe6WXqseWZ8kwdWEQ1g7/SR751Hr7+TCuHYcZOY+Xvd18ouglbDwNjh+Dr03RW9Xyhh dqwJSw2R8EPUVbyF+QBnMJ8s9z3ynpOS4xNlU3CzKZoSSuEgh0tWDM/dA X-Google-Smtp-Source: AGHT+IH7ZXhKoR6QdClQKtV9d4tJbGaLp0zYNqtJ/pVkxVzNrRm1NwbNfJv/moDNWmGyhyh6+uGaNw== X-Received: by 2002:a05:6830:6f0e:b0:7bd:f7c:ee with SMTP id 46e09a7af769-7c7990938c3mr15929504a34.25.1764583234871; Mon, 01 Dec 2025 02:00:34 -0800 (PST) Received: from localhost ([151.35.151.28]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-65933ef2772sm2404465eaf.17.2025.12.01.02.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 02:00:33 -0800 (PST) From: Francesco Lavra To: Lorenzo Bianconi , Jonathan Cameron , David Lechner , =?UTF-8?q?Nuno=20S=C3=A1?= , Andy Shevchenko , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko Subject: [PATCH v4 3/9] iio: imu: st_lsm6dsx: move wakeup event enable mask to event_src Date: Mon, 1 Dec 2025 11:00:12 +0100 Message-Id: <20251201100018.426749-4-flavra@baylibre.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251201100018.426749-1-flavra@baylibre.com> References: <20251201100018.426749-1-flavra@baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=7475; i=flavra@baylibre.com; h=from:subject; bh=h/L2zhPfn2Gbd634jm4+Ta6MvmpxMumLED/InTCkazs=; b=owEB7QES/pANAwAKAe3xO3POlDZfAcsmYgBpLWb4IWxqnj1iMqMM7C1xI7zGHft1pA3TgJ8Du 3wXagqwTE6JAbMEAAEKAB0WIQSGV4VPlTvcox7DFObt8TtzzpQ2XwUCaS1m+AAKCRDt8TtzzpQ2 X8yZC/9QliEPg2bAB+HsEAR+Kte5NAi9Ci6IPu0GEtSkwGgkRE7RoxnywqldPG2dLob4w/2Mc7/ iyrWQoCNF3X9FBfTd9UNJrfh00Wju7Jg1rqpUk91UBr5vygfJUF6FzxfsDpol0ueUohhfuidQYO QVQ7VMNlfTG52GmT9LyDbLNgn3zSIISFAUl56jk/AeZiNpDseKTeBQEb1VovyWn/StROI2iRbVc GUogZBCzI/8uGk7ZzmiA6+adegA3G7BB0XWvCjNJtMTazpRogynaiWVQcleq3yJFxp77trwuOPR MFgR2m9ERjJ5FMp28DvWe0bpXQZ3aQly27dUL0nXFU5aKGHTqrIdXUAxQVg2yBTXjEHhzMNJNxn 7TMz3qTusODYGAgjX8LAA1po4de1bDmLSNv8RGMJONrVHh84Tz9mFdb2sQmtKJvVHl1M2t+/8gt 0qwopefsLxVzQxDmVeYopp5nxKab1qY8d87VeqyHc10EvR04t3T4BY1/cIYJkVZXRJReo= X-Developer-Key: i=flavra@baylibre.com; a=openpgp; fpr=8657854F953BDCA31EC314E6EDF13B73CE94365F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The mask value being assigned to the irq1_func and irq2_func fields of the irq_config struct is specific to a single event source (i.e. the wakeup event), and as such it should be separate from the definition of the interrupt function registers, which cover multiple event sources. In preparation for adding support for more event types, change the irq1_func and irq2_func type from an {address, mask} pair to an address, and move the mask value to a new field of struct st_lsm6dsx_event_src. No functional changes. Signed-off-by: Francesco Lavra Reviewed-by: Andy Shevchenko Acked-by: Lorenzo Bianconi --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 7 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 80 +++++++------------- 2 files changed, 30 insertions(+), 57 deletions(-) diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_l= sm6dsx/st_lsm6dsx.h index 80bc5686454b..4200e5231950 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h @@ -249,6 +249,7 @@ enum st_lsm6dsx_event_id { =20 struct st_lsm6dsx_event_src { struct st_lsm6dsx_reg value; + u8 enable_mask; struct st_lsm6dsx_reg status; u8 status_x_mask; u8 status_y_mask; @@ -343,8 +344,8 @@ struct st_lsm6dsx_settings { struct { struct st_lsm6dsx_reg irq1; struct st_lsm6dsx_reg irq2; - struct st_lsm6dsx_reg irq1_func; - struct st_lsm6dsx_reg irq2_func; + u8 irq1_func; + u8 irq2_func; struct st_lsm6dsx_reg lir; struct st_lsm6dsx_reg clear_on_read; struct st_lsm6dsx_reg hla; @@ -443,7 +444,7 @@ struct st_lsm6dsx_hw { u8 ts_sip; u8 sip; =20 - const struct st_lsm6dsx_reg *irq_routing; + u8 irq_routing; u8 event_threshold; u8 enable_event; =20 diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu= /st_lsm6dsx/st_lsm6dsx_core.c index e8f0a2ff91be..ba163dd2ab82 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -328,14 +328,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sen= sor_settings[] =3D { .addr =3D 0x58, .mask =3D BIT(0), }, - .irq1_func =3D { - .addr =3D 0x5e, - .mask =3D BIT(5), - }, - .irq2_func =3D { - .addr =3D 0x5f, - .mask =3D BIT(5), - }, + .irq1_func =3D 0x5e, + .irq2_func =3D 0x5f, .hla =3D { .addr =3D 0x12, .mask =3D BIT(5), @@ -394,6 +388,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sens= or_settings[] =3D { .addr =3D 0x5b, .mask =3D GENMASK(5, 0), }, + .enable_mask =3D BIT(5), .status =3D { .addr =3D 0x1b, .mask =3D BIT(3), @@ -500,14 +495,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sen= sor_settings[] =3D { .addr =3D 0x58, .mask =3D BIT(0), }, - .irq1_func =3D { - .addr =3D 0x5e, - .mask =3D BIT(5), - }, - .irq2_func =3D { - .addr =3D 0x5f, - .mask =3D BIT(5), - }, + .irq1_func =3D 0x5e, + .irq2_func =3D 0x5f, .hla =3D { .addr =3D 0x12, .mask =3D BIT(5), @@ -566,6 +555,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sens= or_settings[] =3D { .addr =3D 0x5b, .mask =3D GENMASK(5, 0), }, + .enable_mask =3D BIT(5), .status =3D { .addr =3D 0x1b, .mask =3D BIT(3), @@ -702,14 +692,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sen= sor_settings[] =3D { .addr =3D 0x58, .mask =3D BIT(0), }, - .irq1_func =3D { - .addr =3D 0x5e, - .mask =3D BIT(5), - }, - .irq2_func =3D { - .addr =3D 0x5f, - .mask =3D BIT(5), - }, + .irq1_func =3D 0x5e, + .irq2_func =3D 0x5f, .hla =3D { .addr =3D 0x12, .mask =3D BIT(5), @@ -809,6 +793,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sens= or_settings[] =3D { .addr =3D 0x5b, .mask =3D GENMASK(5, 0), }, + .enable_mask =3D BIT(5), .status =3D { .addr =3D 0x1b, .mask =3D BIT(3), @@ -957,14 +942,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sen= sor_settings[] =3D { .addr =3D 0x56, .mask =3D BIT(6), }, - .irq1_func =3D { - .addr =3D 0x5e, - .mask =3D BIT(5), - }, - .irq2_func =3D { - .addr =3D 0x5f, - .mask =3D BIT(5), - }, + .irq1_func =3D 0x5e, + .irq2_func =3D 0x5f, .hla =3D { .addr =3D 0x12, .mask =3D BIT(5), @@ -1052,6 +1031,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { .addr =3D 0x5b, .mask =3D GENMASK(5, 0), }, + .enable_mask =3D BIT(5), .status =3D { .addr =3D 0x1b, .mask =3D BIT(3), @@ -1176,14 +1156,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_s= ensor_settings[] =3D { .addr =3D 0x56, .mask =3D BIT(6), }, - .irq1_func =3D { - .addr =3D 0x5e, - .mask =3D BIT(5), - }, - .irq2_func =3D { - .addr =3D 0x5f, - .mask =3D BIT(5), - }, + .irq1_func =3D 0x5e, + .irq2_func =3D 0x5f, .hla =3D { .addr =3D 0x12, .mask =3D BIT(5), @@ -1239,6 +1213,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { .addr =3D 0x5b, .mask =3D GENMASK(5, 0), }, + .enable_mask =3D BIT(5), .status =3D { .addr =3D 0x1b, .mask =3D BIT(3), @@ -1357,14 +1332,8 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_s= ensor_settings[] =3D { .addr =3D 0x56, .mask =3D BIT(0), }, - .irq1_func =3D { - .addr =3D 0x5e, - .mask =3D BIT(5), - }, - .irq2_func =3D { - .addr =3D 0x5f, - .mask =3D BIT(5), - }, + .irq1_func =3D 0x5e, + .irq2_func =3D 0x5f, .hla =3D { .addr =3D 0x03, .mask =3D BIT(4), @@ -1451,6 +1420,7 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { .addr =3D 0x5b, .mask =3D GENMASK(5, 0), }, + .enable_mask =3D BIT(5), .status =3D { .addr =3D 0x45, .mask =3D BIT(3), @@ -1911,10 +1881,11 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio= _dev, static int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw, bool state) { const struct st_lsm6dsx_reg *reg; + const struct st_lsm6dsx_event_src *src; unsigned int data; int err; =20 - if (!hw->settings->irq_config.irq1_func.addr) + if (!hw->irq_routing) return -ENOTSUPP; =20 reg =3D &hw->settings->event_settings.enable_reg; @@ -1927,9 +1898,10 @@ static int st_lsm6dsx_event_setup(struct st_lsm6dsx_= hw *hw, bool state) } =20 /* Enable wakeup interrupt */ - data =3D ST_LSM6DSX_SHIFT_VAL(state, hw->irq_routing->mask); - return st_lsm6dsx_update_bits_locked(hw, hw->irq_routing->addr, - hw->irq_routing->mask, data); + src =3D &hw->settings->event_settings.sources[ST_LSM6DSX_EVENT_WAKEUP]; + data =3D ST_LSM6DSX_SHIFT_VAL(state, src->enable_mask); + return st_lsm6dsx_update_bits_locked(hw, hw->irq_routing, + src->enable_mask, data); } =20 static int st_lsm6dsx_read_event(struct iio_dev *iio_dev, @@ -2183,11 +2155,11 @@ st_lsm6dsx_get_drdy_reg(struct st_lsm6dsx_hw *hw, =20 switch (drdy_pin) { case 1: - hw->irq_routing =3D &hw->settings->irq_config.irq1_func; + hw->irq_routing =3D hw->settings->irq_config.irq1_func; *drdy_reg =3D &hw->settings->irq_config.irq1; break; case 2: - hw->irq_routing =3D &hw->settings->irq_config.irq2_func; + hw->irq_routing =3D hw->settings->irq_config.irq2_func; *drdy_reg =3D &hw->settings->irq_config.irq2; break; default: --=20 2.39.5