From nobody Tue Dec 2 00:45:23 2025 Received: from mail-ed1-f44.google.com (mail-ed1-f44.google.com [209.85.208.44]) (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 EACB731ED65 for ; Tue, 25 Nov 2025 20:23:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764102195; cv=none; b=Vv/Ku/Igi//9dW1CYMZ+ED6K8v/UXo+RTSz1TrXDvf6SyEe2TwDyMKpkt2uo9NYZprv3FIuzXF/iofg7UcmdeEbmiHzMfImm7telxv9+focK4wREoh+mF2myLOM6+t5lMsxVLRSLxgmvB1XQfNPyiy2drf861N1bocAYYglNNlw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764102195; c=relaxed/simple; bh=n+tWKmHDIKPoB17m8PDbku2hGkPzuoaQtqpngbiJb08=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=B7t25+UgeT6vqoSDdVw6526dLSMraQr8Jc4+wrxPSOXPiSA+jtZSDPVIXKZAKrAqzUgpXzDIORuG6xGdfvk5z44qZQ50lkZExSuceTMLzGHPZ0lkES2oyvnEMb2zwVMppEac5irPsTQoYMTuEbXpKPlfCj/kkqQBS5NmmRgJCzw= 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=HuztxCei; arc=none smtp.client-ip=209.85.208.44 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="HuztxCei" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-6419aaced59so8254948a12.0 for ; Tue, 25 Nov 2025 12:23:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1764102191; x=1764706991; 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=BOpKIjBtp3jglLtC7+Xd90dUysNa5e26fWUT0wH80JA=; b=HuztxCeiVe92DKROSPOp2IvlK5b4QDJL/SzE9O1GIOTlIFFp6BZzxhkFElJAJKVDg3 qkWPSiuVSmPdSAbsvAZ60ydZp+9M1Pggq/fp+coTjG7t00MIPW0UxibtsLBKAKEpacnp gtmKGJA+uKDU1p9b+hl2gegti88datzNW8sDs8DA8Uia2Jd31UedKK+WuVKcNNms5zpe fKjUKCcZteYVtOIjO78bWSqSzFpcrlkaMZWzUhKExkNwW1OkpOb9EwBFnP9qK+NsVjzR pxMce8RPwTz2+1o/kGB4MJ/wiJz1MnW6/Sw2P3AFYDbTDcOQVpsXQQi+sEQp5rWyqiSi FaVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764102191; x=1764706991; 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=BOpKIjBtp3jglLtC7+Xd90dUysNa5e26fWUT0wH80JA=; b=sjTnpU2iD+gYoKn34ZgJRDaWqArqbzepNeDOlzLDCr6yX7VnFwCTbsNU37rTSsxz1s GwtgMUFfrpZKXMVTPNJ1rID/gEgmHlW4hyWHJXRIPTDWGBRTWl+XDtJJob392WuLQYPj JfHORMGfjTSIV6maI1IEEShJ8oErK+8NJwL4Ll/ELiORbU2rdPsshPrkdHPp1GonKRZY +jGmvt5McdUJHxMy4w+EpcZTeRDWkW9sFQeIVxQKAgsnGMQEZw7x7cwqZ5ce9yrczFm1 31+1H0S+EvchIDYSeLJlc8n4hYziLPdqwek3Ofzc+jl+AKgZIBe+uUTQ7QOySyBnDS2G db4A== X-Forwarded-Encrypted: i=1; AJvYcCUZYq3jo7bvD6mLCa1IPq+J3A4vSYsH7Yip6P4fRMiArmpNzIMtsS5ysdyNqZFnYsnT4YyeNA4/9MFT16M=@vger.kernel.org X-Gm-Message-State: AOJu0YwQ77S5bCZqCxEOs8k0Z+S6JOAoBaaM48Eeb+iuYzkun+LYJ0qD cCWUJ/xU/7tJWrwOtPPCnce8G1xauJ6a4HmB9jiomDpi/D4VQ6f0BEWW9+XNC/ipf71j4662IZL SezbA X-Gm-Gg: ASbGncsiIOS9WgB67BsDHq8pPEznIOXPuQq1tF96IFunILRhOiWWa+kWxuSEjYSqdUd FzUheWS5JSdRjoSEZ8/yLD7X0i3/iPSXojnhT/mtG6td1IJjwSsLsJpIb8qrcaKjB7HDcZC+BKo OQMk2iFSWb9g0RFqImqJs90zxbKmP9/t4Ji/3ucHwW4d+rb+hyuP85PxLFgv42JGpXYNgw/6PQP cYP4Xk3qx56POS1b/70b8LoOJuTfLKmHypMrupHY9tTVFeGof9ecg+XkpW7cpKQbxNGWh214zL6 MYnNu/3pyNm2e9ZdvB7UndO7dXL/k1GBX8eXT9NkGC+Wpm4zGDtTIdmHoCFHB6/wrRrZ/dnFlvx QYHxdSy7lXID79nCP5xl5oVkxHJC+wsXgAebRNZdoJxvSCAzCBTtOR7vtmsoo77CYteWv X-Google-Smtp-Source: AGHT+IFED+wA1aUsDmv+jMUwUksL6v6VocPD4iFOHhGx7FNewLdGFJ4OwYIvMKUrk83F0B/Ohwgvaw== X-Received: by 2002:a17:907:9610:b0:b73:4d06:bc8 with SMTP id a640c23a62f3a-b76718c224fmr1795378666b.53.1764102191277; Tue, 25 Nov 2025 12:23:11 -0800 (PST) Received: from localhost ([151.35.128.119]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b7654d7cbebsm1682751666b.29.2025.11.25.12.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Nov 2025 12:23:11 -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 v3 2/9] iio: imu: st_lsm6dsx: make event_settings more generic Date: Tue, 25 Nov 2025 21:23:00 +0100 Message-Id: <20251125202307.4033346-3-flavra@baylibre.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20251125202307.4033346-1-flavra@baylibre.com> References: <20251125202307.4033346-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=8599; i=flavra@baylibre.com; h=from:subject; bh=n+tWKmHDIKPoB17m8PDbku2hGkPzuoaQtqpngbiJb08=; b=owEB7QES/pANAwAKAe3xO3POlDZfAcsmYgBpJhACqZsTWGnvQ5y4mMPFAjXdt7beAc/oZJiro kTDzMLWF1KJAbMEAAEKAB0WIQSGV4VPlTvcox7DFObt8TtzzpQ2XwUCaSYQAgAKCRDt8TtzzpQ2 X2bLC/9pm2QXnG8WLW278XKBGD245lf6bs11d/RI8bOF4kmYtxeth624IcXdXncZ/WG/LqTwf6/ MBgbxnImSh028iKu2K+cGCHnSj3RR2S6dBl2a7ctjFFLbECMsldd3fCc2J9k4sIwiqCbIrph4ZA /QXlRJ3l4orhqXyX9IfJuhprcVvnhO16Nn5vI+XnFoQJ6a1mrg0Gw28eJoivyzRwm1UTMTeZYgG XnUs/+C0VR2kyz6TOqcF+3QPNrm1TazgC47sT+SLh8nigFJpHbodc0aDJ4Z3t1egaj3H+Ecu3+7 T5aPTgPB0f97bgo/dcSvOFTYbJrMDlp3ZSzY66hrL5AynuhCKIU3+KcU7PvrFwOICmlE9Qf2JPR LEr0cmJ4vmvKK2SY34eJqLwl1DQld1wOUsKfjLrvnLhadJQaAo02yzEciKVBRVn9ze+mw+Etoya ionr8juGD1O+a2OolRs13yMRv+OuHrdpbOkergtjcaal3uUmrvNeskatjFDfMEYyF9ZBw= X-Developer-Key: i=flavra@baylibre.com; a=openpgp; fpr=8657854F953BDCA31EC314E6EDF13B73CE94365F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The st_lsm6dsx_event_settings structure contains fields specific for one event type (wakeup). In preparation for adding support for more event types, introduce an event id enum and a generic event source structure, and replace wakeup-specific data in struct st_lsm6dsx_event_settings with an array of event source structures. Signed-off-by: Francesco Lavra Reviewed-by: Andy Shevchenko Acked-by: Lorenzo Bianconi --- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 20 ++- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 146 ++++++++++++------- 2 files changed, 106 insertions(+), 60 deletions(-) diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_l= sm6dsx/st_lsm6dsx.h index a4f558899767..80bc5686454b 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h @@ -242,14 +242,22 @@ struct st_lsm6dsx_shub_settings { u8 pause; }; =20 +enum st_lsm6dsx_event_id { + ST_LSM6DSX_EVENT_WAKEUP, + ST_LSM6DSX_EVENT_MAX +}; + +struct st_lsm6dsx_event_src { + struct st_lsm6dsx_reg value; + struct st_lsm6dsx_reg status; + u8 status_x_mask; + u8 status_y_mask; + u8 status_z_mask; +}; + struct st_lsm6dsx_event_settings { struct st_lsm6dsx_reg enable_reg; - struct st_lsm6dsx_reg wakeup_reg; - u8 wakeup_src_reg; - u8 wakeup_src_status_mask; - u8 wakeup_src_z_mask; - u8 wakeup_src_y_mask; - u8 wakeup_src_x_mask; + struct st_lsm6dsx_event_src sources[ST_LSM6DSX_EVENT_MAX]; }; =20 enum st_lsm6dsx_ext_sensor_id { diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu= /st_lsm6dsx/st_lsm6dsx_core.c index a09df9d772dd..e8f0a2ff91be 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c @@ -388,15 +388,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { }, }, .event_settings =3D { - .wakeup_reg =3D { - .addr =3D 0x5B, - .mask =3D GENMASK(5, 0), + .sources =3D { + [ST_LSM6DSX_EVENT_WAKEUP] =3D { + .value =3D { + .addr =3D 0x5b, + .mask =3D GENMASK(5, 0), + }, + .status =3D { + .addr =3D 0x1b, + .mask =3D BIT(3), + }, + .status_z_mask =3D BIT(0), + .status_y_mask =3D BIT(1), + .status_x_mask =3D BIT(2), + }, }, - .wakeup_src_reg =3D 0x1b, - .wakeup_src_status_mask =3D BIT(3), - .wakeup_src_z_mask =3D BIT(0), - .wakeup_src_y_mask =3D BIT(1), - .wakeup_src_x_mask =3D BIT(2), }, }, { @@ -554,15 +560,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { }, }, .event_settings =3D { - .wakeup_reg =3D { - .addr =3D 0x5B, - .mask =3D GENMASK(5, 0), + .sources =3D { + [ST_LSM6DSX_EVENT_WAKEUP] =3D { + .value =3D { + .addr =3D 0x5b, + .mask =3D GENMASK(5, 0), + }, + .status =3D { + .addr =3D 0x1b, + .mask =3D BIT(3), + }, + .status_z_mask =3D BIT(0), + .status_y_mask =3D BIT(1), + .status_x_mask =3D BIT(2), + }, }, - .wakeup_src_reg =3D 0x1b, - .wakeup_src_status_mask =3D BIT(3), - .wakeup_src_z_mask =3D BIT(0), - .wakeup_src_y_mask =3D BIT(1), - .wakeup_src_x_mask =3D BIT(2), }, }, { @@ -791,15 +803,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { .addr =3D 0x58, .mask =3D BIT(7), }, - .wakeup_reg =3D { - .addr =3D 0x5B, - .mask =3D GENMASK(5, 0), + .sources =3D { + [ST_LSM6DSX_EVENT_WAKEUP] =3D { + .value =3D { + .addr =3D 0x5b, + .mask =3D GENMASK(5, 0), + }, + .status =3D { + .addr =3D 0x1b, + .mask =3D BIT(3), + }, + .status_z_mask =3D BIT(0), + .status_y_mask =3D BIT(1), + .status_x_mask =3D BIT(2), + }, }, - .wakeup_src_reg =3D 0x1b, - .wakeup_src_status_mask =3D BIT(3), - .wakeup_src_z_mask =3D BIT(0), - .wakeup_src_y_mask =3D BIT(1), - .wakeup_src_x_mask =3D BIT(2), }, }, { @@ -1028,15 +1046,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_= sensor_settings[] =3D { .addr =3D 0x58, .mask =3D BIT(7), }, - .wakeup_reg =3D { - .addr =3D 0x5b, - .mask =3D GENMASK(5, 0), + .sources =3D { + [ST_LSM6DSX_EVENT_WAKEUP] =3D { + .value =3D { + .addr =3D 0x5b, + .mask =3D GENMASK(5, 0), + }, + .status =3D { + .addr =3D 0x1b, + .mask =3D BIT(3), + }, + .status_z_mask =3D BIT(0), + .status_y_mask =3D BIT(1), + .status_x_mask =3D BIT(2), + }, }, - .wakeup_src_reg =3D 0x1b, - .wakeup_src_status_mask =3D BIT(3), - .wakeup_src_z_mask =3D BIT(0), - .wakeup_src_y_mask =3D BIT(1), - .wakeup_src_x_mask =3D BIT(2), }, }, { @@ -1209,15 +1233,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_= sensor_settings[] =3D { .addr =3D 0x58, .mask =3D BIT(7), }, - .wakeup_reg =3D { - .addr =3D 0x5B, - .mask =3D GENMASK(5, 0), + .sources =3D { + [ST_LSM6DSX_EVENT_WAKEUP] =3D { + .value =3D { + .addr =3D 0x5b, + .mask =3D GENMASK(5, 0), + }, + .status =3D { + .addr =3D 0x1b, + .mask =3D BIT(3), + }, + .status_z_mask =3D BIT(0), + .status_y_mask =3D BIT(1), + .status_x_mask =3D BIT(2), + }, }, - .wakeup_src_reg =3D 0x1b, - .wakeup_src_status_mask =3D BIT(3), - .wakeup_src_z_mask =3D BIT(0), - .wakeup_src_y_mask =3D BIT(1), - .wakeup_src_x_mask =3D BIT(2), }, }, { @@ -1415,15 +1445,21 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_= sensor_settings[] =3D { .addr =3D 0x50, .mask =3D BIT(7), }, - .wakeup_reg =3D { - .addr =3D 0x5b, - .mask =3D GENMASK(5, 0), + .sources =3D { + [ST_LSM6DSX_EVENT_WAKEUP] =3D { + .value =3D { + .addr =3D 0x5b, + .mask =3D GENMASK(5, 0), + }, + .status =3D { + .addr =3D 0x45, + .mask =3D BIT(3), + }, + .status_z_mask =3D BIT(0), + .status_y_mask =3D BIT(1), + .status_x_mask =3D BIT(2), + }, }, - .wakeup_src_reg =3D 0x45, - .wakeup_src_status_mask =3D BIT(3), - .wakeup_src_z_mask =3D BIT(0), - .wakeup_src_y_mask =3D BIT(1), - .wakeup_src_x_mask =3D BIT(2), }, }, { @@ -1935,7 +1971,7 @@ st_lsm6dsx_write_event(struct iio_dev *iio_dev, if (val < 0 || val > 31) return -EINVAL; =20 - reg =3D &hw->settings->event_settings.wakeup_reg; + reg =3D &hw->settings->event_settings.sources[ST_LSM6DSX_EVENT_WAKEUP].va= lue; data =3D ST_LSM6DSX_SHIFT_VAL(val, reg->mask); err =3D st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask, data); @@ -2420,6 +2456,7 @@ static bool st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *hw) { const struct st_lsm6dsx_event_settings *event_settings; + const struct st_lsm6dsx_event_src *src; int err, data; s64 timestamp; =20 @@ -2427,13 +2464,14 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw= *hw) return false; =20 event_settings =3D &hw->settings->event_settings; - err =3D st_lsm6dsx_read_locked(hw, event_settings->wakeup_src_reg, + src =3D &event_settings->sources[ST_LSM6DSX_EVENT_WAKEUP]; + err =3D st_lsm6dsx_read_locked(hw, src->status.addr, &data, sizeof(data)); if (err < 0) return false; =20 timestamp =3D iio_get_time_ns(hw->iio_devs[ST_LSM6DSX_ID_ACC]); - if ((data & hw->settings->event_settings.wakeup_src_z_mask) && + if ((data & src->status_z_mask) && (hw->enable_event & BIT(IIO_MOD_Z))) iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC], IIO_MOD_EVENT_CODE(IIO_ACCEL, @@ -2443,7 +2481,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *= hw) IIO_EV_DIR_EITHER), timestamp); =20 - if ((data & hw->settings->event_settings.wakeup_src_y_mask) && + if ((data & src->status_y_mask) && (hw->enable_event & BIT(IIO_MOD_Y))) iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC], IIO_MOD_EVENT_CODE(IIO_ACCEL, @@ -2453,7 +2491,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *= hw) IIO_EV_DIR_EITHER), timestamp); =20 - if ((data & hw->settings->event_settings.wakeup_src_x_mask) && + if ((data & src->status_x_mask) && (hw->enable_event & BIT(IIO_MOD_X))) iio_push_event(hw->iio_devs[ST_LSM6DSX_ID_ACC], IIO_MOD_EVENT_CODE(IIO_ACCEL, @@ -2463,7 +2501,7 @@ st_lsm6dsx_report_motion_event(struct st_lsm6dsx_hw *= hw) IIO_EV_DIR_EITHER), timestamp); =20 - return data & event_settings->wakeup_src_status_mask; + return data & src->status.mask; } =20 static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private) --=20 2.39.5