From nobody Wed Oct 1 23:30:07 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 7FAD72F83A0 for ; Thu, 25 Sep 2025 20:46:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833162; cv=none; b=dr5iSVevY7dvghxMeLBF63Nf6fIs1iOmRqBuIx79fWHqNYpuPK2L8bjwRrjx6T21JA4glJe2L7dK/ISugLugKU+iSaT4uHwEvbHRMm/ketMN99fbzr6YWo7piMU5Za3qUXtFOXP7fuC1UIvFZq9nixzy+Pzi6K8RJfJWZBdTHUI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833162; c=relaxed/simple; bh=RWsMT7+A3hOigM/6lKe9y0xp7C7c2WQ715Dnkvpx1sA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ppXir0aiZBgP29JBLQdRkBcmxvbodH960VmKJLy+E9hr8L5uJNQ80pbse15+bzGp0HejptDRxFtIY+EbPKPG5OuG3gK8GUkZTUnXG5091Ix58GnhfxxVZcqv7zGO2SM9wxcCuFf0g+JcreLaK7LywG6vZodx2jYrhKth0hZvAjU= 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=HLgDqBIv; arc=none smtp.client-ip=209.85.128.41 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="HLgDqBIv" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-46cb53c5900so15483235e9.3 for ; Thu, 25 Sep 2025 13:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758833159; x=1759437959; 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=8EXqlzb/n7e+U7sXee7rlDRiXcbYy1hChaEgy4phOls=; b=HLgDqBIvrYXMXP04jn9b4Uhuo9rCVRop2vIs2SX9xljt38rQU/YpL0Fx8+W46oBQZR r6Q0vYb+8Y/QyCJonJJl5EvTbu5zWqgZTkBqWsLHnDjdTxuHqD4Igx0CGRazIHrk1+p5 gh6gvTeLsn5xTuxqkbptwMAeSnp2RPZ/scnpeKeTwIQZQNmXmMLLxRrerwamSR7rL0vf qQVpWHs9EUfBxERM2Iw8NScgX5IMdLAPRy3wZfpdj+nN4bvmqTSoaf3ELI7Xqa+JDU6f 3pzsrpV+B/Uf4cGapwMcJv3RHc+DiiGOFm86eqyaaTTaH2BImbb3Mc0Yk2Kjxiddgd3O RLoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758833159; x=1759437959; 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=8EXqlzb/n7e+U7sXee7rlDRiXcbYy1hChaEgy4phOls=; b=j38SEHdosLK5KPK/EEqaBqQI0o/V1xF0RGJTUe+86FvRxBNEMcHhe0jxq3xP0pRE0Z +2/yLXvYI13kvPnM5xx+pgMftcgRIBcq1u1Rsm/34eJ/5ZLarQCfp2clC676qVQqj8mF nKrJwHtWR2zrK2BgSfqHtj+8eD2fxqOGsD/c6yohPG22dm3GEwFQ4hNVh2QtQg9QkDhR P8ng+2MA4jBoQfQti9OGohKn/nQ3eC+OKpBjnfpIrFLGBXOwbGAPaMrQFEW+fOFfb3kM 97RABl/QNGI+UF7NQf1EzYxYu1AE8ssYL7LwhSwFbi3YTc6FN39rzE/AhoyOO/TaL0m2 y5Fw== X-Gm-Message-State: AOJu0YyD9dWhKo1rY2g3k5EToJQrcOVtyzKvbrGHoKHxhNqg8VK52xNG wsjsJtXOkRCa9emdC1RBlmLfm1D0N8idq1eOKSgMtokgerC3KpR87KTp X-Gm-Gg: ASbGnctcPdrGxust9g2YID+7vNFvjtGoM/ScbcW55kxucImQw9+8Rl1dw1Ryk48g8ud Y7Nr1mG7qRaGC5dukeS9NhZZeRZprP9IHnODc7E7jSTni3t7hN0mqAq4IL7Kq97XxxVxf30BIYj 7q0yn+R+xrdIoO3xY3Iq4fzDFrE42t5MZTDM99fdKUTMF2XDvIYJ/BVDVdVPiw1BJF2rTz6nhEU 58KTuw20spe158zvWpXUmy7buJ7EBp257lvq8+YIO4ZXmW+fblW/sL5gNImzSeYtmCRgzhG17x/ E6qrFQTW+ieUJMiQlzoolOL28oc9HbyG2Em9f+LMbdHEAh+aQv9prO9Ep/Y/QIGTnOrgp6l3+0J 7FE2GzswbSbQpcW5saV5Rck/KPaBrvLDKoH6YlYw= X-Google-Smtp-Source: AGHT+IGQ00c8yLhRFsKEKF8310MPtSUTnfr1KkARNOF+iixnrySN5lLqz/3E1NySce4/V/DN+APhFg== X-Received: by 2002:a05:600c:6306:b0:46e:1d01:11dd with SMTP id 5b1f17b1804b1-46e329a8503mr40457695e9.2.1758833158549; Thu, 25 Sep 2025 13:45:58 -0700 (PDT) Received: from localhost.localdomain ([78.209.201.53]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2a996bf1sm91201395e9.1.2025.09.25.13.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 13:45:58 -0700 (PDT) From: Antoni Pokusinski To: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux@roeck-us.net, rodrigo.gobbi.7@gmail.com, naresh.solanki@9elements.com, michal.simek@amd.com, grantpeltier93@gmail.com, farouk.bouabid@cherry.de, marcelo.schmitt1@gmail.com, Antoni Pokusinski Subject: [PATCH v2 1/4] dt-bindings: iio: pressure: add binding for mpl3115 Date: Thu, 25 Sep 2025 22:45:35 +0200 Message-Id: <20250925204538.63723-2-apokusinski01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250925204538.63723-1-apokusinski01@gmail.com> References: <20250925204538.63723-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" MPL3115 is an I2C pressure and temperature sensor. It features 2 interrupt lines which can be configured to indicate events such as data ready or pressure/temperature threshold reached. Reviewed-by: Rob Herring (Arm) Signed-off-by: Antoni Pokusinski --- .../bindings/iio/pressure/fsl,mpl3115.yaml | 71 +++++++++++++++++++ .../devicetree/bindings/trivial-devices.yaml | 2 - 2 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/pressure/fsl,mpl3= 115.yaml diff --git a/Documentation/devicetree/bindings/iio/pressure/fsl,mpl3115.yam= l b/Documentation/devicetree/bindings/iio/pressure/fsl,mpl3115.yaml new file mode 100644 index 000000000000..2933c2e10695 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/pressure/fsl,mpl3115.yaml @@ -0,0 +1,71 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/pressure/fsl,mpl3115.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MPL3115 precision pressure sensor with altimetry + +maintainers: + - Antoni Pokusinski + +description: | + MPL3115 is a pressure/altitude and temperature sensor with I2C interface. + It features two programmable interrupt lines which indicate events such = as + data ready or pressure/temperature threshold reached. + https://www.nxp.com/docs/en/data-sheet/MPL3115A2.pdf + +properties: + compatible: + const: fsl,mpl3115 + + reg: + maxItems: 1 + + vdd-supply: true + + vddio-supply: true + + interrupts: + minItems: 1 + maxItems: 2 + + interrupt-names: + minItems: 1 + maxItems: 2 + items: + enum: + - INT1 + - INT2 + + drive-open-drain: + type: boolean + description: + set if the specified interrupt pins should be configured as + open drain. If not set, defaults to push-pull. + +required: + - compatible + - reg + - vdd-supply + - vddio-supply + +additionalProperties: false + +examples: + - | + #include + i2c { + #address-cells =3D <1>; + #size-cells =3D <0>; + + pressure@60 { + compatible =3D "fsl,mpl3115"; + reg =3D <0x60>; + vdd-supply =3D <&vdd>; + vddio-supply =3D <&vddio>; + interrupt-parent =3D <&gpio1>; + interrupts =3D <4 IRQ_TYPE_EDGE_FALLING>; + interrupt-names =3D "INT2"; + }; + }; diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Docum= entation/devicetree/bindings/trivial-devices.yaml index f3dd18681aa6..918d4a12d61c 100644 --- a/Documentation/devicetree/bindings/trivial-devices.yaml +++ b/Documentation/devicetree/bindings/trivial-devices.yaml @@ -113,8 +113,6 @@ properties: - fsl,mma7660 # MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer - fsl,mma8450 - # MPL3115: Absolute Digital Pressure Sensor - - fsl,mpl3115 # MPR121: Proximity Capacitive Touch Sensor Controller - fsl,mpr121 # Honeywell Humidicon HIH-6130 humidity/temperature sensor --=20 2.25.1 From nobody Wed Oct 1 23:30:07 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 D755F32142D for ; Thu, 25 Sep 2025 20:46:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833166; cv=none; b=leq5hVaMn5zMPcsA2R4xvTLkEzdtavQmLk75o/ZycfvbrikGAUuIaESs98vj3ylUQGFMgSP4qOv0cHLF5thWMcTyBLFKXll36dtAlvv0a16nOaaG22m78oXcetyra1w6fLq6z7NkBVukUFxzgtU9GleDKWlcOOrcFHjuWSlpAHo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833166; c=relaxed/simple; bh=QZYLwLOu9FwUcgSKVi5UCynvL+ZAZTQpQ8/aAvYckS4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kh/RUEVgg5RWFtNasCpRwjgVoENB8Fohn9MbhMYm1ScWDWH0gpD4qMfvgRJhZaMsdI3GCZUfsfHkafBOQFCG25XtUhmqJ/b9TNG/sf5LmnnDvbechU0k0ns18vzDRnM18+JiHjwvHAvVOX1KH/MPKsN3MydwODpUquENB8Px/AQ= 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=XscQm0C9; arc=none smtp.client-ip=209.85.128.49 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="XscQm0C9" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-46e317bc647so10255015e9.2 for ; Thu, 25 Sep 2025 13:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758833163; x=1759437963; 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=hzGFgAL4kFJpF+2U2ML/HycqoaNqqsEROO0epHyQA0k=; b=XscQm0C9pMGlvK8V/vNa+cpWOjgXjN+4W2+l6WKSSaNvDWzZRRN/+k0JutDmXxpgI2 ksz1RfSaTRR4sTNqIaTwZsN6bnOZH7BFXw8PXgTgIDZ5mWvnpdICePTSWxW1zcKblB4h pYXDuUW2dtMpMU8sDOxlK84oHvyDEp/C0ZWleZXj1PKL3Q9NP5ipKP/29fbkRcnXzsIg wi5Pii+sepieEGRwMJY90yzIdrDz+jI+lmjbIByaoNH4heQzld8H4UUpkZYQr9fNFDqp 1loafMCrKn/wpjewRmWpDMYBA5c127Pcs//sXQcfQvuJ2m6aso3VCoo7ZdcwThje63S2 aPfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758833163; x=1759437963; 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=hzGFgAL4kFJpF+2U2ML/HycqoaNqqsEROO0epHyQA0k=; b=PVcNhA4jP4/yNurYE5uTq3vYL0RcLl07NnB2/XX+jgNri93pf1PzQ6gx/2LpkpelgG JAT1oGNv+Sb+aWFAiigvtucgk3Qn3Ll7nlkbiDC/9k3FHDcCq3qY6NB9r9NKJUvjHslg fad/3DjufDwkZBGCWusBvv7jB/wQQcZw8S32ix9PUlO0b8EaWZ1IkZ5lYWdwhfl020Bt gCuoBsW2R0HWF//M+eS3vxzUYSnhb01/yOwcf5rKKg8RaMlEXOCre3cMTiyMPkOF8aVS bRGTyhiPTiQ0MudKweflbgay9vJqzLH/cPe5WgGEk7ePyDce9tnWG/9/mwMAhToNN3sD IsSQ== X-Gm-Message-State: AOJu0YzOXYYU6vk9uE+hrLqFl5NCR3XWvBVHHDxgQA3PTuoxqh2k43+v ZDi8Au5wUj6PVbHPtrAUQaRDPhJHCccA7OpBuFJctg8qf/C4k+JuD3AQ X-Gm-Gg: ASbGnctw67exAFg+KSahXjxTaO3QtC7ib/q2Iscm8KI+POTWtRR1A/5iXH0NWK5B7sW NgJoFce+dQEzFNp3kWPTcumCNIxOcYIvFEHl6dJdRXQr499sRHuBMvSDXsilcHVC+YO/DZ6z05D OINAJxkIdW6DCVqiIVEBKB5qpSTl+xDcAXJGxguA9+4NYNeaQDQZG/hV3bl4J/3lV59FjJ8qtAD l7PZOpuXbXj+iV6l4YDNI3vHMsFLE/mjC3tu6Bgmje9inRyrknaPu0TTrbcYouiW7ggqz7AL0Cf mJx/Sgn7pzKus/8mwwoG8V/6kFhUF1VEfYeuwEbwS0+znUBQ0sdv7Vj/jm5tLJl4kL2zjUwE98W 8u3EXVVX5RhCel9FUB0DrVoGGgEJSLC1GQtlNFA2Sr4PqXSkAWw== X-Google-Smtp-Source: AGHT+IHHohFMXgIwk1CDdD+uJhrqIHjozKM/oy1Tn2dqyy7fv4EN0p48AORO2mEQxcWa0xSlEG+lFw== X-Received: by 2002:a05:600c:5494:b0:46e:33a6:46b2 with SMTP id 5b1f17b1804b1-46e33a649a8mr42974005e9.12.1758833163236; Thu, 25 Sep 2025 13:46:03 -0700 (PDT) Received: from localhost.localdomain ([78.209.201.53]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2a996bf1sm91201395e9.1.2025.09.25.13.46.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 13:46:02 -0700 (PDT) From: Antoni Pokusinski To: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux@roeck-us.net, rodrigo.gobbi.7@gmail.com, naresh.solanki@9elements.com, michal.simek@amd.com, grantpeltier93@gmail.com, farouk.bouabid@cherry.de, marcelo.schmitt1@gmail.com, Antoni Pokusinski Subject: [PATCH v2 2/4] iio: mpl3115: use guards from cleanup.h Date: Thu, 25 Sep 2025 22:45:36 +0200 Message-Id: <20250925204538.63723-3-apokusinski01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250925204538.63723-1-apokusinski01@gmail.com> References: <20250925204538.63723-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" Include linux/cleanup.h and use the scoped_guard() to simplify the code. Signed-off-by: Antoni Pokusinski --- drivers/iio/pressure/mpl3115.c | 42 +++++++++++++++------------------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index 579da60ef441..80af672f65c6 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -10,14 +10,16 @@ * interrupts, user offset correction, raw mode */ =20 -#include +#include +#include #include +#include + #include #include #include #include #include -#include =20 #define MPL3115_STATUS 0x00 #define MPL3115_OUT_PRESS 0x01 /* MSB first, 20 bit */ @@ -163,32 +165,26 @@ static irqreturn_t mpl3115_trigger_handler(int irq, v= oid *p) u8 buffer[16] __aligned(8) =3D { }; int ret, pos =3D 0; =20 - mutex_lock(&data->lock); - ret =3D mpl3115_request(data); - if (ret < 0) { - mutex_unlock(&data->lock); - goto done; - } - - if (test_bit(0, indio_dev->active_scan_mask)) { - ret =3D i2c_smbus_read_i2c_block_data(data->client, - MPL3115_OUT_PRESS, 3, &buffer[pos]); - if (ret < 0) { - mutex_unlock(&data->lock); + scoped_guard(mutex, &data->lock) { + ret =3D mpl3115_request(data); + if (ret < 0) goto done; + + if (test_bit(0, indio_dev->active_scan_mask)) { + ret =3D i2c_smbus_read_i2c_block_data(data->client, + MPL3115_OUT_PRESS, 3, &buffer[pos]); + if (ret < 0) + goto done; + pos +=3D 4; } - pos +=3D 4; - } =20 - if (test_bit(1, indio_dev->active_scan_mask)) { - ret =3D i2c_smbus_read_i2c_block_data(data->client, - MPL3115_OUT_TEMP, 2, &buffer[pos]); - if (ret < 0) { - mutex_unlock(&data->lock); - goto done; + if (test_bit(1, indio_dev->active_scan_mask)) { + ret =3D i2c_smbus_read_i2c_block_data(data->client, + MPL3115_OUT_TEMP, 2, &buffer[pos]); + if (ret < 0) + goto done; } } - mutex_unlock(&data->lock); =20 iio_push_to_buffers_with_ts(indio_dev, buffer, sizeof(buffer), iio_get_time_ns(indio_dev)); --=20 2.25.1 From nobody Wed Oct 1 23:30:07 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.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 AAF46321F3E for ; Thu, 25 Sep 2025 20:46:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833171; cv=none; b=Cg9KdztEpkXg/0y+vf6H6QK4Qpj29348U7MPMC0a0NP6mfJvKBWH0Q4/Kj5sK1vODjI+MhH+OlNiGhK0/pVowBYxvaB5DESwCSavfeMawDyeMa2Te3yONRM9iX7nY3DlLKDdLy2IoGl1nMEKQ+gNsPVjDRj0LhKxhBudNmVEtEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833171; c=relaxed/simple; bh=LnWL/eUtq4rVJMr0VvgPgsd6M0BfJcGXTYJCVy3ATEY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jqVyJQV17XS4ttLkBwPeSo6EAD27s3vUUlKPl7MNJa4rMZq1N2We2rjrKRBXLCkeSKfeu+Up3VYL3SreaWC2aRo3qsW0bwoTwDc8h7rPWil8vAJjwNezitipnGocZh8a0UrVbJ58LJ0fVD5GSlmmy1phXdd17S80dg0QdUieCHM= 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=miyjEgk5; arc=none smtp.client-ip=209.85.221.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="miyjEgk5" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3ee1317b1f7so846027f8f.2 for ; Thu, 25 Sep 2025 13:46:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758833168; x=1759437968; 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=ZYzdGix8BnDpLsQQ8Se/5oFsA9jb9ULckmXaMvv98ZU=; b=miyjEgk5qc3q13fRPxLL3u7sSt8qvsp4Z8Wls3H+2J8BF3pw3cFOEPRYz3RW10pLq1 IOO6WCwEQ3nOXJfZqa9a4yFleZ5Sj5RBxyrdu4132uQYu1BhSp+vM9zOOcpFQewcVXDk APIOUMmvgJD3h8HyJ2kL1SwIZ9wga0Z2RpRBga5qtedZgolKzgn+Nc/xsyCm8BErGk6T 6PCG4bymSX7rO7RpnGzjuaFxIcHrqdvisiUT6bWZYzl+KTC09RKEgKdfET6iw8fY36ZA 744vSl0J8DlW8dmE/QACalox8OLw4Njy3t2zaz6TFw2VQgKakqYX+G7nNPZM3nK4U6t6 RFDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758833168; x=1759437968; 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=ZYzdGix8BnDpLsQQ8Se/5oFsA9jb9ULckmXaMvv98ZU=; b=QjeeMsicYMIqdKVD+er08kFaN/3TDsuYYR8hp8oimYhroHP7y1uyvrtNENjYP/dnS8 0TNUxuT3YzFKmtBsmZOihGUXYZs4FLm8/lCd77q+WGVxp0K1onYJAYCJx2ve3ec5lKjh /31gIApbuIxuDzqAvIgZzKH+YsQU7lCxrEFFti2HbPJPV5tvIv8+oKH7vSR1b6hXalSk /+BMfVnMDTGnOKedw6+58Puh1+4A6MpH6XfCT0kJd5nUgheCusNtTsWnP9xD/Wz7re2I eCdfEht9HcvwiEh7XBQbNdSLxKNTEt4ehW8edbTsHkEwTEwLHsLb3GVez7xg+NZ7fJQx SEpA== X-Gm-Message-State: AOJu0YzXEk+xdF1CRL5OnySkJnivW/XKsoQ3nj5AcoFfz9PdIlwsjgSP pAhOCmQ1gPjxHzKZejTU1jxYTuuPHxpboZRzrd1vOYOsH7hEEcDmoVPe X-Gm-Gg: ASbGnctGlRfa4HOZkNwxD2xi8kQ7T7Ch05MbPcIZSXJkGVC3RXC/T7Y9kaUxcbx/x+E pRlGmtvopGaO3NXd0ozdi1+m1OJXhBLO58Atlg6XdYryX8+F5oVwumj5eY9rz1uwY/FCcbhRV7F ytDjgRZOMncGoTxfpAi1tXJhlmPuarc364gYvji+l1bni6AdzFtJrYwJnz4Amc8mR8oTHQwLytZ /Jhyds/hD+zlQDJrDdzPWK255sAtug+cqATxM0ve8CEjTErsGuQb5vQWoiwhIORApwBKGBXxE+U M/Bx5sQ6aYkPPJH3JWLcKVMHKX1PYKZUCEub6DylROlf+eF+BBGCfDIzdkPm3dbMrvuNSfko2zC cPdjp9KSuML/iANZ9wF2ikFyVN3W4yVYgXz0eXhE= X-Google-Smtp-Source: AGHT+IERzY3GDwl0z9WpDJV+rnWF1AhP367sDlX6Dqwa/uXl0e9cwsI1wV5HbBFQ9X09JFqhMxXv1w== X-Received: by 2002:a5d:5f52:0:b0:3c8:d236:26bd with SMTP id ffacd0b85a97d-40e46237c2bmr4659410f8f.11.1758833167721; Thu, 25 Sep 2025 13:46:07 -0700 (PDT) Received: from localhost.localdomain ([78.209.201.53]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2a996bf1sm91201395e9.1.2025.09.25.13.46.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 13:46:07 -0700 (PDT) From: Antoni Pokusinski To: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux@roeck-us.net, rodrigo.gobbi.7@gmail.com, naresh.solanki@9elements.com, michal.simek@amd.com, grantpeltier93@gmail.com, farouk.bouabid@cherry.de, marcelo.schmitt1@gmail.com, Antoni Pokusinski Subject: [PATCH v2 3/4] iio: mpl3115: add support for DRDY interrupt Date: Thu, 25 Sep 2025 22:45:37 +0200 Message-Id: <20250925204538.63723-4-apokusinski01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250925204538.63723-1-apokusinski01@gmail.com> References: <20250925204538.63723-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" MPL3115 sensor features a "data ready" interrupt which indicates the presence of new measurements. Signed-off-by: Antoni Pokusinski --- drivers/iio/pressure/mpl3115.c | 197 ++++++++++++++++++++++++++++++--- 1 file changed, 184 insertions(+), 13 deletions(-) diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index 80af672f65c6..13c8b338a15e 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -7,49 +7,77 @@ * (7-bit I2C slave address 0x60) * * TODO: FIFO buffer, altimeter mode, oversampling, continuous mode, - * interrupts, user offset correction, raw mode + * user offset correction, raw mode */ =20 #include #include #include #include +#include =20 #include #include #include #include #include +#include =20 #define MPL3115_STATUS 0x00 #define MPL3115_OUT_PRESS 0x01 /* MSB first, 20 bit */ #define MPL3115_OUT_TEMP 0x04 /* MSB first, 12 bit */ #define MPL3115_WHO_AM_I 0x0c +#define MPL3115_INT_SOURCE 0x12 +#define MPL3115_PT_DATA_CFG 0x13 #define MPL3115_CTRL_REG1 0x26 +#define MPL3115_CTRL_REG3 0x28 +#define MPL3115_CTRL_REG4 0x29 +#define MPL3115_CTRL_REG5 0x2a =20 #define MPL3115_DEVICE_ID 0xc4 =20 #define MPL3115_STATUS_PRESS_RDY BIT(2) #define MPL3115_STATUS_TEMP_RDY BIT(1) =20 -#define MPL3115_CTRL_RESET BIT(2) /* software reset */ -#define MPL3115_CTRL_OST BIT(1) /* initiate measurement */ -#define MPL3115_CTRL_ACTIVE BIT(0) /* continuous measurement */ -#define MPL3115_CTRL_OS_258MS (BIT(5) | BIT(4)) /* 64x oversampling */ +#define MPL3115_INT_SRC_DRDY BIT(7) + +#define MPL3115_PT_DATA_EVENT_ALL GENMASK(2, 0) + +#define MPL3115_CTRL1_RESET BIT(2) /* software reset */ +#define MPL3115_CTRL1_OST BIT(1) /* initiate measurement */ +#define MPL3115_CTRL1_ACTIVE BIT(0) /* continuous measurement */ +#define MPL3115_CTRL1_OS_258MS GENMASK(5, 4) /* 64x oversampling */ + +#define MPL3115_CTRL3_IPOL1 BIT(5) +#define MPL3115_CTRL3_IPOL2 BIT(1) + +#define MPL3115_CTRL4_INT_EN_DRDY BIT(7) + +#define MPL3115_CTRL5_INT_CFG_DRDY BIT(7) + +#define MPL3115_INT2 BIT(2) /* flag that indicates INT2 in use */ =20 struct mpl3115_data { struct i2c_client *client; + struct iio_trigger *drdy_trig; struct mutex lock; u8 ctrl_reg1; }; =20 +enum mpl3115_irq_type { + INT2_ACTIVE_LOW =3D MPL3115_INT2 | IRQF_TRIGGER_FALLING, + INT2_ACTIVE_HIGH =3D MPL3115_INT2 | IRQF_TRIGGER_RISING, + INT1_ACTIVE_LOW =3D (!MPL3115_INT2) | IRQF_TRIGGER_FALLING, + INT1_ACTIVE_HIGH =3D (!MPL3115_INT2) | IRQF_TRIGGER_RISING, +}; + static int mpl3115_request(struct mpl3115_data *data) { int ret, tries =3D 15; =20 /* trigger measurement */ ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG1, - data->ctrl_reg1 | MPL3115_CTRL_OST); + data->ctrl_reg1 | MPL3115_CTRL1_OST); if (ret < 0) return ret; =20 @@ -58,7 +86,7 @@ static int mpl3115_request(struct mpl3115_data *data) if (ret < 0) return ret; /* wait for data ready, i.e. OST cleared */ - if (!(ret & MPL3115_CTRL_OST)) + if (!(ret & MPL3115_CTRL1_OST)) break; msleep(20); } @@ -166,9 +194,11 @@ static irqreturn_t mpl3115_trigger_handler(int irq, vo= id *p) int ret, pos =3D 0; =20 scoped_guard(mutex, &data->lock) { - ret =3D mpl3115_request(data); - if (ret < 0) - goto done; + if (!(data->ctrl_reg1 & MPL3115_CTRL1_ACTIVE)) { + ret =3D mpl3115_request(data); + if (ret < 0) + goto done; + } =20 if (test_bit(0, indio_dev->active_scan_mask)) { ret =3D i2c_smbus_read_i2c_block_data(data->client, @@ -224,10 +254,147 @@ static const struct iio_chan_spec mpl3115_channels[]= =3D { IIO_CHAN_SOFT_TIMESTAMP(2), }; =20 +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; + + ret =3D i2c_smbus_read_byte_data(data->client, MPL3115_INT_SOURCE); + if (ret < 0) + return IRQ_HANDLED; + + if (!(ret & MPL3115_INT_SRC_DRDY)) + return IRQ_NONE; + + iio_trigger_poll_nested(data->drdy_trig); + + return IRQ_HANDLED; +} + +static int mpl3115_set_trigger_state(struct iio_trigger *trig, bool state) +{ + struct iio_dev *indio_dev =3D iio_trigger_get_drvdata(trig); + struct mpl3115_data *data =3D iio_priv(indio_dev); + int ret; + u8 ctrl_reg1 =3D data->ctrl_reg1; + + if (state) + ctrl_reg1 |=3D MPL3115_CTRL1_ACTIVE; + else + ctrl_reg1 &=3D ~MPL3115_CTRL1_ACTIVE; + + guard(mutex)(&data->lock); + + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG1, + ctrl_reg1); + if (ret < 0) + return ret; + + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG4, + state ? MPL3115_CTRL4_INT_EN_DRDY : 0); + if (ret < 0) + goto reg1_cleanup; + + data->ctrl_reg1 =3D ctrl_reg1; + + return 0; + +reg1_cleanup: + i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG1, + data->ctrl_reg1); + return ret; +} + +static const struct iio_trigger_ops mpl3115_trigger_ops =3D { + .set_trigger_state =3D mpl3115_set_trigger_state, +}; + static const struct iio_info mpl3115_info =3D { .read_raw =3D &mpl3115_read_raw, }; =20 +static int mpl3115_trigger_probe(struct mpl3115_data *data, + struct iio_dev *indio_dev) +{ + struct fwnode_handle *fwnode =3D dev_fwnode(&data->client->dev); + int ret, irq, irq_type, irq_cfg_flags =3D 0; + + irq =3D fwnode_irq_get_byname(fwnode, "INT1"); + if (irq < 0) { + irq =3D fwnode_irq_get_byname(fwnode, "INT2"); + if (irq < 0) + return 0; + + irq_cfg_flags |=3D MPL3115_INT2; + } + + irq_type =3D irq_get_trigger_type(irq); + if (irq_type !=3D IRQF_TRIGGER_RISING && irq_type !=3D IRQF_TRIGGER_FALLI= NG) + return -EINVAL; + + irq_cfg_flags |=3D irq_type; + + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_PT_DATA_CFG, + MPL3115_PT_DATA_EVENT_ALL); + if (ret < 0) + return ret; + + switch (irq_cfg_flags) { + case INT2_ACTIVE_HIGH: + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG3, + MPL3115_CTRL3_IPOL2); + if (ret) + return ret; + + break; + case INT2_ACTIVE_LOW: + break; + case INT1_ACTIVE_HIGH: + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG5, + MPL3115_CTRL5_INT_CFG_DRDY); + if (ret) + return ret; + + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG3, + MPL3115_CTRL3_IPOL1); + if (ret) + return ret; + + break; + case INT1_ACTIVE_LOW: + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG5, + MPL3115_CTRL5_INT_CFG_DRDY); + if (ret) + return ret; + break; + default: + return -EINVAL; + } + + data->drdy_trig =3D devm_iio_trigger_alloc(&data->client->dev, + "%s-dev%d", + indio_dev->name, + iio_device_id(indio_dev)); + if (!data->drdy_trig) + return -ENOMEM; + + data->drdy_trig->ops =3D &mpl3115_trigger_ops; + iio_trigger_set_drvdata(data->drdy_trig, indio_dev); + ret =3D devm_iio_trigger_register(&data->client->dev, data->drdy_trig); + if (ret) + return ret; + + indio_dev->trig =3D iio_trigger_get(data->drdy_trig); + + return devm_request_threaded_irq(&data->client->dev, irq, + NULL, + mpl3115_interrupt_handler, + IRQF_ONESHOT, + "mpl3115_irq", + indio_dev); +} + static int mpl3115_probe(struct i2c_client *client) { const struct i2c_device_id *id =3D i2c_client_get_device_id(client); @@ -258,15 +425,19 @@ static int mpl3115_probe(struct i2c_client *client) =20 /* software reset, I2C transfer is aborted (fails) */ i2c_smbus_write_byte_data(client, MPL3115_CTRL_REG1, - MPL3115_CTRL_RESET); + MPL3115_CTRL1_RESET); msleep(50); =20 - data->ctrl_reg1 =3D MPL3115_CTRL_OS_258MS; + data->ctrl_reg1 =3D MPL3115_CTRL1_OS_258MS; ret =3D i2c_smbus_write_byte_data(client, MPL3115_CTRL_REG1, data->ctrl_reg1); if (ret < 0) return ret; =20 + ret =3D mpl3115_trigger_probe(data, indio_dev); + if (ret) + return ret; + ret =3D iio_triggered_buffer_setup(indio_dev, NULL, mpl3115_trigger_handler, NULL); if (ret < 0) @@ -285,7 +456,7 @@ static int mpl3115_probe(struct i2c_client *client) static int mpl3115_standby(struct mpl3115_data *data) { return i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG1, - data->ctrl_reg1 & ~MPL3115_CTRL_ACTIVE); + data->ctrl_reg1 & ~MPL3115_CTRL1_ACTIVE); } =20 static void mpl3115_remove(struct i2c_client *client) --=20 2.25.1 From nobody Wed Oct 1 23:30:07 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.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 8C4C1321F4D for ; Thu, 25 Sep 2025 20:46:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833175; cv=none; b=oYCjUPx7nyWwMG/EmzCF/AJUUfZx95PUkf5z1CyzB0/4Cc080Y7aKg3cdUlzni5fDVirSnhQMf+AAIgEIBvXnq+tgIXZK4MXlZ4/0Si79ySCN/hkodA1qJlxRCpFMht6cAWcKwVmEoQvbmf6r296gSZo/2BB9R8HsKTGPFhVE0c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758833175; c=relaxed/simple; bh=u/GRHoI6+QMWuN6Vgjvw8SAJW8N3epdnzemgpwb+gz0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version:Content-Type; b=QyaW5N8/bWzqTNDi/QzB5aqSPJI/SO+7dlO0JnrWAFuyMjmD7ntC7TZDYrsI9IZOjsFWdLqbuKC5PMsR3/MMZLpOA8tecMG1A1WjvBUEWKXJVh1bXS3tFj4RByMUU/57YtMiSzvd4G5Dd2Rm86TzNz4rmPr4i6JeKc6EijfjCmo= 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=jrRY3ZQY; arc=none smtp.client-ip=209.85.221.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="jrRY3ZQY" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3f0ae439b56so925784f8f.3 for ; Thu, 25 Sep 2025 13:46:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1758833172; x=1759437972; 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=3zPbj99Jd6vk35LiQNF3EC6C/GileQTOnsmS8pZJrbM=; b=jrRY3ZQY3qs8MLajl0Iqw4igMD+QvppIhL69WcrMFDm7FYFhHy1h7slJdoAnraov06 JhGWey76NxBG09129F3u7MQxieq56gdUj+UL39CapLY3SlkMv/TVYUMVndHcxTT4ljyh ySyjUKxk2kyWSrTPlq9CUDzmF89pknZ56UiUGhwHYYyMXwhIMFkCIGhyig4OSAJGLaOf N0652Akznx5NO1nKcofTkp8UuDxNGDeVmFjRvpL32zTlAZA+vRhlxw6UL+3yOnmf4REh iDHp6K2pxLJJuBRpx2OKGdPeOESrY8jbKb1CzcbobRE2h89TZ1VjcP+Brpl9NjtIwrP+ /baA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758833172; x=1759437972; 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=3zPbj99Jd6vk35LiQNF3EC6C/GileQTOnsmS8pZJrbM=; b=kl3EvxdblPEwaXKBE0Q154ti1TgTnh569PPngTxP3MWKA8V5Z4Sr5eh+HNsoqieu4a AopXPQca3a4DgebFvDxgfXL9m67filc0ev5mfe1w67YLcKnFy4EAQq1AZK0i2VMpkCZI WCOVTnxfm0nD9WRUs9FxwL3YpVDtKX0BCkmms0MkoktfzgitDaUR3ofiSeh5zJMXi2w/ SNHbE8iUaAmMipueJr5uIVpYNmCS7aJLeS358Wkz7G6rUBSSiLJHgh7eT27OnQSwrO7r or4/RF0y7CxNJGLNlYtxTvL3ProlsGC4jqXPT+ea1jhRxpxc4iOqA9H+PmGxdGLoZhPZ rrng== X-Gm-Message-State: AOJu0YzR4yGaUMvjabTSwQYUfBiA1vCJJ8L8kINrtZRjBIdaEtPuLdSy 5OXlc1+Wl/+2sBH4/8URZZZkcwQjdM5/+9ozI1VMSwvitidOWVvmSqL2 X-Gm-Gg: ASbGncu8ME3bCPET08COwqBVk68mnQsFaKjOHAK7FjsVw049Le0d0hbHIjUrw8uf7HI kpTdqFA0CAqFohw3hyTlzTE6ttI/Je7OzlioVHrEkpSIlCa2IDUN2sq0hfmt3dXxtU/lGPdUup7 MTFrNzM/sIUvtgLO0ta6vs6eWE8CKxWk7kq3Ju3+Z4pT1Oif662AON0B4z2k+k1zlvGtNXGuv6g AOZBX5JrRo9jv/1RAQ/d2OmmQ9N4lci0JbgZ3JNafUlMzcIhjaKfFDnbxg9aHONo6U5OV04Fycn MX7qXLqodWcH16w5vEKtIVUc9c6BBH7zCZPMHGirxAuXzMHT13bOpqo6RiDHvuDUcK3IkOuV67v uqHScNvP5dp6JuT5w7snIPVbhAvXGaOTP4eeMDrk= X-Google-Smtp-Source: AGHT+IEinpr7xThxxJ2V3S9ikl6fajqbnDTdglwGkk2yO6nzp2tfjtosXm54Fu/kSna8xTkM9qOt/A== X-Received: by 2002:a5d:5d10:0:b0:401:c52f:62de with SMTP id ffacd0b85a97d-40e4486c1a4mr4024325f8f.12.1758833171707; Thu, 25 Sep 2025 13:46:11 -0700 (PDT) Received: from localhost.localdomain ([78.209.201.53]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-46e2a996bf1sm91201395e9.1.2025.09.25.13.46.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Sep 2025 13:46:11 -0700 (PDT) From: Antoni Pokusinski To: jic23@kernel.org, dlechner@baylibre.com, nuno.sa@analog.com, andy@kernel.org, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-iio@vger.kernel.org, linux@roeck-us.net, rodrigo.gobbi.7@gmail.com, naresh.solanki@9elements.com, michal.simek@amd.com, grantpeltier93@gmail.com, farouk.bouabid@cherry.de, marcelo.schmitt1@gmail.com, Antoni Pokusinski Subject: [PATCH v2 4/4] iio: mpl3115: add support for sampling frequency Date: Thu, 25 Sep 2025 22:45:38 +0200 Message-Id: <20250925204538.63723-5-apokusinski01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20250925204538.63723-1-apokusinski01@gmail.com> References: <20250925204538.63723-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-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable When the device is in ACTIVE mode the temperature and pressure measurements are collected with a frequency determined by the ST[3:0] bits of CTRL_REG2 register. Reviewed-by: Nuno S=C3=A1 Signed-off-by: Antoni Pokusinski --- drivers/iio/pressure/mpl3115.c | 81 ++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c index 13c8b338a15e..b854732e61cb 100644 --- a/drivers/iio/pressure/mpl3115.c +++ b/drivers/iio/pressure/mpl3115.c @@ -30,6 +30,7 @@ #define MPL3115_INT_SOURCE 0x12 #define MPL3115_PT_DATA_CFG 0x13 #define MPL3115_CTRL_REG1 0x26 +#define MPL3115_CTRL_REG2 0x27 #define MPL3115_CTRL_REG3 0x28 #define MPL3115_CTRL_REG4 0x29 #define MPL3115_CTRL_REG5 0x2a @@ -48,6 +49,8 @@ #define MPL3115_CTRL1_ACTIVE BIT(0) /* continuous measurement */ #define MPL3115_CTRL1_OS_258MS GENMASK(5, 4) /* 64x oversampling */ =20 +#define MPL3115_CTRL2_ST GENMASK(3, 0) + #define MPL3115_CTRL3_IPOL1 BIT(5) #define MPL3115_CTRL3_IPOL2 BIT(1) =20 @@ -57,6 +60,25 @@ =20 #define MPL3115_INT2 BIT(2) /* flag that indicates INT2 in use */ =20 +static const unsigned int mpl3115_samp_freq_table[][2] =3D { + { 1, 0}, + { 0, 500000}, + { 0, 250000}, + { 0, 125000}, + { 0, 62500}, + { 0, 31250}, + { 0, 15625}, + { 0, 7812}, + { 0, 3906}, + { 0, 1953}, + { 0, 976}, + { 0, 488}, + { 0, 244}, + { 0, 122}, + { 0, 61}, + { 0, 30}, +}; + struct mpl3115_data { struct i2c_client *client; struct iio_trigger *drdy_trig; @@ -174,10 +196,61 @@ static int mpl3115_read_raw(struct iio_dev *indio_dev, default: return -EINVAL; } + case IIO_CHAN_INFO_SAMP_FREQ: + ret =3D i2c_smbus_read_byte_data(data->client, MPL3115_CTRL_REG2); + if (ret < 0) + return ret; + + ret =3D FIELD_GET(MPL3115_CTRL2_ST, ret); + + *val =3D mpl3115_samp_freq_table[ret][0]; + *val2 =3D mpl3115_samp_freq_table[ret][1]; + return IIO_VAL_INT_PLUS_MICRO; } return -EINVAL; } =20 +static int mpl3115_read_avail(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long mask) +{ + if (mask !=3D IIO_CHAN_INFO_SAMP_FREQ) + return -EINVAL; + + *type =3D IIO_VAL_INT_PLUS_MICRO; + *length =3D ARRAY_SIZE(mpl3115_samp_freq_table) * 2; + *vals =3D (int *)mpl3115_samp_freq_table; + return IIO_AVAIL_LIST; +} + +static int mpl3115_write_raw(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + int val, int val2, long mask) +{ + struct mpl3115_data *data =3D iio_priv(indio_dev); + int i, ret; + + if (mask !=3D IIO_CHAN_INFO_SAMP_FREQ) + return -EINVAL; + + for (i =3D 0; i < ARRAY_SIZE(mpl3115_samp_freq_table); i++) + if (val =3D=3D mpl3115_samp_freq_table[i][0] && + val2 =3D=3D mpl3115_samp_freq_table[i][1]) + break; + + if (i =3D=3D ARRAY_SIZE(mpl3115_samp_freq_table)) + return -EINVAL; + + if (!iio_device_claim_direct(indio_dev)) + return -EBUSY; + + ret =3D i2c_smbus_write_byte_data(data->client, MPL3115_CTRL_REG2, + FIELD_PREP(MPL3115_CTRL2_ST, i)); + iio_device_release_direct(indio_dev); + return ret; +} + static irqreturn_t mpl3115_trigger_handler(int irq, void *p) { struct iio_poll_func *pf =3D p; @@ -229,6 +302,9 @@ static const struct iio_chan_spec mpl3115_channels[] = =3D { .type =3D IIO_PRESSURE, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), .info_mask_shared_by_type =3D BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_all =3D BIT(IIO_CHAN_INFO_SAMP_FREQ), + .info_mask_shared_by_all_available =3D + BIT(IIO_CHAN_INFO_SAMP_FREQ), .scan_index =3D 0, .scan_type =3D { .sign =3D 'u', @@ -242,6 +318,9 @@ static const struct iio_chan_spec mpl3115_channels[] = =3D { .type =3D IIO_TEMP, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), .info_mask_shared_by_type =3D BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_all =3D BIT(IIO_CHAN_INFO_SAMP_FREQ), + .info_mask_shared_by_all_available =3D + BIT(IIO_CHAN_INFO_SAMP_FREQ), .scan_index =3D 1, .scan_type =3D { .sign =3D 's', @@ -312,6 +391,8 @@ static const struct iio_trigger_ops mpl3115_trigger_ops= =3D { =20 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, }; =20 static int mpl3115_trigger_probe(struct mpl3115_data *data, --=20 2.25.1