From nobody Sat Feb 7 18:20:47 2026 Received: from mail-ej1-f50.google.com (mail-ej1-f50.google.com [209.85.218.50]) (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 742A02DF14A for ; Tue, 28 Oct 2025 21:34:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761687269; cv=none; b=ET8VWVUr5MjnCh8b9BZxPdiKkJ2Rq9Ts8kqBreNl+5U46pLim8nL74CL1RGeuR9WNhFq9gO1M24TLPmChFHKJ/G/FIDYNCWQ0T1DTsQprk533zzLBAKcRMSjUfJbjBvX+LfTPFKoI/WgEST9YEZ6X98pQ4V85BhRQ187JV43QiU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761687269; c=relaxed/simple; bh=fSoDX+QWdkPQKwwwC25/FSkyezQzT4MNTwKjc3pdxOI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fFY5jEaEPGGsBeZCKYv7okkNjqyue6TeE1/1r8EtTfI43SF+z/dNq5Ua0QqW6b/M5g9wNSykf8iOubZ119S9dDoGoxj/W/R6EcrtZKtPBR/yMKzPJRw6RBlgHhkZjqDx+0eQCSNHJBBRF5wYYy/YVJJNp9/+lnR19L/iv02Llok= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=fcywpJ5w; arc=none smtp.client-ip=209.85.218.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fcywpJ5w" Received: by mail-ej1-f50.google.com with SMTP id a640c23a62f3a-b3c2c748bc8so850082466b.2 for ; Tue, 28 Oct 2025 14:34:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761687266; x=1762292066; 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=mNeIjx3lptZuujiNnKEUW6K0BzRaMu+x9cOk++i6hWg=; b=fcywpJ5wXoMtU8PUiShTJD4vfSAozVSZBWRwUTL0+gYY8DDpJz4AX+91GD8QRJehu9 YJxmEbk2KreTjZGfZGNjJFa60SHOwjMeABUR6AbieEJokvkG5yzGoane0nrh92BMo0L6 afWvxu4oQWH1uPSQNnC8azEFtN0eZip6RHryPBEZ8ubLgglUAmqLRtOHt10+Dj+8EQZA 3Yc5qv3+k/tjQqlJXfXerM18HOl1SF0s4xE/2Q+gqvRk2597a7MeIMoIN5dEa5wg292S PEqfuhw8y+6/1TutfEC5caJTf0bZ2gyMLY3pFY2gtahrNeG4o2E1HVeIAmAYEeIbc3Hc n8Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761687266; x=1762292066; 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=mNeIjx3lptZuujiNnKEUW6K0BzRaMu+x9cOk++i6hWg=; b=onf9fm3D/+j16ck5Hcy16mmiRXHyHtPYUYOZwmc1I5bZklkflN8FPhyeaUIJHEdhfj rnVbTBxqQgeNQm0aEUFYJfx5pAZgEj4v6ASg4wCFG1YEQfpEnp/MPTNL556jxswEqdIv mNxLLerN2KMseCGD5a9iXAHPVyTivlHfi0Pdn5mRaqlX9G4EjqTAM9W5NrVTYjtEN5HT DvpeaGDPt4mBW3DSnLUxNJveCSdwuvLlony3Aae3Hp1/9Ynltn3kKM1yJTuK7het/GG+ HIOWYUg3YXX/zWSJh9IcSFRJuPdmTi/A2SOmz9/J+7ImlstoFbjbiSwphMuC0jfxJqgR mOgA== X-Forwarded-Encrypted: i=1; AJvYcCUZ0jUX8lhE+ERJIIGv2ImsHGgGF0Sw0Vh1LyDkfksi9ZT3BXdiCC7Gn0k0fpZPLP5bH5CfHKcGh54kK2o=@vger.kernel.org X-Gm-Message-State: AOJu0YzIsrrUP7GQLlhyBhZxp7aAVHb4nuVnVTUVW8dBIy2XA/ujelVX BLbHk+z2qQE7m2tHQk0xW6n+M/Gf0mdoELOPPk5eq4ceam/mgfYNAxNt X-Gm-Gg: ASbGncufHLa3QLbVok0GPzlA9bhwOIK0SIHhMhaW0b+ulF3Evk9IEvzTE+sFhLqrPMW 8E1YIkGGYRAyF13ossNJ2DoTkrY7nEPg2gCXEOPnVTaO+pa2w5jIxzWGbg43W/4MxcvUKlE1v48 PmffjWqUBUSA8WPaO3oIYIPy1Zzk7SeASImJUAiBB/ay9B0bxut5FkjJd71StITFfPCrNY2o5mA OsA1Ec8c0mP4KLj8jo7gc/6bclCczuiUSSB5wQPVn74/gbSUbLo2gMXE9o1Ai7Hup16b/Syvhcf IlAA0nzf5O/YSKQxj1VK8BFbBInnm7urBe5IVUw3m8J+vsl9HgQXqc06ap2isL4vTqyGItaCxmj 1LdDHTJ8h5/jisCmM/2bNSfSxR+4CIlAXMFEqtJ33LDak26BmofePTW1Mf6qa/N0Drt32Awn4zc dEmXEaLZRs+zTLV/nGzZgREdudgQ== X-Google-Smtp-Source: AGHT+IEyYqq65Dt6k7rhFlOuIQ7JykxsGjnM09MaiEHl+ci+PgMQWD+VL54JqHbfcGxpMotOd4fWEg== X-Received: by 2002:a17:907:7253:b0:b6d:2c70:4542 with SMTP id a640c23a62f3a-b703d4f7dfemr44439766b.30.1761687265578; Tue, 28 Oct 2025 14:34:25 -0700 (PDT) Received: from localhost.localdomain ([37.161.59.39]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b6db9b86c80sm451303666b.43.2025.10.28.14.34.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:34:25 -0700 (PDT) From: Antoni Pokusinski To: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, marcelo.schmitt1@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Antoni Pokusinski Subject: [PATCH 1/2] iio: mpl3115: add ctrl_reg4 to mpl3115_data Date: Tue, 28 Oct 2025 22:33:51 +0100 Message-Id: <20251028213351.77368-2-apokusinski01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20251028213351.77368-1-apokusinski01@gmail.com> References: <20251028213351.77368-1-apokusinski01@gmail.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" Cache the value of CTRL_REG4 in the mpl3115_data structure. This is a preparation for adding support for the threshold events. Signed-off-by: Antoni Pokusinski --- drivers/iio/pressure/mpl3115.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index c212dfdf59ff..4cc103e20a39 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -83,6 +83,7 @@ struct mpl3115_data { struct iio_trigger *drdy_trig; struct mutex lock; u8 ctrl_reg1; + u8 ctrl_reg4; }; =20 enum mpl3115_irq_pin { @@ -376,6 +377,7 @@ static int mpl3115_config_interrupt(struct mpl3115_data= *data, goto reg1_cleanup; =20 data->ctrl_reg1 =3D ctrl_reg1; + data->ctrl_reg4 =3D ctrl_reg4; =20 return 0; =20 @@ -390,12 +392,15 @@ static int mpl3115_set_trigger_state(struct iio_trigg= er *trig, bool state) struct iio_dev *indio_dev =3D iio_trigger_get_drvdata(trig); struct mpl3115_data *data =3D iio_priv(indio_dev); u8 ctrl_reg1 =3D data->ctrl_reg1; - u8 ctrl_reg4 =3D state ? MPL3115_CTRL4_INT_EN_DRDY : 0; + u8 ctrl_reg4 =3D data->ctrl_reg4; =20 - if (state) + if (state) { ctrl_reg1 |=3D MPL3115_CTRL1_ACTIVE; - else + ctrl_reg4 |=3D MPL3115_CTRL4_INT_EN_DRDY; + } else { ctrl_reg1 &=3D ~MPL3115_CTRL1_ACTIVE; + ctrl_reg4 &=3D ~MPL3115_CTRL4_INT_EN_DRDY; + } =20 guard(mutex)(&data->lock); =20 --=20 2.25.1 From nobody Sat Feb 7 18:20:47 2026 Received: from mail-ej1-f42.google.com (mail-ej1-f42.google.com [209.85.218.42]) (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 20C862E0924 for ; Tue, 28 Oct 2025 21:34:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761687273; cv=none; b=kJfOG74MmX7TD8oC9FGRQ9S/yJoEhZP0VczPt5E09g+wAWW1NqxQobOCQLjzcukr3yWLbdxE8VQ0fJ6BhODN1/Ql5iCj7sZkcLgQLK4cNrwhi4YzqO7MxZdHX3BGV/kO3WKgURW43z0UZYf0G37aqpUZvkcJhc72fv7ozNenHD0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761687273; c=relaxed/simple; bh=QSmEAQZZBiFeRR5lNiNBsQe1Cx+DZuN0XZKdgN7ymow=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jDcandoB0d43Km1fYUEma0zWexRX6TPtyfbuIQ/dXFF1wNiCvYVxF+jMvEtTOTJsP0DaaWvVYoY6SUT8qaaWMvMJRYeQ21Fbay/zeIRBjxywCblB51Wolk47V8uvcpcrQZ0OZp3Z7d4hIPZOmoHI5zk/D1f125NUsdvjU7bxXE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OXTA66fX; arc=none smtp.client-ip=209.85.218.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OXTA66fX" Received: by mail-ej1-f42.google.com with SMTP id a640c23a62f3a-b472842981fso201729966b.1 for ; Tue, 28 Oct 2025 14:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1761687269; x=1762292069; 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=Y+9LqB/TvV6+QJ2tdqf0cjeFLNzbW3UfQsov2CRssck=; b=OXTA66fX4G/D/SsbomuVLez2y1H27l9qBzJj8CiBmCo47/jKOJKD3PhqkstTFJ95VL lGgut00C8YWe7HBjLv3xERuS1fK+V0fRfWBInkwVCPwIMHLpuR/RmymI/uzX3UKmJbHf ypKsXffkJ8iT2ICmMAol+6BlsCPatBQdG68q3vqB7SBgMvklX3Glx+6HwgCDwsRcl27S DxyHscSDHPsFokuBLQGyG2JhsyYJDNs4ytaljzaR0G3UB9iakl6F/PK4xOj5PUPCM1F7 xnUrH5AGriNnPQCJbg+hYJ5skpH1nWhf4KwswBN8Ovpgz/mQIEpYb7eWQpVCZlc+MF/x rFaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761687269; x=1762292069; 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=Y+9LqB/TvV6+QJ2tdqf0cjeFLNzbW3UfQsov2CRssck=; b=A3w8I67Tisc/pw6u7zE3REsd63nHgnQcQwhgqOwYLRujpgFwHYAUKRpWNovoZ/ALIE a6drOKiglUBV4env5ZRavV29yCBaWIw5wnjAixGoeO/4JsA9JmarK/ki5ylZYfsjprEf buMVEU9UKK0bKbxdr3R9Mguz4raur8AdmtG6JquXhIBUtbdmJ4duUezSmwr5fOG8GUTr ojp3RRal3GhDQyT8NphJG6b4+yNjIZjDZ4l3NLVLAwYI3l0LVnhyXODQW/Lj6NaHVE3u gBIzh4kcLIpFgLwASjAf9gq0a5MP56d3z5IU37I7tzYfW6Dkfjg+2TZnAJAeHu9uDbum 3CaA== X-Forwarded-Encrypted: i=1; AJvYcCVv4LpGIioh1b0cv3LMMJ7pIqEPmtEviEOWXeWTsjTQCZviT/8jCgXOLEyQ3+xYEkwrolShvp/dBOSqeas=@vger.kernel.org X-Gm-Message-State: AOJu0YxnYtMbLW+mWz307Zn46Em6o1T569WuvK6IZe8lKe7IlcIVnCXL Ji1zvgvwpOAmCjvbTc9J6SjlGnAtdQdSRR7AL5IXxCw0hpbQ49lONkRn X-Gm-Gg: ASbGnctSm6tII0NRRXvr475Pzepvsw6GUk8x8Rc/BRgJy1x9P/3Po6qTQZCBhfS/NWU 6AoRGUsTJSmb9TOYsXa1m9HJM+wP19YmDSEw6U2SKPuE24A/Rf/ZrTrH20aCDbxm4s0ZpNg7Sf5 uI5YE5BHmFpHvQupO9skD+iPf7jNKcGCv7byirtIZhOSpftbaR9HnIZCmwNjJycVIT/Jqt1WmN0 ZJE/aOukjjRIwTel9+fM9jr0ZtDZyZ6K+54Fh5S8l9CwuNCJRB7uWQZPOzoO68+HyRZli/zVf+1 Dz6xA/vj3hcM0aVDU7mZCUyb1LsBvEWzr/Z2+JHVNdVx3d1U0AhWfphOPI9ePQ0/9iiiirxC8Ma YjlNeXFnFeJ/D/uCXEL/ssHFgzVl3VFKb+sAj+VrxIq6Ln4bsUMD9BQR/D9BAtHIy4GJMwdwD4n jT1CV7cMx2Nlqb2J0= X-Google-Smtp-Source: AGHT+IFaHW7pIbjxqsxyh/vcoj8mo3fUVONexJBx1AJVyVDn36Wl92RVEg4w7HA/x5qkbM4dMfylfw== X-Received: by 2002:a17:907:3d46:b0:b3b:5fe6:577a with SMTP id a640c23a62f3a-b703d2cd753mr49833866b.8.1761687269210; Tue, 28 Oct 2025 14:34:29 -0700 (PDT) Received: from localhost.localdomain ([37.161.59.39]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b6db9b86c80sm451303666b.43.2025.10.28.14.34.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Oct 2025 14:34:28 -0700 (PDT) From: Antoni Pokusinski To: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, marcelo.schmitt1@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, Antoni Pokusinski Subject: [PATCH 2/2] iio: mpl3115: add threshold events support Date: Tue, 28 Oct 2025 22:33:52 +0100 Message-Id: <20251028213351.77368-3-apokusinski01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20251028213351.77368-1-apokusinski01@gmail.com> References: <20251028213351.77368-1-apokusinski01@gmail.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" Add support for pressure and temperature rising threshold events. Signed-off-by: Antoni Pokusinski --- drivers/iio/pressure/mpl3115.c | 219 +++++++++++++++++++++++++++++++-- 1 file changed, 210 insertions(+), 9 deletions(-) diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index 4cc103e20a39..bb252ff05ff5 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -16,8 +16,10 @@ #include #include #include +#include =20 #include +#include #include #include #include @@ -30,6 +32,8 @@ #define MPL3115_WHO_AM_I 0x0c #define MPL3115_INT_SOURCE 0x12 #define MPL3115_PT_DATA_CFG 0x13 +#define MPL3115_PRESS_TGT 0x16 /* MSB first, 16 bit */ +#define MPL3115_TEMP_TGT 0x18 #define MPL3115_CTRL_REG1 0x26 #define MPL3115_CTRL_REG2 0x27 #define MPL3115_CTRL_REG3 0x28 @@ -42,6 +46,8 @@ #define MPL3115_STATUS_TEMP_RDY BIT(1) =20 #define MPL3115_INT_SRC_DRDY BIT(7) +#define MPL3115_INT_SRC_PTH BIT(3) +#define MPL3115_INT_SRC_TTH BIT(2) =20 #define MPL3115_PT_DATA_EVENT_ALL GENMASK(2, 0) =20 @@ -56,6 +62,8 @@ #define MPL3115_CTRL3_IPOL2 BIT(1) =20 #define MPL3115_CTRL4_INT_EN_DRDY BIT(7) +#define MPL3115_CTRL4_INT_EN_PTH BIT(3) +#define MPL3115_CTRL4_INT_EN_TTH BIT(2) =20 #define MPL3115_CTRL5_INT_CFG_DRDY BIT(7) =20 @@ -307,6 +315,15 @@ static irqreturn_t mpl3115_trigger_handler(int irq, vo= id *p) return IRQ_HANDLED; } =20 +static const struct iio_event_spec mpl3115_temp_press_event[] =3D { + { + .type =3D IIO_EV_TYPE_THRESH, + .dir =3D IIO_EV_DIR_RISING, + .mask_separate =3D BIT(IIO_EV_INFO_ENABLE) | + BIT(IIO_EV_INFO_VALUE), + }, +}; + static const struct iio_chan_spec mpl3115_channels[] =3D { { .type =3D IIO_PRESSURE, @@ -322,7 +339,9 @@ static const struct iio_chan_spec mpl3115_channels[] = =3D { .storagebits =3D 32, .shift =3D 12, .endianness =3D IIO_BE, - } + }, + .event_spec =3D mpl3115_temp_press_event, + .num_event_specs =3D ARRAY_SIZE(mpl3115_temp_press_event), }, { .type =3D IIO_TEMP, @@ -338,7 +357,9 @@ static const struct iio_chan_spec mpl3115_channels[] = =3D { .storagebits =3D 16, .shift =3D 4, .endianness =3D IIO_BE, - } + }, + .event_spec =3D mpl3115_temp_press_event, + .num_event_specs =3D ARRAY_SIZE(mpl3115_temp_press_event), }, IIO_CHAN_SOFT_TIMESTAMP(2), }; @@ -348,15 +369,45 @@ static irqreturn_t mpl3115_interrupt_handler(int irq,= void *private) struct iio_dev *indio_dev =3D private; struct mpl3115_data *data =3D iio_priv(indio_dev); int ret; + __be32 val_press; + __be16 val_temp; =20 ret =3D i2c_smbus_read_byte_data(data->client, MPL3115_INT_SOURCE); if (ret < 0) return IRQ_HANDLED; =20 - if (!(ret & MPL3115_INT_SRC_DRDY)) + if (!(ret & (MPL3115_INT_SRC_DRDY | MPL3115_INT_SRC_PTH | + MPL3115_INT_SRC_TTH))) return IRQ_NONE; =20 - iio_trigger_poll_nested(data->drdy_trig); + if (ret & MPL3115_INT_SRC_DRDY) + iio_trigger_poll_nested(data->drdy_trig); + + if (ret & MPL3115_INT_SRC_PTH) { + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(IIO_PRESSURE, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + iio_get_time_ns(indio_dev)); + + /* Reset the SRC_PTH bit in INT_SOURCE */ + i2c_smbus_read_i2c_block_data(data->client, + MPL3115_OUT_PRESS, + 3, (u8 *) &val_press); + } + + if (ret & MPL3115_INT_SRC_TTH) { + iio_push_event(indio_dev, + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + iio_get_time_ns(indio_dev)); + + /* Reset the SRC_TTH bit in INT_SOURCE */ + i2c_smbus_read_i2c_block_data(data->client, + MPL3115_OUT_TEMP, + 2, (u8 *) &val_temp); + } =20 return IRQ_HANDLED; } @@ -391,18 +442,22 @@ static int mpl3115_set_trigger_state(struct iio_trigg= er *trig, bool state) { struct iio_dev *indio_dev =3D iio_trigger_get_drvdata(trig); struct mpl3115_data *data =3D iio_priv(indio_dev); - u8 ctrl_reg1 =3D data->ctrl_reg1; - u8 ctrl_reg4 =3D data->ctrl_reg4; + u8 ctrl_reg1, ctrl_reg4; + + guard(mutex)(&data->lock); + + ctrl_reg1 =3D data->ctrl_reg1; + ctrl_reg4 =3D data->ctrl_reg4; =20 if (state) { ctrl_reg1 |=3D MPL3115_CTRL1_ACTIVE; ctrl_reg4 |=3D MPL3115_CTRL4_INT_EN_DRDY; } else { - ctrl_reg1 &=3D ~MPL3115_CTRL1_ACTIVE; ctrl_reg4 &=3D ~MPL3115_CTRL4_INT_EN_DRDY; - } =20 - guard(mutex)(&data->lock); + if (!ctrl_reg4) + ctrl_reg1 &=3D ~MPL3115_CTRL1_ACTIVE; + } =20 return mpl3115_config_interrupt(data, ctrl_reg1, ctrl_reg4); } @@ -411,10 +466,156 @@ static const struct iio_trigger_ops mpl3115_trigger_= ops =3D { .set_trigger_state =3D mpl3115_set_trigger_state, }; =20 +static int mpl3115_read_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct mpl3115_data *data =3D iio_priv(indio_dev); + u8 int_en_mask; + + switch (chan->type) { + case IIO_PRESSURE: + int_en_mask =3D MPL3115_CTRL4_INT_EN_PTH; + break; + case IIO_TEMP: + int_en_mask =3D MPL3115_CTRL4_INT_EN_TTH; + break; + default: + return -EINVAL; + } + + return !!(data->ctrl_reg4 & int_en_mask); +} + +static int mpl3115_write_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + bool state) +{ + struct mpl3115_data *data =3D iio_priv(indio_dev); + u8 int_en_mask; + u8 ctrl_reg1, ctrl_reg4; + + switch (chan->type) { + case IIO_PRESSURE: + int_en_mask =3D MPL3115_CTRL4_INT_EN_PTH; + break; + case IIO_TEMP: + int_en_mask =3D MPL3115_CTRL4_INT_EN_TTH; + break; + default: + return -EINVAL; + } + + guard(mutex)(&data->lock); + + ctrl_reg1 =3D data->ctrl_reg1; + ctrl_reg4 =3D data->ctrl_reg4; + + if (state) { + ctrl_reg1 |=3D MPL3115_CTRL1_ACTIVE; + ctrl_reg4 |=3D int_en_mask; + } else { + ctrl_reg4 &=3D ~int_en_mask; + + if (!ctrl_reg4) + ctrl_reg1 &=3D ~MPL3115_CTRL1_ACTIVE; + } + + return mpl3115_config_interrupt(data, ctrl_reg1, ctrl_reg4); +} + +static int mpl3115_read_thresh(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, + int *val, int *val2) +{ + struct mpl3115_data *data =3D iio_priv(indio_dev); + int ret, press_pa; + __be16 tmp; + + if (info !=3D IIO_EV_INFO_VALUE) + return -EINVAL; + + switch (chan->type) { + case IIO_PRESSURE: + ret =3D i2c_smbus_read_i2c_block_data(data->client, + MPL3115_PRESS_TGT, 2, + (u8 *) &tmp); + if (ret < 0) + return ret; + + /** + * Target value for the pressure is + * 16-bit unsigned value in 2 Pa units + */ + press_pa =3D be16_to_cpu(tmp) << 1; + *val =3D press_pa / KILO; + *val2 =3D (press_pa % KILO) * MILLI; + + return IIO_VAL_INT_PLUS_MICRO; + case IIO_TEMP: + ret =3D i2c_smbus_read_byte_data(data->client, MPL3115_TEMP_TGT); + if (ret < 0) + return ret; + + /* Target value for the temperature is 8-bit 2's complement */ + *val =3D sign_extend32(ret, 7); + + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static int mpl3115_write_thresh(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, + int val, int val2) +{ + struct mpl3115_data *data =3D iio_priv(indio_dev); + u8 tmp[2]; + + if (info !=3D IIO_EV_INFO_VALUE) + return -EINVAL; + + switch (chan->type) { + case IIO_PRESSURE: + val =3D (val * KILO + val2 / MILLI) >> 1; + + if (val < 0 || val > 0xffff) + return -EINVAL; + + tmp[0] =3D FIELD_GET(GENMASK(15, 8), val); + tmp[1] =3D FIELD_GET(GENMASK(7, 0), val); + + return i2c_smbus_write_i2c_block_data(data->client, + MPL3115_PRESS_TGT, 2, tmp); + case IIO_TEMP: + if (val < -128 || val > 127) + return -EINVAL; + + return i2c_smbus_write_byte_data(data->client, + MPL3115_TEMP_TGT, val); + default: + return -EINVAL; + } +} + static const struct iio_info mpl3115_info =3D { .read_raw =3D &mpl3115_read_raw, .read_avail =3D &mpl3115_read_avail, .write_raw =3D &mpl3115_write_raw, + .read_event_config =3D mpl3115_read_event_config, + .write_event_config =3D mpl3115_write_event_config, + .read_event_value =3D mpl3115_read_thresh, + .write_event_value =3D mpl3115_write_thresh, }; =20 static int mpl3115_trigger_probe(struct mpl3115_data *data, --=20 2.25.1