From nobody Mon Sep 28 19:23:36 2026 Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (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 3C3E1468C36 for ; Tue, 18 Aug 2026 11:34:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787052877; cv=none; b=GrHVHIp/1q74IVZx03Cx8UzzZRVRVNJtVl6Ott1uiJFTps6bVN2SQvPhjWUVXRXVSWEXgZqq6MlIg8LXcOfvG6oqdTZamETdtdfQFu47SOP3hdojh6/HixabZ1UoK2tsz3Y3IBdwQkhLqekRq/9BHbcbPvsUgdReP+lBuzGPBfc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787052877; c=relaxed/simple; bh=aaM+chNBUVzOK+71XSf/Mb82WOTb5qO+DxTTOj0UyJ4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sVLtun0zz4dpTJ/TwZm4gCApEkMddAE8MRn3x6Bw809Su/6KRSxsyCXtqhUWbto7nvpTT3cTEuvV+n7B5ABJTpayV9Zi9CCCIiw0xoIx3nFwX5x0kmqEEsnGQadIUxI68hPCQhquC8ji0/r3xPZtlgzXXG9HSJ1I9jASaeXXGIY= 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=WrFmua2M; arc=none smtp.client-ip=209.85.218.48 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="WrFmua2M" Received: by mail-ej1-f48.google.com with SMTP id a640c23a62f3a-c2074710751so711578866b.1 for ; Tue, 18 Aug 2026 04:34:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787052874; x=1787657674; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=vcNEmMVFuuQmsODrVbSfU7PhXNWqkwOb79tP/Y3pu6A=; b=WrFmua2MqMmHEGO9ImmL+c8QmlqqjDGRqrTti86FUkA9zqoGe/dhVclrqXXRJaqelJ Unkn2P+pRZ8+wQgJT1AiR76bBoeAixcCIMvMrtt1JcrY5Tf+4ZEqB2U8UW+zTc7jvPIa 1zXkXlTa17o5LjWlVwdvmJw8VUoLNkXuCSf60k04KdD2MyV90alG2T2XBgqat7+9NZlZ +eyMgQ91IiwTgtbnNF5wFWG5fvZDbJ6LAp2LUtLSy2iltTwJJehBOTNPhiMZ+BEHs3Ad jVZu9LCvsDTWfHZWfjhDuxKsKUA36zRTijkGcdpLVXtUn4s9ODJ32vd+Fv7fdzC1FuDq IROA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787052874; x=1787657674; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=vcNEmMVFuuQmsODrVbSfU7PhXNWqkwOb79tP/Y3pu6A=; b=TUNBfeQpVlg81i5C92WI7kjxxoHU4rxWEXcMHG0tgrFzBAReo8zskrfXL8LIXdwrqr vOp7ZL4Ik10u9R6wUM47kgLrBCUDSLPQ3KcslRF76MCbqhCcEylPIdRXzs/lujIx/PvI f7T1K7JQ+LbosfUByGVCYVU800C6QAPI7zo7yRHCBCBwCVsDepfV0M6d2PIWDka8hCor BHdHCvJRMJmgu+Zz3qmQmYl2BPqrry64IGzl1QU8bLgtTTwwvwkEY86977nc+qdIElJg ZIFDBdpgnFUKB61qUopCREiCX99p/VE5MmrsPWNIhj4uxBSp2xiwwGmxXeuOTPAVb3W+ nGTQ== X-Forwarded-Encrypted: i=1; AHgh+RoutTp0cjmcejNxvBbJBKecxsBBcXqYBaxX90mW8Q3qSAE4gMPqyGjg2uM0KATNOAqNiXhP8a/IIW6nwBg=@vger.kernel.org X-Gm-Message-State: AOJu0Yzb463c29KiBb/i/1A4rUfsIu7iV62IvPXKQflO9RuH0US7Vnt6 z6YKTUvvMmbrGbjq+4XyCu7T+cb47Cvi5R9I3dtiBo61kEXQTMKBlttx X-Gm-Gg: AR+sD11foIOk7NOAT1pAg0+EX8Jgm3ZvzEiZ/j0l6wBzwnHC2N0ftTfLrdn5q8Fo+3J 2a0vq4ynYBHcL+QdhAw6r/+UVE33m3ux8fL8E+h3bjQaAhEIaa/Eb+QyY3cKeBBieHi+fqCq1V5 7xZlTyEHbZmf0Pmyz79BakWgv24wc0Me/Bt2qEyJ1e4tWkxcaw2sFSg1J9F1cSIVTv5paM6flpd fut5Q17DIDj3VdCoV2vh4u/To+eo129wcwKJHtf4aYa7zYoR9rjoka69DhHp8MYwI8CH4hwSzjP ZzuvABvTan8z8qFUzxLyui37HnXLkD3pYilFLy3fKrO8gubSKtWqh4aQi6eTADqHVktftxEcC6A UQ1L8wGJRQsC+LzoisnlTXVbjI11hklAcPaeSfgc9oGYwQZZuBpCYHcqS54XHgdEyVCRVzDcKkE TgitjdI7uyavzFqSRwnyN7RE4C4NsGzgOZgIGgDubP50B+35nH+RbFtoVS9qgP6dG33TfnpbkrE YfvWA== X-Received: by 2002:a17:906:6207:b0:c12:83c9:d41 with SMTP id a640c23a62f3a-c2129be130dmr1739874266b.12.1787052874257; Tue, 18 Aug 2026 04:34:34 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:17a:e1ae:f7c9:8a7c:d206:62fa]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2185b73db1sm137901966b.40.2026.08.18.04.34.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 04:34:33 -0700 (PDT) From: Javier Carrasco Date: Tue, 18 Aug 2026 13:34:26 +0200 Subject: [PATCH v7 1/4] dt-bindings: iio: light: veml6030: add veml6031x00 ALS series 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 Message-Id: <20260818-veml6031x00-v7-1-2b0de0f20edf@gmail.com> References: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> In-Reply-To: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco , Jonathan Cameron , Krzysztof Kozlowski X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787052868; l=3092; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=aaM+chNBUVzOK+71XSf/Mb82WOTb5qO+DxTTOj0UyJ4=; b=jMmCQLW61kUrWLBtl1MZQqb261yjfNkfD/oSsrcjhqnD356XTW/oo0iICnXNIpzZaP9oApzQ0 POesHo2NQWxDbu3n4C9d279bI00H5/l/5DnYZsiTDYbdP2GYbdlc5TQ X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=Lge8w8xidNSf/INy7JAIbAW+Hezkp3nsBh2OjKL7lLU= These ambient light sensors share their properties with the ones from the same manufacturer that are supported by this bindings. Note that only two datasheets are provided as every one of them covers two devices (veml6031x00/veml60311x00 and veml6031x01/veml60311x01). Reviewed-by: Krzysztof Kozlowski Signed-off-by: Javier Carrasco Reviewed-by: Andy Shevchenko --- .../devicetree/bindings/iio/light/vishay,veml6030.yaml | 13 +++++++++= +++- MAINTAINERS | 5 +++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/iio/light/vishay,veml6030.ya= ml b/Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml index 0041e1db6838..a44de649184a 100644 --- a/Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml +++ b/Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml @@ -4,7 +4,8 @@ $id: http://devicetree.org/schemas/iio/light/vishay,veml6030.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# =20 -title: VEML3235, VEML3328, VEML6030, VEML6035 and VEML7700 Ambient Light S= ensors (ALS) +title: VEML3235, VEML3328, VEML6030, VEML6031x00 series, VEML6035 + and VEML7700 Ambient Light Sensors (ALS) =20 maintainers: - Rishi Gupta @@ -23,6 +24,8 @@ description: | https://www.vishay.com/docs/80131/veml3235.pdf https://www.vishay.com/docs/84968/veml3328.pdf https://www.vishay.com/docs/84366/veml6030.pdf + https://www.vishay.com/docs/80007/veml6031x00.pdf + https://www.vishay.com/docs/80008/veml6031x01.pdf https://www.vishay.com/docs/84889/veml6035.pdf https://www.vishay.com/docs/84286/veml7700.pdf =20 @@ -32,6 +35,10 @@ properties: - vishay,veml3235 - vishay,veml3328 - vishay,veml6030 + - vishay,veml6031x00 + - vishay,veml6031x01 + - vishay,veml60311x00 + - vishay,veml60311x01 - vishay,veml6035 - vishay,veml7700 =20 @@ -69,6 +76,8 @@ allOf: properties: compatible: enum: + - vishay,veml6031x00 + - vishay,veml6031x01 - vishay,veml6035 then: properties: @@ -82,6 +91,8 @@ allOf: enum: - vishay,veml3235 - vishay,veml3328 + - vishay,veml60311x00 + - vishay,veml60311x01 - vishay,veml7700 then: properties: diff --git a/MAINTAINERS b/MAINTAINERS index 15011f5752a9..4369cbf8b5ca 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -28761,6 +28761,11 @@ S: Maintained F: Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml F: drivers/iio/light/veml6030.c =20 +VISHAY VEML6031X00 AMBIENT LIGHT SENSOR DRIVER +M: Javier Carrasco +S: Maintained +F: Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml + VISHAY VEML6046X00 RGBIR COLOR SENSOR DRIVER M: Andreas Klinger S: Maintained --=20 2.43.0 From nobody Mon Sep 28 19:23:36 2026 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) (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 C33CF46C855 for ; Tue, 18 Aug 2026 11:34:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787052881; cv=none; b=cTv71Nez/qmx9Edw6RCrKTjYcv9tRlBbmBDjNixhvGKGn+2Sm7LX94qzigZgOr5aVb6yi/HVfgHKxQOhfk9k70DmqUqSCdHbjNkqJ6sAeitkTjgkp7PTAJ6v/jSW0vw1tQh72nTBEEUUFUhCch/P2FJr+f04adeMFa3SbPMhU7Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787052881; c=relaxed/simple; bh=d4MIYE1M0IkqOGJp67yRZZ5y2Ggz3Q5lzcDORKXCT6w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bL+tuyurUL+aiD833YSDlhNxqK2Xl+5ZGKnShiOgD9JhcyRYDZX2wvIcgqKCDSwvHa9UtNvi/gSTUCLUmrOEh2SlWsg0O7ADg8t/jJbywL1c0uXlcud/fMIR2sqZc4WPDC4tnrKjDrPwZ3CbUTn5Bln6ZodxmAfFA6hV7OjoaHI= 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=d4cALsCH; arc=none smtp.client-ip=209.85.218.53 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="d4cALsCH" Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-c1671ec8692so610687966b.0 for ; Tue, 18 Aug 2026 04:34:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787052877; x=1787657677; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=p64gaJFj7qd3y9T6bpSN/sljO5dosRDJ4M44mCAOubI=; b=d4cALsCHwGLnoqUj4mZ1aeKvXXd7LU3e5bEW3jfZygnbURbkHgBfAaFJzmq67P2o7+ WalOqR77yUDOthnI6FMlb7Wp8eF5nFu2z9/vZyr882lp6gz9b5DIDobgF4ciGPraI6Q0 KAIC9LVU303F/0VoY9e7TqSisyDx+rZws/oXqKev5aPBD2YDYlFU+USZZ4vjwgMpRvZ9 OGh95/MC5wzjcCoGTxS24Yr3qdkfqBjYMQcE3tcGWS40yZM7NwhcRFHMThkcNrtbNmZl noyLW6dgJh+kD3JcoNiNGw9Ko7vg0qlZF/IGHTTjiPz0ZZKr+uieJJV/l/jLtSCnJ+8x sKvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787052877; x=1787657677; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=p64gaJFj7qd3y9T6bpSN/sljO5dosRDJ4M44mCAOubI=; b=sQDk2wV5iu4P+rkRBHK3q+5jGLCFsVV3Rrtmw+VdtZuxt+iyDf0AjZJbQXsfWqhVSW Cm5wQg14bTPQrea4mM990wD6Z/Bq+odWdMacMhk9dfY0PAGVXAWLYfy2vzJNUHGWBv5k 9wHZnquByTuK4Wms/s6FCnbCd/C4t4bv8f0a8mB+2f0GqgavQNcviB++PkshpHhBdZAx 1i5Rx/Rh/6YB/oz/rtE6H/MQ0a+d8an4Q/kXhCjyYdzfDYbYXyCq4lvZj2FzVkX6dYEl uLaSoXT5PHBlRyWm8nenfria8PEpxsU6Q2M9G5OI4u1tLJxk27iWmlLaCeo8/ixk6YfW WCBQ== X-Forwarded-Encrypted: i=1; AHgh+RrbaoOYQzTZ5YTpib3I83eZ2vvZLu5n0VWG4A+nn3XA05RCivrVvoaO7YMlK45kgMRZ2OQhjrEn3MbuQmA=@vger.kernel.org X-Gm-Message-State: AOJu0Ywv+ejijitc8Fb70fJ7bRKPenQBYSjO7Pd6O2Gl9a8wJv/svQTd 6thVu7l6kvLlPjgTgqf3LJ7d2HaKKgdONeY2u2lAsR6WV/5TCI1Yivqv X-Gm-Gg: AR+sD13lxQalIVRo4DHQEyfqrbwXnmtCAiL5lM6Tk8Camb8sHvkjKry6BfLhhDvtCsF 1+GNb42Evd5vgYDWrre/uy9Cp/WwQ6YJKWVDhghklN73e8HWP6HcXlVf2VYmfjV0S5sIVN0HU+M j5b17v+z7W30z5eKn2n3IsZ2wp+S3CBdzJ4/wwvUhoNJAkHqEaCNPwvictInfg8XxBHBUABXMRt Syf71U9Hel8wDbEpQHdDKn6d5zMR/szV+LGvdC7aOeIuXzOGS/weZ4hnk6U7GJ6hO2LpkOOE1cL 6JvO/Jw0KCP1fekjr1Yq+JqHmlXvyJ6HtM1y2X2/7ZKcrqRD8mOaBkgsOAiLeKeNHWFstGfxwWl 4kh9g+mOtfnzdRCbrH/mBUQrc8+y9QMRtq1TBIQdRVzm+5JD9234axvBD85Kww7l50tVq4mkJNt xHQ7H7TSv556f6jHwzw6uBGtw6NFJgvSQIWMsm3jOv9A3d3rArXetXCR/TPAL4YSYY8G7F5d8RL ECsig== X-Received: by 2002:a17:906:fe4a:b0:c20:f5d3:ef62 with SMTP id a640c23a62f3a-c212a127adfmr1418682166b.17.1787052876646; Tue, 18 Aug 2026 04:34:36 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:17a:e1ae:f7c9:8a7c:d206:62fa]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2185b73db1sm137901966b.40.2026.08.18.04.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 04:34:36 -0700 (PDT) From: Javier Carrasco Date: Tue, 18 Aug 2026 13:34:27 +0200 Subject: [PATCH v7 2/4] iio: light: add support for veml6031x00 ALS series 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 Message-Id: <20260818-veml6031x00-v7-2-2b0de0f20edf@gmail.com> References: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> In-Reply-To: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco , Jonathan Cameron X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787052868; l=21212; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=d4MIYE1M0IkqOGJp67yRZZ5y2Ggz3Q5lzcDORKXCT6w=; b=ekatF9JJwqYBugOWTE6XDFZFKPX/9Sd+4wHDESxV5aVBZUZ/wylYzkK4O26agabeEWhyPz0HP cuyTydgRzqTBODG+uVIrnsRAy9vfRCJ604aposjAeKJIv+dbYJZhZDm X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=Lge8w8xidNSf/INy7JAIbAW+Hezkp3nsBh2OjKL7lLU= Support device identification, raw ALS and IR readings, and configuration of the scale and integration time. Signed-off-by: Javier Carrasco Reviewed-by: Andy Shevchenko --- MAINTAINERS | 1 + drivers/iio/light/Kconfig | 12 + drivers/iio/light/Makefile | 1 + drivers/iio/light/veml6031x00.c | 676 ++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 690 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 4369cbf8b5ca..85b35948da32 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -28765,6 +28765,7 @@ VISHAY VEML6031X00 AMBIENT LIGHT SENSOR DRIVER M: Javier Carrasco S: Maintained F: Documentation/devicetree/bindings/iio/light/vishay,veml6030.yaml +F: drivers/iio/light/veml6031x00.c =20 VISHAY VEML6046X00 RGBIR COLOR SENSOR DRIVER M: Andreas Klinger diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index ef36824f312f..985b776e71d6 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -738,6 +738,18 @@ config VEML6030 To compile this driver as a module, choose M here: the module will be called veml6030. =20 +config VEML6031X00 + tristate "VEML6031X00 ambient light sensor series" + select REGMAP_I2C + select IIO_GTS_HELPER + depends on I2C + help + Say Y here if you want to build a driver for the Vishay VEML6031X00 + ambient light sensor series. + + To compile this driver as a module, choose M here: the + module will be called veml6031x00. + config VEML6040 tristate "VEML6040 RGBW light sensor" select REGMAP_I2C diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile index 64e354c49ed8..6672ed01a819 100644 --- a/drivers/iio/light/Makefile +++ b/drivers/iio/light/Makefile @@ -68,6 +68,7 @@ obj-$(CONFIG_VCNL4035) +=3D vcnl4035.o obj-$(CONFIG_VEML3235) +=3D veml3235.o obj-$(CONFIG_VEML3328) +=3D veml3328.o obj-$(CONFIG_VEML6030) +=3D veml6030.o +obj-$(CONFIG_VEML6031X00) +=3D veml6031x00.o obj-$(CONFIG_VEML6040) +=3D veml6040.o obj-$(CONFIG_VEML6046X00) +=3D veml6046x00.o obj-$(CONFIG_VEML6070) +=3D veml6070.o diff --git a/drivers/iio/light/veml6031x00.c b/drivers/iio/light/veml6031x0= 0.c new file mode 100644 index 000000000000..348bc28859d6 --- /dev/null +++ b/drivers/iio/light/veml6031x00.c @@ -0,0 +1,676 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * VEML6031X00 Ambient Light Sensor + * + * Copyright (c) 2026, Javier Carrasco + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +/* Device registers */ +#define VEML6031X00_REG_CONF0 0x00 +#define VEML6031X00_REG_CONF1 0x01 +#define VEML6031X00_REG_ALS_L 0x10 +#define VEML6031X00_REG_ALS_H 0x11 +#define VEML6031X00_REG_IR_L 0x12 +#define VEML6031X00_REG_IR_H 0x13 +#define VEML6031X00_REG_ID_L 0x14 +#define VEML6031X00_REG_ID_H 0x15 + +/* Bit masks for specific functionality */ +#define VEML6031X00_CONF0_SD BIT(0) +#define VEML6031X00_CONF1_IR_SD BIT(7) + +#define VEML6031X00_GAIN_SEL(pd_div4, gain) (((pd_div4) << 2) | (gain)) + +struct veml6031x00_rf { + struct regmap_field *gain; + struct regmap_field *it; + struct regmap_field *pd_div4; +}; + +struct veml6031x00_chip { + const char *name; + const unsigned int part_id; +}; + +struct veml6031x00_data { + struct iio_gts gts; + struct regmap *regmap; + struct veml6031x00_rf rf; + const struct veml6031x00_chip *chip; + /* + * Serialize access to scale register fields scattered across multiple + * registers (rf.gain, rf.pd_div4, rf.it) to read and write them as a + * consistent set. + */ + struct mutex scale_lock; +}; + +static const struct iio_itime_sel_mul veml6031x00_it_sel[] =3D { + GAIN_SCALE_ITIME_US(3125, 0, 1), + GAIN_SCALE_ITIME_US(6250, 1, 2), + GAIN_SCALE_ITIME_US(12500, 2, 4), + GAIN_SCALE_ITIME_US(25000, 3, 8), + GAIN_SCALE_ITIME_US(50000, 4, 16), + GAIN_SCALE_ITIME_US(100000, 5, 32), + GAIN_SCALE_ITIME_US(200000, 6, 64), + GAIN_SCALE_ITIME_US(400000, 7, 128), +}; + +/* + * The gain selector encodes (PD_D4 << 2) | GAIN to identify each gain set= ting. + * Gains are multiplied by 8 to work with integers. The values in the iio-= gts + * tables don't need corrections because the maximum value of the scale re= fers + * to GAIN =3D x1, and the rest of the values are obtained from the result= ing + * linear function. + * TODO: add support for GAIN_0_165 and GAIN_0_660 + */ +#define VEML6031X00_SEL_GAIN_0_125 0x07 +#define VEML6031X00_SEL_GAIN_0_250 0x04 +#define VEML6031X00_SEL_GAIN_0_500 0x03 +#define VEML6031X00_SEL_GAIN_1_000 0x00 +#define VEML6031X00_SEL_GAIN_2_000 0x01 +static const struct iio_gain_sel_pair veml6031x00_gain_sel[] =3D { + GAIN_SCALE_GAIN(1, VEML6031X00_SEL_GAIN_0_125), + GAIN_SCALE_GAIN(2, VEML6031X00_SEL_GAIN_0_250), + GAIN_SCALE_GAIN(4, VEML6031X00_SEL_GAIN_0_500), + GAIN_SCALE_GAIN(8, VEML6031X00_SEL_GAIN_1_000), + GAIN_SCALE_GAIN(16, VEML6031X00_SEL_GAIN_2_000), +}; + +/* + * The shutdown bits (SD and ALS_IR_SD) are in different registers, and bo= th + * must be updated when changing the device power state. + */ +static int veml6031x00_set_power(struct veml6031x00_data *data, bool state) +{ + int ret; + + ret =3D regmap_assign_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_SD, !state); + if (ret) + return ret; + + return regmap_assign_bits(data->regmap, VEML6031X00_REG_CONF1, + VEML6031X00_CONF1_IR_SD, !state); +} + +static void veml6031x00_als_shutdown_action(void *data) +{ + struct veml6031x00_data *priv =3D data; + int ret; + + ret =3D veml6031x00_set_power(priv, false); + if (ret) + dev_warn(regmap_get_device(priv->regmap), + "Failed to shut down device: %d\n", ret); +} + +static const struct iio_chan_spec veml6031x00_channels[] =3D { + { + .type =3D IIO_LIGHT, + .address =3D VEML6031X00_REG_ALS_L, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_SCALE), + .info_mask_separate_available =3D BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_SCALE), + }, + { + .type =3D IIO_INTENSITY, + .address =3D VEML6031X00_REG_IR_L, + .modified =3D 1, + .channel2 =3D IIO_MOD_LIGHT_IR, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), + }, +}; + +static const struct regmap_range veml6031x00_readable_ranges[] =3D { + regmap_reg_range(VEML6031X00_REG_CONF0, VEML6031X00_REG_CONF1), + regmap_reg_range(VEML6031X00_REG_ALS_L, VEML6031X00_REG_ID_H), +}; + +static const struct regmap_access_table veml6031x00_readable_table =3D { + .yes_ranges =3D veml6031x00_readable_ranges, + .n_yes_ranges =3D ARRAY_SIZE(veml6031x00_readable_ranges), +}; + +static const struct regmap_range veml6031x00_writable_ranges[] =3D { + regmap_reg_range(VEML6031X00_REG_CONF0, VEML6031X00_REG_CONF1), +}; + +static const struct regmap_access_table veml6031x00_writable_table =3D { + .yes_ranges =3D veml6031x00_writable_ranges, + .n_yes_ranges =3D ARRAY_SIZE(veml6031x00_writable_ranges), +}; + +static const struct regmap_range veml6031x00_volatile_ranges[] =3D { + /* AF_TRIG in CONF0 is volatile */ + regmap_reg_range(VEML6031X00_REG_CONF0, VEML6031X00_REG_CONF0), + regmap_reg_range(VEML6031X00_REG_ALS_L, VEML6031X00_REG_IR_H), +}; + +static const struct regmap_access_table veml6031x00_volatile_table =3D { + .yes_ranges =3D veml6031x00_volatile_ranges, + .n_yes_ranges =3D ARRAY_SIZE(veml6031x00_volatile_ranges), +}; + +static const struct regmap_config veml6031x00_regmap_config =3D { + .name =3D "veml6031x00_regmap", + .reg_bits =3D 8, + .val_bits =3D 8, + .rd_table =3D &veml6031x00_readable_table, + .wr_table =3D &veml6031x00_writable_table, + .volatile_table =3D &veml6031x00_volatile_table, + .max_register =3D VEML6031X00_REG_ID_H, + .cache_type =3D REGCACHE_MAPLE, +}; + +static const struct reg_field veml6031x00_rf_it =3D + REG_FIELD(VEML6031X00_REG_CONF0, 4, 6); + +static const struct reg_field veml6031x00_rf_gain =3D + REG_FIELD(VEML6031X00_REG_CONF1, 3, 4); + +static const struct reg_field veml6031x00_rf_pd_div4 =3D + REG_FIELD(VEML6031X00_REG_CONF1, 6, 6); + +static int veml6031x00_regfield_init(struct veml6031x00_data *data) +{ + struct regmap *map =3D data->regmap; + struct device *dev =3D regmap_get_device(map); + struct regmap_field *rm_field; + struct veml6031x00_rf *rf =3D &data->rf; + + rm_field =3D devm_regmap_field_alloc(dev, map, veml6031x00_rf_gain); + if (IS_ERR(rm_field)) + return PTR_ERR(rm_field); + rf->gain =3D rm_field; + + rm_field =3D devm_regmap_field_alloc(dev, map, veml6031x00_rf_it); + if (IS_ERR(rm_field)) + return PTR_ERR(rm_field); + rf->it =3D rm_field; + + rm_field =3D devm_regmap_field_alloc(dev, map, veml6031x00_rf_pd_div4); + if (IS_ERR(rm_field)) + return PTR_ERR(rm_field); + rf->pd_div4 =3D rm_field; + + return 0; +} + +static int __veml6031x00_get_it(struct veml6031x00_data *data, int *val2) +{ + unsigned int it_idx; + int ret; + + ret =3D regmap_field_read(data->rf.it, &it_idx); + if (ret) + return ret; + + ret =3D iio_gts_find_int_time_by_sel(&data->gts, it_idx); + if (ret < 0) + return ret; + + *val2 =3D ret; + + return IIO_VAL_INT_PLUS_MICRO; +} + +static int veml6031x00_get_it(struct veml6031x00_data *data, int *val2) +{ + guard(mutex)(&data->scale_lock); + + return __veml6031x00_get_it(data, val2); +} + +static int veml6031x00_write_gain(struct veml6031x00_data *data, unsigned = int gain) +{ + int ret; + + ret =3D regmap_field_write(data->rf.pd_div4, gain >> 2); + if (ret) + return ret; + + return regmap_field_write(data->rf.gain, gain & 0x03); +} + +static int veml6031x00_set_it(struct iio_dev *iio, int val, int val2) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + int ret, gain_sel, new_gain, prev_gain, prev_it; + unsigned int gain_reg, it_idx, pd_div4; + struct iio_gts *gts =3D &data->gts; + bool gain_in_range; + + if (val || !iio_gts_valid_time(gts, val2)) + return -EINVAL; + + guard(mutex)(&data->scale_lock); + + ret =3D regmap_field_read(data->rf.it, &it_idx); + if (ret) + return ret; + + ret =3D regmap_field_read(data->rf.gain, &gain_reg); + if (ret) + return ret; + + ret =3D regmap_field_read(data->rf.pd_div4, &pd_div4); + if (ret) + return ret; + + prev_it =3D iio_gts_find_int_time_by_sel(gts, it_idx); + if (prev_it < 0) + return prev_it; + + if (prev_it =3D=3D val2) + return 0; + + gain_sel =3D VEML6031X00_GAIN_SEL(pd_div4, gain_reg); + prev_gain =3D iio_gts_find_gain_by_sel(gts, gain_sel); + if (prev_gain < 0) + return prev_gain; + + ret =3D iio_gts_find_new_gain_by_gain_time_min(gts, prev_gain, prev_it, v= al2, + &new_gain, &gain_in_range); + if (ret) + return ret; + + if (!gain_in_range) + dev_dbg(dev, "Optimal gain out of range\n"); + + ret =3D iio_gts_find_sel_by_int_time(gts, val2); + if (ret < 0) + return ret; + + ret =3D regmap_field_write(data->rf.it, ret); + if (ret) + return ret; + + gain_sel =3D iio_gts_find_sel_by_gain(gts, new_gain); + if (gain_sel < 0) + return gain_sel; + + return veml6031x00_write_gain(data, gain_sel); +} + +static int veml6031x00_set_scale(struct iio_dev *iio, int val, int val2) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct iio_gts *gts =3D &data->gts; + int gain_sel, it_sel, ret; + + ret =3D iio_gts_find_gain_time_sel_for_scale(gts, val, val2, &gain_sel, &= it_sel); + if (ret) + return ret; + + guard(mutex)(&data->scale_lock); + + ret =3D regmap_field_write(data->rf.it, it_sel); + if (ret) + return ret; + + return veml6031x00_write_gain(data, gain_sel); +} + +static int veml6031x00_get_scale(struct veml6031x00_data *data, int *val, = int *val2) +{ + int gain, it, gain_reg, pd_div4, it_reg, ret, sel; + + scoped_guard(mutex, &data->scale_lock) { + ret =3D regmap_field_read(data->rf.gain, &gain_reg); + if (ret) + return ret; + + ret =3D regmap_field_read(data->rf.pd_div4, &pd_div4); + if (ret) + return ret; + + sel =3D VEML6031X00_GAIN_SEL(pd_div4, gain_reg); + gain =3D iio_gts_find_gain_by_sel(&data->gts, sel); + if (gain < 0) + return gain; + + ret =3D regmap_field_read(data->rf.it, &it_reg); + if (ret) + return ret; + } + + it =3D iio_gts_find_int_time_by_sel(&data->gts, it_reg); + if (it < 0) + return it; + + ret =3D iio_gts_get_scale(&data->gts, gain, it, val, val2); + if (ret) + return ret; + + return IIO_VAL_INT_PLUS_NANO; +} + +static int veml6031x00_single_read(struct iio_dev *iio, enum iio_chan_type= type, + int *val) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + int addr, it_usec, ret; + __le16 regval; + + switch (type) { + case IIO_LIGHT: + addr =3D VEML6031X00_REG_ALS_L; + break; + case IIO_INTENSITY: + addr =3D VEML6031X00_REG_IR_L; + break; + default: + return -EINVAL; + } + + guard(mutex)(&data->scale_lock); + + PM_RUNTIME_ACQUIRE_AUTOSUSPEND(regmap_get_device(data->regmap), pm); + ret =3D PM_RUNTIME_ACQUIRE_ERR(&pm); + if (ret) + return ret; + + ret =3D __veml6031x00_get_it(data, &it_usec); + if (ret < 0) + return ret; + + /* integration time + 10% to ensure completion */ + fsleep(it_usec + (it_usec / 10)); + + ret =3D regmap_bulk_read(data->regmap, addr, ®val, sizeof(regval)); + if (ret) + return ret; + + *val =3D le16_to_cpu(regval); + + return IIO_VAL_INT; +} + +static int veml6031x00_read_raw(struct iio_dev *iio, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + + switch (mask) { + case IIO_CHAN_INFO_RAW: + return veml6031x00_single_read(iio, chan->type, val); + case IIO_CHAN_INFO_INT_TIME: + *val =3D 0; + return veml6031x00_get_it(data, val2); + case IIO_CHAN_INFO_SCALE: + return veml6031x00_get_scale(data, val, val2); + default: + return -EINVAL; + } +} + +static int veml6031x00_read_avail(struct iio_dev *iio, + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long mask) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + + switch (mask) { + case IIO_CHAN_INFO_INT_TIME: + return iio_gts_avail_times(&data->gts, vals, type, length); + case IIO_CHAN_INFO_SCALE: + return iio_gts_all_avail_scales(&data->gts, vals, type, length); + default: + return -EINVAL; + } +} + +static int veml6031x00_write_raw(struct iio_dev *iio, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_INT_TIME: + return veml6031x00_set_it(iio, val, val2); + case IIO_CHAN_INFO_SCALE: + return veml6031x00_set_scale(iio, val, val2); + default: + return -EINVAL; + } +} + +static int veml6031x00_write_raw_get_fmt(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_SCALE: + return IIO_VAL_INT_PLUS_NANO; + case IIO_CHAN_INFO_INT_TIME: + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } +} + +static const struct iio_info veml6031x00_info =3D { + .read_raw =3D veml6031x00_read_raw, + .read_avail =3D veml6031x00_read_avail, + .write_raw =3D veml6031x00_write_raw, + .write_raw_get_fmt =3D veml6031x00_write_raw_get_fmt, +}; + +static int veml6031x00_validate_part_id(struct veml6031x00_data *data) +{ + struct regmap *map =3D data->regmap; + struct device *dev =3D regmap_get_device(map); + unsigned int part_id; + int ret; + __le16 regval; + + ret =3D regmap_bulk_read(map, VEML6031X00_REG_ID_L, ®val, sizeof(regva= l)); + if (ret) + return dev_err_probe(dev, ret, "Failed to read ID\n"); + + part_id =3D le16_to_cpu(regval); + if (part_id !=3D data->chip->part_id) + dev_info(dev, "Unknown or unexpected ID %04x\n", part_id); + + return 0; +} + +static int veml6031x00_probe(struct i2c_client *i2c) +{ + struct device *dev =3D &i2c->dev; + struct veml6031x00_data *data; + struct iio_dev *iio; + int ret; + + iio =3D devm_iio_device_alloc(dev, sizeof(*data)); + if (!iio) + return -ENOMEM; + + data =3D iio_priv(iio); + i2c_set_clientdata(i2c, iio); + + data->chip =3D i2c_get_match_data(i2c); + if (!data->chip) + return dev_err_probe(dev, -ENODATA, "Failed to get chip data\n"); + + ret =3D devm_mutex_init(dev, &data->scale_lock); + if (ret) + return ret; + + data->regmap =3D devm_regmap_init_i2c(i2c, &veml6031x00_regmap_config); + if (IS_ERR(data->regmap)) + return dev_err_probe(dev, PTR_ERR(data->regmap), + "Failed to set regmap\n"); + + iio->name =3D data->chip->name; + iio->channels =3D veml6031x00_channels; + iio->num_channels =3D ARRAY_SIZE(veml6031x00_channels); + iio->modes =3D INDIO_DIRECT_MODE; + iio->info =3D &veml6031x00_info; + + ret =3D veml6031x00_regfield_init(data); + if (ret) + return dev_err_probe(dev, ret, "Failed to init regfield\n"); + + ret =3D devm_regulator_get_enable(dev, "vdd"); + if (ret) + return dev_err_probe(dev, ret, "Failed to enable regulator\n"); + + /* The device starts in power down mode by default */ + ret =3D veml6031x00_set_power(data, true); + if (ret) + return dev_err_probe(dev, ret, "Failed to power on the device\n"); + + ret =3D devm_add_action_or_reset(dev, veml6031x00_als_shutdown_action, da= ta); + if (ret) + return dev_err_probe(dev, ret, "Failed to add shutdown action\n"); + + pm_runtime_set_autosuspend_delay(dev, 2000); + pm_runtime_use_autosuspend(dev); + ret =3D devm_pm_runtime_set_active_enabled(dev); + if (ret) + return dev_err_probe(dev, ret, "Failed to enable runtime PM\n"); + + ret =3D veml6031x00_validate_part_id(data); + if (ret) + return ret; + + /* Max resolution =3D 6.9632 lx/cnt for gain =3D 0.125 and IT =3D 3.125ms= */ + ret =3D devm_iio_init_iio_gts(dev, 6, 963200000, + veml6031x00_gain_sel, + ARRAY_SIZE(veml6031x00_gain_sel), + veml6031x00_it_sel, + ARRAY_SIZE(veml6031x00_it_sel), + &data->gts); + if (ret) + return dev_err_probe(dev, ret, "Failed to init IIO GTS\n"); + + ret =3D devm_iio_device_register(dev, iio); + if (ret) + return dev_err_probe(dev, ret, "Failed to register IIO device\n"); + + return 0; +} + +static int veml6031x00_runtime_suspend(struct device *dev) +{ + struct veml6031x00_data *data =3D iio_priv(dev_get_drvdata(dev)); + + return veml6031x00_set_power(data, false); +} + +static int veml6031x00_runtime_resume(struct device *dev) +{ + struct veml6031x00_data *data =3D iio_priv(dev_get_drvdata(dev)); + + return veml6031x00_set_power(data, true); +} + +static DEFINE_RUNTIME_DEV_PM_OPS(veml6031x00_pm_ops, + veml6031x00_runtime_suspend, + veml6031x00_runtime_resume, + NULL); + +static const struct veml6031x00_chip veml6031x00_chip =3D { + .name =3D "veml6031x00", + .part_id =3D 0x0001, +}; + +static const struct veml6031x00_chip veml6031x01_chip =3D { + .name =3D "veml6031x01", + .part_id =3D 0x0001, +}; + +static const struct veml6031x00_chip veml60311x00_chip =3D { + .name =3D "veml60311x00", + .part_id =3D 0x1001, +}; + +static const struct veml6031x00_chip veml60311x01_chip =3D { + .name =3D "veml60311x01", + .part_id =3D 0x1001, +}; + +static const struct of_device_id veml6031x00_of_match[] =3D { + { + .compatible =3D "vishay,veml6031x00", + .data =3D &veml6031x00_chip, + }, + { + .compatible =3D "vishay,veml6031x01", + .data =3D &veml6031x01_chip, + }, + { + .compatible =3D "vishay,veml60311x00", + .data =3D &veml60311x00_chip, + }, + { + .compatible =3D "vishay,veml60311x01", + .data =3D &veml60311x01_chip, + }, + { } +}; +MODULE_DEVICE_TABLE(of, veml6031x00_of_match); + +static const struct i2c_device_id veml6031x00_id[] =3D { + { + .name =3D "veml6031x00", + .driver_data =3D (kernel_ulong_t)&veml6031x00_chip, + }, + { + .name =3D "veml6031x01", + .driver_data =3D (kernel_ulong_t)&veml6031x01_chip, + }, + { + .name =3D "veml60311x00", + .driver_data =3D (kernel_ulong_t)&veml60311x00_chip, + }, + { + .name =3D "veml60311x01", + .driver_data =3D (kernel_ulong_t)&veml60311x01_chip, + }, + { } +}; +MODULE_DEVICE_TABLE(i2c, veml6031x00_id); + +static struct i2c_driver veml6031x00_driver =3D { + .driver =3D { + .name =3D "veml6031x00", + .of_match_table =3D veml6031x00_of_match, + .pm =3D pm_ptr(&veml6031x00_pm_ops), + }, + .probe =3D veml6031x00_probe, + .id_table =3D veml6031x00_id, +}; +module_i2c_driver(veml6031x00_driver); + +MODULE_AUTHOR("Javier Carrasco "); +MODULE_DESCRIPTION("VEML6031X00 Ambient Light Sensor"); +MODULE_LICENSE("GPL"); +MODULE_IMPORT_NS("IIO_GTS_HELPER"); --=20 2.43.0 From nobody Mon Sep 28 19:23:36 2026 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 1A16346D0A3 for ; Tue, 18 Aug 2026 11:34:40 +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=1787052882; cv=none; b=eB2CgrsiU7+F61QtSx2ruqCgf+S7nijdP0abLhLIbmXP9ac6kWsum6LNsYKJgtrCkw5UkxrGOhc19b53GH+XSiVGhWeCO4KI4hdyWCiD6SQQAwKJWPCPWTTpSV0eO/5KD+Gp7+xfVwVDnV+Z2Tb2sDmOZPLyq10TGhMX0UhQxes= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787052882; c=relaxed/simple; bh=K16GBBNquIC2qzGSiHgzgtQbVN6shjltxfkR/Pe9NdQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jQhbexfDAOpDmo4gmI4W2U+58/8SZNNOJn15Hby3OxTyK7/y/j9i8WTiNoS9a12127YqsSAVyiha2J6u7Mczs7s9gP1z/HX/isu9gxTP/opwGGXBHDx6954az9IDoBJe8Sg0ufm4rKXJvk8Ykq/KuckGcWWwZjVyD9tZQvsyFtw= 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=iJ4yKUJi; arc=none smtp.client-ip=209.85.208.44 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="iJ4yKUJi" Received: by mail-ed1-f44.google.com with SMTP id 4fb4d7f45d1cf-6a051904222so5702265a12.2 for ; Tue, 18 Aug 2026 04:34:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787052879; x=1787657679; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=1rPJLPid5VUGtJzdjf6ogs9lORjakAAyd0gi2Bx70eo=; b=iJ4yKUJiZ746paopKKS2GZJ9HdEPTiD8TlcIft+IH2IRVBNAArjV7hkukMGo3qsIch YWsDg8sBnWN/OwYqwXgcu/S96kA7oiglXTt+qZvOXlBxB2JOClmQFU9mWz6wPdpnqf7I BBaaG7DOjBAlcKCUBqqaKwo3NzoaCFgd8VbbpO4pj6fXYeVVX7/Z/iNIraIqcAoo8Z86 urX8wQ2EcsZzVj6n6urBqF0OPsnY41+eILQkPpwdF8L3pgH5wyVPmELujVKcOhSPkuAs AAxvEE50F0xB8QYB2v0QaI2NC+HXv0hDrKK19zqllONfTipkzRfjH3/vSbb8CAgvJZ4Z +hJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787052879; x=1787657679; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=1rPJLPid5VUGtJzdjf6ogs9lORjakAAyd0gi2Bx70eo=; b=rva5u7lV22Le4Z1qNs9WIeDW+twuSxqj2bold7eKp6rA+BZoWhOXeHHVoOo5W3aJmI OZxaaDGkka0+yWvGdROfyuFaf0BglDj62NUKRZNCPsjTRnh9gBz1idlWQARvtzR/P8v0 Y8yjh+GqcIKH3XbjTXz+GwmnJTs4iKECyeCbjJ0lvMTvBqIApbxD9wNtghMznPvqH5DW J7b5aVnCkDgHhGk+ygT4lkE24qXd8fCWFuC87x+61B07IPnZlt2IDVzpsf72Py4NyORf CjoOgUwJ5YaZbUFOCB3F/6vjIUVuJT1wM36BUJFPFNHT3f+U6Z2uvIoP4zcKPEs2YniB pjQw== X-Forwarded-Encrypted: i=1; AHgh+RqLTmGchSg+NhzmrDl21wlNshQPYBy4Gar8VK6BlS2odf2cmMjXkFasdf7bIMYdUNBPqDPxOd8tD6Y9p4A=@vger.kernel.org X-Gm-Message-State: AOJu0Ywzfu1OlZ73IO+rinAZgifo59pa82G1id2QCNUPhQJLc6Csx/TO 7Q7SI+YL4XFCnly5vYaBP/wkQfr7cFTZmgRqamwGRXS5a/PaOzCzHjEG X-Gm-Gg: AR+sD13ZcSWMPB5VeQrdW0xdrzaBn6IzTWacCcy+p5ZUZs/6g3J8eTxoIeut+V9R7k0 fWq7VMz0zGonU0p6jWvg8hZtL6Q09nSvs/cRPYpqLrnuyMgESQ/LqfqYSUhG+jJ4uy4sjCEeX0W 3O/X5GZU/EWIr7ScqE7/z2ebf4rRb14CCDA+YsH/qbP41HV5gx3ZA9o1TnoDKHCglrbFmiQ6AmL zmoMBeYdI9AoZlRVlOQxeeNs7g7z1O5M6Ze7BkCLLrkNAhRSXCXShtdU0FgMAuZ/mJNssjF1eBz wdR4f5JDqyApxJ3IfUIDvGFmB6p1fbb2NEJaIJcl4sreSmzZQ1ZFe3JJoYnmgdwqwg7EX/fnmzA uqdh6dVdmKc3gmHf1K0qiYjzttIGlLgNRMdOCi2CKFhvqcaAYTZTul6UuO/sgSqZYZOpi15SMaH auBBkzpE5kgmOSoCk7QRL6iD4P+V9vp93A+G1Ix3CLRI0cfrfkQ/vevmVaBvbNFC3Zm426lotdg KKHykZ0LHS8ysNj X-Received: by 2002:a17:907:3d4d:b0:c15:ee0d:9a32 with SMTP id a640c23a62f3a-c2188a9ca9emr505442466b.21.1787052879170; Tue, 18 Aug 2026 04:34:39 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:17a:e1ae:f7c9:8a7c:d206:62fa]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2185b73db1sm137901966b.40.2026.08.18.04.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 04:34:38 -0700 (PDT) From: Javier Carrasco Date: Tue, 18 Aug 2026 13:34:28 +0200 Subject: [PATCH v7 3/4] iio: light: veml6031x00: add support for triggered buffers 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 Message-Id: <20260818-veml6031x00-v7-3-2b0de0f20edf@gmail.com> References: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> In-Reply-To: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco , Jonathan Cameron X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787052868; l=6166; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=K16GBBNquIC2qzGSiHgzgtQbVN6shjltxfkR/Pe9NdQ=; b=mUn93/RcpAFopKrWy4SlTY7QTrzpovWR4DoZoAlhgxsa93MheL+T6shtr6gtySHCx1ltc0tnq pvkrizzXKubAE16HUYazZbjQ8tugqVEcLbVJWq1s2wOZ85RVTzdXr7F X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=Lge8w8xidNSf/INy7JAIbAW+Hezkp3nsBh2OjKL7lLU= Add triggered buffer functionality for the two channels the device provides (ALS and IR). Signed-off-by: Javier Carrasco Reviewed-by: Andy Shevchenko --- drivers/iio/light/Kconfig | 2 + drivers/iio/light/veml6031x00.c | 112 ++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 114 insertions(+) diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index 985b776e71d6..397b3e0d4408 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -742,6 +742,8 @@ config VEML6031X00 tristate "VEML6031X00 ambient light sensor series" select REGMAP_I2C select IIO_GTS_HELPER + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER depends on I2C help Say Y here if you want to build a driver for the Vishay VEML6031X00 diff --git a/drivers/iio/light/veml6031x00.c b/drivers/iio/light/veml6031x0= 0.c index 348bc28859d6..e6ca98414a01 100644 --- a/drivers/iio/light/veml6031x00.c +++ b/drivers/iio/light/veml6031x00.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,8 @@ =20 #include #include +#include +#include =20 /* Device registers */ #define VEML6031X00_REG_CONF0 0x00 @@ -42,6 +45,12 @@ =20 #define VEML6031X00_GAIN_SEL(pd_div4, gain) (((pd_div4) << 2) | (gain)) =20 +enum veml6031x00_scan { + VEML6031X00_SCAN_ALS, + VEML6031X00_SCAN_IR, + VEML6031X00_SCAN_TIMESTAMP, +}; + struct veml6031x00_rf { struct regmap_field *gain; struct regmap_field *it; @@ -135,6 +144,13 @@ static const struct iio_chan_spec veml6031x00_channels= [] =3D { BIT(IIO_CHAN_INFO_SCALE), .info_mask_separate_available =3D BIT(IIO_CHAN_INFO_INT_TIME) | BIT(IIO_CHAN_INFO_SCALE), + .scan_index =3D VEML6031X00_SCAN_ALS, + .scan_type =3D { + .format =3D IIO_SCAN_FORMAT_UNSIGNED_INT, + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_LE, + }, }, { .type =3D IIO_INTENSITY, @@ -142,7 +158,15 @@ static const struct iio_chan_spec veml6031x00_channels= [] =3D { .modified =3D 1, .channel2 =3D IIO_MOD_LIGHT_IR, .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), + .scan_index =3D VEML6031X00_SCAN_IR, + .scan_type =3D { + .format =3D IIO_SCAN_FORMAT_UNSIGNED_INT, + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_LE, + }, }, + IIO_CHAN_SOFT_TIMESTAMP(VEML6031X00_SCAN_TIMESTAMP), }; =20 static const struct regmap_range veml6031x00_readable_ranges[] =3D { @@ -388,6 +412,10 @@ static int veml6031x00_single_read(struct iio_dev *iio= , enum iio_chan_type type, return -EINVAL; } =20 + IIO_DEV_ACQUIRE_DIRECT_MODE(iio, claim); + if (IIO_DEV_ACQUIRE_FAILED(claim)) + return -EBUSY; + guard(mutex)(&data->scale_lock); =20 PM_RUNTIME_ACQUIRE_AUTOSUSPEND(regmap_get_device(data->regmap), pm); @@ -451,6 +479,10 @@ static int veml6031x00_write_raw(struct iio_dev *iio, struct iio_chan_spec const *chan, int val, int val2, long mask) { + IIO_DEV_ACQUIRE_DIRECT_MODE(iio, claim); + if (IIO_DEV_ACQUIRE_FAILED(claim)) + return -EBUSY; + switch (mask) { case IIO_CHAN_INFO_INT_TIME: return veml6031x00_set_it(iio, val, val2); @@ -482,6 +514,79 @@ static const struct iio_info veml6031x00_info =3D { .write_raw_get_fmt =3D veml6031x00_write_raw_get_fmt, }; =20 +static int veml6031x00_buffer_preenable(struct iio_dev *iio) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + int ret, it_usec; + + ret =3D pm_runtime_resume_and_get(dev); + if (ret) + return ret; + + ret =3D veml6031x00_get_it(data, &it_usec); + if (ret < 0) { + pm_runtime_put_autosuspend(dev); + return ret; + } + + /* + * Wait one integration period + 10% margin so the first triggered + * read does not race with the sensor completing its first conversion + * after power-on. + */ + fsleep(it_usec + (it_usec / 10)); + + return 0; +} + +static int veml6031x00_buffer_postdisable(struct iio_dev *iio) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + + pm_runtime_put_autosuspend(regmap_get_device(data->regmap)); + + return 0; +} + +static const struct iio_buffer_setup_ops veml6031x00_buffer_setup_ops =3D { + .preenable =3D veml6031x00_buffer_preenable, + .postdisable =3D veml6031x00_buffer_postdisable, +}; + +static irqreturn_t veml6031x00_trig_handler(int irq, void *p) +{ + struct iio_poll_func *pf =3D p; + struct iio_dev *iio =3D pf->indio_dev; + struct veml6031x00_data *data =3D iio_priv(iio); + struct regmap *map =3D data->regmap; + IIO_DECLARE_BUFFER_WITH_TS(__le16, scan, 2) =3D { }; + unsigned int i =3D 0; + int ch, ret; + + if (test_bit(VEML6031X00_SCAN_ALS, iio->active_scan_mask) && + test_bit(VEML6031X00_SCAN_IR, iio->active_scan_mask)) { + ret =3D regmap_bulk_read(map, VEML6031X00_REG_ALS_L, + scan, 2 * sizeof(*scan)); + if (ret) + goto done; + } else { + iio_for_each_active_channel(iio, ch) { + ret =3D regmap_bulk_read(map, iio->channels[ch].address, + &scan[i++], sizeof(*scan)); + if (ret) + goto done; + } + } + + iio_push_to_buffers_with_ts(iio, scan, sizeof(scan), pf->timestamp); + +done: + iio_trigger_notify_done(iio->trig); + + return IRQ_HANDLED; +} + static int veml6031x00_validate_part_id(struct veml6031x00_data *data) { struct regmap *map =3D data->regmap; @@ -571,6 +676,13 @@ static int veml6031x00_probe(struct i2c_client *i2c) if (ret) return dev_err_probe(dev, ret, "Failed to init IIO GTS\n"); =20 + ret =3D devm_iio_triggered_buffer_setup(dev, iio, + iio_pollfunc_store_time, + veml6031x00_trig_handler, + &veml6031x00_buffer_setup_ops); + if (ret) + return dev_err_probe(dev, ret, "Failed to register triggered buffer\n"); + ret =3D devm_iio_device_register(dev, iio); if (ret) return dev_err_probe(dev, ret, "Failed to register IIO device\n"); --=20 2.43.0 From nobody Mon Sep 28 19:23:36 2026 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (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 E4B2746C854 for ; Tue, 18 Aug 2026 11:34:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787052886; cv=none; b=GCytNDYAhed4o5S7yKLYzHAXIp/LiXvjpkhCYtkYpWOXonoGWYIVwXm33uIz7ArOM032K9x18HtpU7pmOEkXoraNYg0LMwd9K4Fbadv+9AUCtZVAzljXqGNapMieJTlb6L0PMfgAltCtzDtVVjPDwRiF/3gMrchuFjzAV1VdmNg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787052886; c=relaxed/simple; bh=O8W/ndWcb8xcoHa1G1y74rqgd5XUTmMy9LzLd9Hlczs=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HPm9pYP0OZsAnSSQnRz1joBlj20ZeokQlFRwQwDrOHziM89yhOAWJc2UH/cU7ABtEkbfUSqk0Wn6afRTODzvpixip1V4CETFBo9dDoneKKfK4VYGKtxiR/wSFG3NHcOHoyS03392mYntnimgFNPn3Nv7LjQVZJAz+WfOjRbe7XQ= 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=SkVaJS+4; arc=none smtp.client-ip=209.85.218.43 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="SkVaJS+4" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-c1c50c1e29bso658811466b.3 for ; Tue, 18 Aug 2026 04:34:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787052882; x=1787657682; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iV0U0Lnj/90r7ROdstcFm8h9zXFNrXIVywMM4jLZsQY=; b=SkVaJS+4jGSplMdFvo6BZsslc0pCLvQj8KIAlaAziG4Q+ZB/mZwq2ZagqSgb+naEu0 D9tP/jgS/MzvBssrEDeBNq3iae2UQvPuLFMsgO/nhjDssGeCSk3PTRZHj4PryM/5Nsol zErclZW24cMKgvQP2aXuDatbJowcC4ucS6aYtfdKBHkA7eRoCtb+wQdPKAm0X+CRMBbB i4VAeH5fWD2/DCAfHQ4MMC68x3p0Pk0SQ6yrPK/1WniVCdosnPzsDuXnKJ7R9HjTAExX HqOjLwAvgwI5pfBevZG1b2YPHBzt1S/1PyLGVzBjduTt67ZiUnRVAo96esrgwzFfet82 KTjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787052882; x=1787657682; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=iV0U0Lnj/90r7ROdstcFm8h9zXFNrXIVywMM4jLZsQY=; b=jEXKSPXOGdvxcKdFfx4ttvVJBctfwrYJ7f17TtGkU9OQmo4qssBF0R9UsXdG1j55ad rJv1BSwTXL7V4NFRquZcoyzOhXn85L0pG0Sg+vgk47ErWYbfELFJ4qYQnTg2TQwV0L6p cdeMRXabuDpkRw5otuszVUFfO7wnlHWCFFoyTJ2dVsXinJiEEaFrkUWJ4ALWRoIm7Trk +2j0w9DhlfxZmW27V3+K1GU+3qZalC5VNFZE1yvkM0ueivoGcFi8dwr2BpaEl/Cb8C1e VU9bwqdKyF7rVNTWV7OTNUYVjmlCCj4jTKfxVdEtmDn3kEWF7YhGwDhU1NMir2vgUeqq bZZQ== X-Forwarded-Encrypted: i=1; AHgh+RpI4nxx8Qf+sjfe7lxmGAwPrAzDdsWql3+u6tzO+7+gyi1xtus3PvHKpxIV4dcAcF8kzQmLmCA+gRbxsxg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz+JEEndhXgoRIUrEicgPyCedQoAXlYzp1payE00jqMoppcN6rV Ob1h4X7Fugvv9BgDgVPd4KdNyyHeuMeNO/xq6gqFIyfZYkaOSfVOWK2n X-Gm-Gg: AR+sD10MZj/m+GCEZwiiJVenLMWze/8fPkXUFli7wcXubkZYezKfM+rohGt8LAvcyVv f+sTygnh47JYePWT5WZsGG31l4HCVNrJK0hfEc3uLNAAYtvGtEGD5BpKpJh4NjbPnqCWmPahtHt x/DgkVL7+AufTDFPXQfrj71MIoS3+y7DtFR1HkXu75W4nMUlkCKBzQy/N/x2TAttWW7WM647kHN 7T4o4H6oxcBWQ+Dilf5Qim9b9IhtVpvbA555aMDGX8dwvrkZ1/tZIKKJPaN0e18FFc8YWx329SP ViueHh77U8wLpHag/Z3QmOdBDYM7HLIk+O4YWny5+9d0P/D4wszFzHR+CeJlbdH2Sj5ozbPzMcF pvpcbiKqVzN8dYacdxYHOEttir16wnx4zqtsTSpb53x1MR248MCMHVVF/eCtpIX8kIkkRhAc4e9 yNlIwrUcAmktNBzprMbcd256WQWAqBgPJwhBeFFKeF3nhtEjQD5/PdXLzy8CRlF4Zx6s5EBWyW+ KeHdQ== X-Received: by 2002:a17:907:1688:b0:c20:f871:1020 with SMTP id a640c23a62f3a-c212a265d9emr1389069966b.19.1787052881973; Tue, 18 Aug 2026 04:34:41 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:17a:e1ae:f7c9:8a7c:d206:62fa]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-c2185b73db1sm137901966b.40.2026.08.18.04.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Aug 2026 04:34:41 -0700 (PDT) From: Javier Carrasco Date: Tue, 18 Aug 2026 13:34:29 +0200 Subject: [PATCH v7 4/4] iio: light: veml6031x00: add support for events and trigger 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 Message-Id: <20260818-veml6031x00-v7-4-2b0de0f20edf@gmail.com> References: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> In-Reply-To: <20260818-veml6031x00-v7-0-2b0de0f20edf@gmail.com> To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski , Conor Dooley , David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Javier Carrasco , Jonathan Cameron X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1787052868; l=23838; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=O8W/ndWcb8xcoHa1G1y74rqgd5XUTmMy9LzLd9Hlczs=; b=+0D9NxQQjCVpp5ckp9FAaavKUhKPCBQzNfPdxmK/y7r2I8dO+r7vADaEPqUDdxXX9dPTQcBHl PqKgz/4BRTuDBv8YxBcrIywdR16LKGk2A/rZa1pkYdmrzdH/MQaPint X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=Lge8w8xidNSf/INy7JAIbAW+Hezkp3nsBh2OjKL7lLU= The device provides a shared interrupt line to notify events and data ready. Add support for configurations with and without an interrupt line, providing events and trigger support when an interrupt line is available. Signed-off-by: Javier Carrasco Reviewed-by: Andy Shevchenko --- drivers/iio/light/veml6031x00.c | 594 ++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 586 insertions(+), 8 deletions(-) diff --git a/drivers/iio/light/veml6031x00.c b/drivers/iio/light/veml6031x0= 0.c index e6ca98414a01..068fa7b3ecc9 100644 --- a/drivers/iio/light/veml6031x00.c +++ b/drivers/iio/light/veml6031x00.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -25,6 +26,9 @@ #include =20 #include +#include +#include +#include #include #include #include @@ -32,16 +36,28 @@ /* Device registers */ #define VEML6031X00_REG_CONF0 0x00 #define VEML6031X00_REG_CONF1 0x01 +#define VEML6031X00_REG_WH_L 0x04 +#define VEML6031X00_REG_WH_H 0x05 +#define VEML6031X00_REG_WL_L 0x06 +#define VEML6031X00_REG_WL_H 0x07 #define VEML6031X00_REG_ALS_L 0x10 #define VEML6031X00_REG_ALS_H 0x11 #define VEML6031X00_REG_IR_L 0x12 #define VEML6031X00_REG_IR_H 0x13 #define VEML6031X00_REG_ID_L 0x14 #define VEML6031X00_REG_ID_H 0x15 +#define VEML6031X00_REG_INT 0x17 =20 /* Bit masks for specific functionality */ #define VEML6031X00_CONF0_SD BIT(0) +#define VEML6031X00_CONF0_AF_TRIG BIT(2) +#define VEML6031X00_CONF0_AF BIT(3) #define VEML6031X00_CONF1_IR_SD BIT(7) +#define VEML6031X00_INT_TH_H BIT(1) +#define VEML6031X00_INT_TH_L BIT(2) +#define VEML6031X00_INT_DRDY BIT(3) +#define VEML6031X00_INT_MASK \ + (VEML6031X00_INT_TH_L | VEML6031X00_INT_TH_H | VEML6031X00_INT_DRDY) =20 #define VEML6031X00_GAIN_SEL(pd_div4, gain) (((pd_div4) << 2) | (gain)) =20 @@ -53,8 +69,10 @@ enum veml6031x00_scan { =20 struct veml6031x00_rf { struct regmap_field *gain; + struct regmap_field *int_en; struct regmap_field *it; struct regmap_field *pd_div4; + struct regmap_field *pers; }; =20 struct veml6031x00_chip { @@ -65,6 +83,7 @@ struct veml6031x00_chip { struct veml6031x00_data { struct iio_gts gts; struct regmap *regmap; + struct iio_trigger *trig; struct veml6031x00_rf rf; const struct veml6031x00_chip *chip; /* @@ -73,6 +92,14 @@ struct veml6031x00_data { * consistent set. */ struct mutex scale_lock; + /* + * Serialize access to irq enable/disable by events and trigger + * (shared line). + */ + struct mutex irq_lock; + unsigned int interrupt_users; + bool ev_en; + bool trig_en; }; =20 static const struct iio_itime_sel_mul veml6031x00_it_sel[] =3D { @@ -107,6 +134,17 @@ static const struct iio_gain_sel_pair veml6031x00_gain= _sel[] =3D { GAIN_SCALE_GAIN(16, VEML6031X00_SEL_GAIN_2_000), }; =20 +static IIO_CONST_ATTR(in_illuminance_thresh_either_period_available, "1 2 = 4 8"); + +static struct attribute *veml6031x00_event_attributes[] =3D { + &iio_const_attr_in_illuminance_thresh_either_period_available.dev_attr.at= tr, + NULL +}; + +static const struct attribute_group veml6031x00_event_attr_group =3D { + .attrs =3D veml6031x00_event_attributes, +}; + /* * The shutdown bits (SD and ALS_IR_SD) are in different registers, and bo= th * must be updated when changing the device power state. @@ -135,6 +173,23 @@ static void veml6031x00_als_shutdown_action(void *data) "Failed to shut down device: %d\n", ret); } =20 +static const struct iio_event_spec veml6031x00_event_spec[] =3D { + { + .type =3D IIO_EV_TYPE_THRESH, + .dir =3D IIO_EV_DIR_RISING, + .mask_separate =3D BIT(IIO_EV_INFO_VALUE), + }, { + .type =3D IIO_EV_TYPE_THRESH, + .dir =3D IIO_EV_DIR_FALLING, + .mask_separate =3D BIT(IIO_EV_INFO_VALUE), + }, { + .type =3D IIO_EV_TYPE_THRESH, + .dir =3D IIO_EV_DIR_EITHER, + .mask_separate =3D BIT(IIO_EV_INFO_PERIOD) | + BIT(IIO_EV_INFO_ENABLE), + }, +}; + static const struct iio_chan_spec veml6031x00_channels[] =3D { { .type =3D IIO_LIGHT, @@ -169,9 +224,47 @@ static const struct iio_chan_spec veml6031x00_channels= [] =3D { IIO_CHAN_SOFT_TIMESTAMP(VEML6031X00_SCAN_TIMESTAMP), }; =20 +static const struct iio_chan_spec veml6031x00_channels_irq[] =3D { + { + .type =3D IIO_LIGHT, + .address =3D VEML6031X00_REG_ALS_L, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_SCALE), + .info_mask_separate_available =3D BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_SCALE), + .event_spec =3D veml6031x00_event_spec, + .num_event_specs =3D ARRAY_SIZE(veml6031x00_event_spec), + .scan_index =3D VEML6031X00_SCAN_ALS, + .scan_type =3D { + .format =3D IIO_SCAN_FORMAT_UNSIGNED_INT, + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_LE, + }, + }, + { + .type =3D IIO_INTENSITY, + .address =3D VEML6031X00_REG_IR_L, + .modified =3D 1, + .channel2 =3D IIO_MOD_LIGHT_IR, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW), + .scan_index =3D VEML6031X00_SCAN_IR, + .scan_type =3D { + .format =3D IIO_SCAN_FORMAT_UNSIGNED_INT, + .realbits =3D 16, + .storagebits =3D 16, + .endianness =3D IIO_LE, + }, + }, + IIO_CHAN_SOFT_TIMESTAMP(VEML6031X00_SCAN_TIMESTAMP), +}; + static const struct regmap_range veml6031x00_readable_ranges[] =3D { regmap_reg_range(VEML6031X00_REG_CONF0, VEML6031X00_REG_CONF1), + regmap_reg_range(VEML6031X00_REG_WH_L, VEML6031X00_REG_WL_H), regmap_reg_range(VEML6031X00_REG_ALS_L, VEML6031X00_REG_ID_H), + regmap_reg_range(VEML6031X00_REG_INT, VEML6031X00_REG_INT), }; =20 static const struct regmap_access_table veml6031x00_readable_table =3D { @@ -180,7 +273,7 @@ static const struct regmap_access_table veml6031x00_rea= dable_table =3D { }; =20 static const struct regmap_range veml6031x00_writable_ranges[] =3D { - regmap_reg_range(VEML6031X00_REG_CONF0, VEML6031X00_REG_CONF1), + regmap_reg_range(VEML6031X00_REG_CONF0, VEML6031X00_REG_WL_H), }; =20 static const struct regmap_access_table veml6031x00_writable_table =3D { @@ -192,6 +285,7 @@ static const struct regmap_range veml6031x00_volatile_r= anges[] =3D { /* AF_TRIG in CONF0 is volatile */ regmap_reg_range(VEML6031X00_REG_CONF0, VEML6031X00_REG_CONF0), regmap_reg_range(VEML6031X00_REG_ALS_L, VEML6031X00_REG_IR_H), + regmap_reg_range(VEML6031X00_REG_INT, VEML6031X00_REG_INT), }; =20 static const struct regmap_access_table veml6031x00_volatile_table =3D { @@ -199,6 +293,15 @@ static const struct regmap_access_table veml6031x00_vo= latile_table =3D { .n_yes_ranges =3D ARRAY_SIZE(veml6031x00_volatile_ranges), }; =20 +static const struct regmap_range veml6031x00_precious_ranges[] =3D { + regmap_reg_range(VEML6031X00_REG_INT, VEML6031X00_REG_INT), +}; + +static const struct regmap_access_table veml6031x00_precious_table =3D { + .yes_ranges =3D veml6031x00_precious_ranges, + .n_yes_ranges =3D ARRAY_SIZE(veml6031x00_precious_ranges), +}; + static const struct regmap_config veml6031x00_regmap_config =3D { .name =3D "veml6031x00_regmap", .reg_bits =3D 8, @@ -206,13 +309,20 @@ static const struct regmap_config veml6031x00_regmap_= config =3D { .rd_table =3D &veml6031x00_readable_table, .wr_table =3D &veml6031x00_writable_table, .volatile_table =3D &veml6031x00_volatile_table, - .max_register =3D VEML6031X00_REG_ID_H, + .precious_table =3D &veml6031x00_precious_table, + .max_register =3D VEML6031X00_REG_INT, .cache_type =3D REGCACHE_MAPLE, }; =20 +static const struct reg_field veml6031x00_rf_int_en =3D + REG_FIELD(VEML6031X00_REG_CONF0, 1, 1); + static const struct reg_field veml6031x00_rf_it =3D REG_FIELD(VEML6031X00_REG_CONF0, 4, 6); =20 +static const struct reg_field veml6031x00_rf_pers =3D + REG_FIELD(VEML6031X00_REG_CONF1, 1, 2); + static const struct reg_field veml6031x00_rf_gain =3D REG_FIELD(VEML6031X00_REG_CONF1, 3, 4); =20 @@ -236,11 +346,21 @@ static int veml6031x00_regfield_init(struct veml6031x= 00_data *data) return PTR_ERR(rm_field); rf->it =3D rm_field; =20 + rm_field =3D devm_regmap_field_alloc(dev, map, veml6031x00_rf_int_en); + if (IS_ERR(rm_field)) + return PTR_ERR(rm_field); + rf->int_en =3D rm_field; + rm_field =3D devm_regmap_field_alloc(dev, map, veml6031x00_rf_pd_div4); if (IS_ERR(rm_field)) return PTR_ERR(rm_field); rf->pd_div4 =3D rm_field; =20 + rm_field =3D devm_regmap_field_alloc(dev, map, veml6031x00_rf_pers); + if (IS_ERR(rm_field)) + return PTR_ERR(rm_field); + rf->pers =3D rm_field; + return 0; } =20 @@ -341,6 +461,31 @@ static int veml6031x00_set_it(struct iio_dev *iio, int= val, int val2) return veml6031x00_write_gain(data, gain_sel); } =20 +static int veml6031x00_read_period(struct iio_dev *iio, int *val) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + unsigned int regval; + int ret; + + ret =3D regmap_field_read(data->rf.pers, ®val); + if (ret) + return ret; + + *val =3D BIT(regval); + + return IIO_VAL_INT; +} + +static int veml6031x00_write_period(struct iio_dev *iio, int val) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + + if (val < 0 || val > 8 || hweight8(val) !=3D 1) + return -EINVAL; + + return regmap_field_write(data->rf.pers, ffs(val) - 1); +} + static int veml6031x00_set_scale(struct iio_dev *iio, int val, int val2) { struct veml6031x00_data *data =3D iio_priv(iio); @@ -394,6 +539,53 @@ static int veml6031x00_get_scale(struct veml6031x00_da= ta *data, int *val, int *v return IIO_VAL_INT_PLUS_NANO; } =20 +static int veml6031x00_read_th(struct iio_dev *iio, int *val, int *val2, i= nt dir) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + __le16 regval; + int ret; + + if (dir =3D=3D IIO_EV_DIR_RISING) + ret =3D regmap_bulk_read(data->regmap, VEML6031X00_REG_WH_L, + ®val, sizeof(regval)); + else + ret =3D regmap_bulk_read(data->regmap, VEML6031X00_REG_WL_L, + ®val, sizeof(regval)); + if (ret) + return ret; + + *val =3D le16_to_cpu(regval); + + return IIO_VAL_INT; +} + +static int veml6031x00_write_th(struct iio_dev *iio, int val, int val2, in= t dir) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + __le16 regval; + int ret; + + if (val < 0 || val > U16_MAX || val2) + return -EINVAL; + + regval =3D cpu_to_le16(val); + + if (dir =3D=3D IIO_EV_DIR_RISING) { + ret =3D regmap_bulk_write(data->regmap, VEML6031X00_REG_WH_L, + ®val, sizeof(regval)); + if (ret) + dev_dbg(dev, "Failed to set high threshold %d\n", ret); + } else { + ret =3D regmap_bulk_write(data->regmap, VEML6031X00_REG_WL_L, + ®val, sizeof(regval)); + if (ret) + dev_dbg(dev, "Failed to set low threshold %d\n", ret); + } + + return ret; +} + static int veml6031x00_single_read(struct iio_dev *iio, enum iio_chan_type= type, int *val) { @@ -507,13 +699,240 @@ static int veml6031x00_write_raw_get_fmt(struct iio_= dev *indio_dev, } } =20 +static int veml6031x00_set_interrupt(struct veml6031x00_data *data, bool s= tate) + __must_hold(&data->irq_lock) +{ + int ret; + + lockdep_assert_held(&data->irq_lock); + + if (state) { + data->interrupt_users++; + if (data->interrupt_users > 1) + return 0; + } else { + data->interrupt_users--; + if (data->interrupt_users > 0) + return 0; + } + + ret =3D regmap_field_write(data->rf.int_en, state); + if (ret) { + if (state) + data->interrupt_users--; + else + data->interrupt_users++; + } + + return ret; +} + +static int veml6031x00_read_event_val(struct iio_dev *iio, + 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) +{ + switch (type) { + case IIO_EV_TYPE_THRESH: + if (dir =3D=3D IIO_EV_DIR_EITHER && info =3D=3D IIO_EV_INFO_PERIOD) + return veml6031x00_read_period(iio, val); + + return veml6031x00_read_th(iio, val, val2, dir); + default: + return -EINVAL; + } +} + +static int veml6031x00_write_event_val(struct iio_dev *iio, + 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) +{ + switch (info) { + case IIO_EV_INFO_VALUE: + return veml6031x00_write_th(iio, val, val2, dir); + case IIO_EV_INFO_PERIOD: + return veml6031x00_write_period(iio, val); + default: + return -EINVAL; + } +} + +static int veml6031x00_read_event_config(struct iio_dev *iio, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + + guard(mutex)(&data->irq_lock); + + return data->ev_en; +} + +static int veml6031x00_event_enable(struct veml6031x00_data *data) +{ + struct device *dev =3D regmap_get_device(data->regmap); + int ret; + + ret =3D pm_runtime_resume_and_get(dev); + if (ret) + return ret; + + ret =3D veml6031x00_set_interrupt(data, true); + if (ret) { + pm_runtime_put_autosuspend(dev); + return ret; + } + + data->ev_en =3D true; + + return 0; +} + +static int veml6031x00_event_disable(struct veml6031x00_data *data) +{ + struct device *dev =3D regmap_get_device(data->regmap); + int ret; + + ret =3D veml6031x00_set_interrupt(data, false); + if (ret) + return ret; + + data->ev_en =3D false; + pm_runtime_put_autosuspend(dev); + + return 0; +} + +static int veml6031x00_write_event_config(struct iio_dev *iio, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + bool state) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + + guard(mutex)(&data->irq_lock); + + /* avoid multiple increments/decrements from one source */ + if (state =3D=3D data->ev_en) + return 0; + + if (state) + return veml6031x00_event_enable(data); + + return veml6031x00_event_disable(data); +} + +static void veml6031x00_disable_event_action(void *arg) +{ + struct veml6031x00_data *data =3D arg; + struct device *dev =3D regmap_get_device(data->regmap); + int ret; + + guard(mutex)(&data->irq_lock); + + if (!data->ev_en) + return; + + ret =3D veml6031x00_set_interrupt(data, false); + if (ret) + dev_err(dev, "Failed to disable events: %d\n", ret); + else + data->ev_en =3D false; + + pm_runtime_put_sync(dev); +} + static const struct iio_info veml6031x00_info =3D { .read_raw =3D veml6031x00_read_raw, .read_avail =3D veml6031x00_read_avail, .write_raw =3D veml6031x00_write_raw, .write_raw_get_fmt =3D veml6031x00_write_raw_get_fmt, + .read_event_value =3D veml6031x00_read_event_val, + .write_event_value =3D veml6031x00_write_event_val, + .read_event_config =3D veml6031x00_read_event_config, + .write_event_config =3D veml6031x00_write_event_config, + .event_attrs =3D &veml6031x00_event_attr_group, }; =20 +static const struct iio_info veml6031x00_info_no_irq =3D { + .read_raw =3D veml6031x00_read_raw, + .read_avail =3D veml6031x00_read_avail, + .write_raw =3D veml6031x00_write_raw, + .write_raw_get_fmt =3D veml6031x00_write_raw_get_fmt, +}; + +static irqreturn_t veml6031x00_irq(int irq, void *private) +{ + struct iio_dev *iio =3D private; + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + s64 timestamp; + unsigned int regval; + int ret; + bool trigger_poll; + + ret =3D pm_runtime_get_if_active(dev); + if (ret <=3D 0) + return IRQ_NONE; + + scoped_guard(mutex, &data->irq_lock) { + ret =3D regmap_read(data->regmap, VEML6031X00_REG_INT, ®val); + if (ret) { + dev_dbg(dev, "Failed to read interrupt register %d\n", ret); + pm_runtime_put(dev); + return IRQ_NONE; + } + + if (!(regval & VEML6031X00_INT_MASK)) { + pm_runtime_put(dev); + return IRQ_NONE; + } + + timestamp =3D iio_get_time_ns(iio); + + if ((regval & (VEML6031X00_INT_TH_H | VEML6031X00_INT_TH_L)) && + data->ev_en) { + if (regval & VEML6031X00_INT_TH_H) + iio_push_event(iio, + IIO_UNMOD_EVENT_CODE(IIO_LIGHT, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + timestamp); + if (regval & VEML6031X00_INT_TH_L) + iio_push_event(iio, + IIO_UNMOD_EVENT_CODE(IIO_LIGHT, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_FALLING), + timestamp); + } + + trigger_poll =3D (regval & VEML6031X00_INT_DRDY) && data->trig_en; + } + + /* + * iio_trigger_poll_nested() must be called with irq_lock released: + * it runs trig_handler() synchronously in this thread, which calls + * reenable() on completion, and that callback also takes irq_lock. + * iio_pollfunc_store_time() is not called for our own trigger, so the + * timestamp is stored here. + */ + if (trigger_poll) { + iio->pollfunc->timestamp =3D timestamp; + iio_trigger_poll_nested(data->trig); + } + + pm_runtime_put(dev); + + return IRQ_HANDLED; +} + static int veml6031x00_buffer_preenable(struct iio_dev *iio) { struct veml6031x00_data *data =3D iio_priv(iio); @@ -549,11 +968,83 @@ static int veml6031x00_buffer_postdisable(struct iio_= dev *iio) return 0; } =20 +static int __veml6031x00_set_trigger_state(struct veml6031x00_data *data, = bool state) + __must_hold(&data->irq_lock) +{ + int ret; + + lockdep_assert_held(&data->irq_lock); + + ret =3D veml6031x00_set_interrupt(data, state); + if (ret) + return ret; + + /* The AF bit must be updated before updating AF_TRIG */ + ret =3D regmap_assign_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF, state); + if (ret) + goto clear_interrupt; + + ret =3D regmap_assign_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF_TRIG, state); + if (ret) { + regmap_assign_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF, !state); + goto clear_interrupt; + } + + data->trig_en =3D state; + + return 0; + +clear_interrupt: + veml6031x00_set_interrupt(data, !state); + + return ret; +} + +static int veml6031x00_set_trigger_state(struct iio_trigger *trig, bool st= ate) +{ + struct iio_dev *iio =3D iio_trigger_get_drvdata(trig); + struct veml6031x00_data *data =3D iio_priv(iio); + + guard(mutex)(&data->irq_lock); + + if (state =3D=3D data->trig_en) + return 0; + + return __veml6031x00_set_trigger_state(data, state); +} + static const struct iio_buffer_setup_ops veml6031x00_buffer_setup_ops =3D { .preenable =3D veml6031x00_buffer_preenable, .postdisable =3D veml6031x00_buffer_postdisable, }; =20 +static void veml6031x00_trigger_reenable(struct iio_trigger *trig) +{ + struct iio_dev *iio =3D iio_trigger_get_drvdata(trig); + struct veml6031x00_data *data =3D iio_priv(iio); + int ret; + + guard(mutex)(&data->irq_lock); + + if (!data->trig_en) + return; + + ret =3D regmap_assign_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF_TRIG, true); + if (ret) + dev_err(regmap_get_device(data->regmap), + "Failed to reenable trigger: %d\n", ret); +} + +static const struct iio_trigger_ops veml6031x00_trigger_ops =3D { + .validate_device =3D iio_trigger_validate_own_device, + .set_trigger_state =3D veml6031x00_set_trigger_state, + .reenable =3D veml6031x00_trigger_reenable, +}; + static irqreturn_t veml6031x00_trig_handler(int irq, void *p) { struct iio_poll_func *pf =3D p; @@ -606,6 +1097,87 @@ static int veml6031x00_validate_part_id(struct veml60= 31x00_data *data) return 0; } =20 +static int veml6031x00_hw_init(struct veml6031x00_data *data) +{ + struct regmap *map =3D data->regmap; + struct device *dev =3D regmap_get_device(map); + __le16 regval =3D 0; + int ret, val; + + ret =3D regmap_bulk_write(map, VEML6031X00_REG_WL_L, ®val, sizeof(regv= al)); + if (ret) + return dev_err_probe(dev, ret, "Failed to set low threshold\n"); + + regval =3D cpu_to_le16(U16_MAX); + ret =3D regmap_bulk_write(map, VEML6031X00_REG_WH_L, ®val, sizeof(regv= al)); + if (ret) + return dev_err_probe(dev, ret, "Failed to set high threshold\n"); + + ret =3D regmap_field_write(data->rf.int_en, 0); + if (ret) + return ret; + + ret =3D regmap_read(map, VEML6031X00_REG_INT, &val); + if (ret) + return dev_err_probe(dev, ret, "Failed to clear interrupts\n"); + + return 0; +} + +static int veml6031x00_setup_irq(struct i2c_client *i2c, struct iio_dev *i= io) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + int ret; + + data->trig =3D devm_iio_trigger_alloc(dev, "%s-drdy%d", + iio->name, iio_device_id(iio)); + if (!data->trig) + return -ENOMEM; + + data->trig->ops =3D &veml6031x00_trigger_ops; + iio_trigger_set_drvdata(data->trig, iio); + + ret =3D devm_iio_trigger_register(dev, data->trig); + if (ret) + return ret; + + return devm_request_threaded_irq(dev, i2c->irq, NULL, veml6031x00_irq, + IRQF_ONESHOT, iio->name, iio); +} + +static int veml6031x00_init_iiodev(struct i2c_client *i2c, struct iio_dev = *iio) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + int ret; + + iio->name =3D data->chip->name; + iio->modes =3D INDIO_DIRECT_MODE; + + if (!i2c->irq) { + iio->channels =3D veml6031x00_channels; + iio->num_channels =3D ARRAY_SIZE(veml6031x00_channels); + iio->info =3D &veml6031x00_info_no_irq; + + return 0; + } + + iio->channels =3D veml6031x00_channels_irq; + iio->num_channels =3D ARRAY_SIZE(veml6031x00_channels_irq); + iio->info =3D &veml6031x00_info; + + ret =3D veml6031x00_setup_irq(i2c, iio); + if (ret) + return ret; + + ret =3D devm_add_action_or_reset(dev, veml6031x00_disable_event_action, d= ata); + if (ret) + return ret; + + return 0; +} + static int veml6031x00_probe(struct i2c_client *i2c) { struct device *dev =3D &i2c->dev; @@ -628,17 +1200,15 @@ static int veml6031x00_probe(struct i2c_client *i2c) if (ret) return ret; =20 + ret =3D devm_mutex_init(dev, &data->irq_lock); + if (ret) + return ret; + data->regmap =3D devm_regmap_init_i2c(i2c, &veml6031x00_regmap_config); if (IS_ERR(data->regmap)) return dev_err_probe(dev, PTR_ERR(data->regmap), "Failed to set regmap\n"); =20 - iio->name =3D data->chip->name; - iio->channels =3D veml6031x00_channels; - iio->num_channels =3D ARRAY_SIZE(veml6031x00_channels); - iio->modes =3D INDIO_DIRECT_MODE; - iio->info =3D &veml6031x00_info; - ret =3D veml6031x00_regfield_init(data); if (ret) return dev_err_probe(dev, ret, "Failed to init regfield\n"); @@ -666,6 +1236,10 @@ static int veml6031x00_probe(struct i2c_client *i2c) if (ret) return ret; =20 + ret =3D veml6031x00_hw_init(data); + if (ret) + return ret; + /* Max resolution =3D 6.9632 lx/cnt for gain =3D 0.125 and IT =3D 3.125ms= */ ret =3D devm_iio_init_iio_gts(dev, 6, 963200000, veml6031x00_gain_sel, @@ -676,6 +1250,10 @@ static int veml6031x00_probe(struct i2c_client *i2c) if (ret) return dev_err_probe(dev, ret, "Failed to init IIO GTS\n"); =20 + ret =3D veml6031x00_init_iiodev(i2c, iio); + if (ret) + return dev_err_probe(dev, ret, "Failed to initialize IIO device\n"); + ret =3D devm_iio_triggered_buffer_setup(dev, iio, iio_pollfunc_store_time, veml6031x00_trig_handler, --=20 2.43.0