From nobody Fri Sep 25 23:53:49 2026 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.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 0A01C48A2D7 for ; Mon, 7 Sep 2026 11:48:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781728; cv=none; b=GSdx3Wv09IbdLr85eDYDk96wLxObk4xwB9IkH1D7666oMoJIZkOxBqdsGtCNbngRvlzIzkNUQE2BTeNZF1Fq4xMl4Jf5QJYnceenzQgGgzZCRdTKXW64uzAxwEso+7Sy1N+JGrA/gXlfK3NW41eIJqdT2pvCtbn1X63NRBTNMGo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781728; c=relaxed/simple; bh=koUYc8Dq9lWw1oLPJynOIZpYM8lkDBbSyMSmWAIup4w=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uDMhNYmGOqyPr2ZxFoHNl901aUwfKyYR1yGF9zFh1f6Ct159J05ls6gMLf1sk44kO7Tu8DotedYFs25M0uFBYLxvolCatmq+3P+SNKnSokukPO8OIZX115ChX+dm3OiKTDUHu3zjPL7UtrdKpS+F8aO+UXAUxYlAzrQGe5Xf+dc= 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=swGf0eJF; arc=none smtp.client-ip=209.85.221.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="swGf0eJF" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-48441a2ba14so3035647f8f.1 for ; Mon, 07 Sep 2026 04:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788781725; x=1789386525; 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=rw9tIl3/QFpv/y5nx3+oqZIVRAfzeLzBB+R0xa6GvSg=; b=swGf0eJFmiE5IrDGTek6g33CyneOMdBx161PB+GbvaZJsa1D5sCypbFmvMlBwk2krk 86eL8optMZmmBZ6SsFO7QgidM6E2L+FdWUTIGFwIuNrQSt1TDa9DXCYAjqSZ8CWvGq96 yzoZfcvYb3Ozdfju+TtYGmfWHTEeQyNHQNnilknMBoIcdmTEY4BGpme9mguNTdiE/v5A 3TPHKd7LTcdojuruBbDRmYh8fPaCz4KGCGqWs40oynOb71fYd65PZ6ksFXa9X89aGvAe 7AgiRLeDZl7VTjS0a0JZWZKEKT8AtoomhZOI4cy0W33YRh5TgNbSX3U9qvl2qYR0Buza 1A7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788781725; x=1789386525; 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=rw9tIl3/QFpv/y5nx3+oqZIVRAfzeLzBB+R0xa6GvSg=; b=PwaMIB3Rs/C5pfaKx0hMKfp2h+GL987YeLCKUAF0BNBSowmP/I7rHV+nWLhBTIm1DC kuIL+1yROQx1Gfe4Qk9ps6/0PNeBSRkhaZ0RYBAdryN/NRwEUKgScjIdAxQGejENYf+T 7lWqzLh9SprER9aqGyJ/i2advYa6Z40GwRkiS7B1EJYW2rkGq0ErhnBYJuQ5VdwIrncQ gJvUO1NYs3QRUfVRaAB+Q4VVoBWquAMWhiEM10N+lMb5E8hb5vFtIW9QzEAocObyO3AA EWSSdekeSuXBlLMwycuCMsohuAZmVuQo942gNSqTpAkCM74RmkLa59TMCiCawc7zYbeN gZ6w== X-Forwarded-Encrypted: i=1; AKwUvBx72DMWPZImTT7LhQHRd6NhBM3Kc0knkdqwAnOlBIJ667ms3tE53CqD3JLzQht2r4a+rPaB11CfMbkyLkg=@vger.kernel.org X-Gm-Message-State: AFuF++lLDtTHYcdvtJxajB5Fe9Z+Dz0kJU8AeguX06YqvOy1VIs2Qg0F AGGCW1NqX8Bn/TKRyQDZx1QduZsjtMCza46OTsz1VniLnzpa+Zwudu+C X-Gm-Gg: AYBFou2YJVkZ2hHBW62HS+nebHtvYejEYU7plzS0o90TvXKNmOrKPmVAZYQlK+TuEwX 54TqXUSHCu/Gixu84deBSSvF0fYEQjrC0UejUsdppGF8Iu+YmnbujnPzUf9PXxc3pZIB5YSJdG8 avJW0QzWAsRbbbxuhtN/kHf2ESpCuaQYjE5e6GxLGMU7xhT3sA2JMHH0sTh3zX+X1gnx++i1c77 4MCi4yVs1BCgLAN0TRTStWtMebNFb+Ty+ezdPdaszQdRNs9le3Izj0S9UYHuyCDVUXEEXZ+KNQZ 76BgGMgmNbLy2iutnVM1jrO+o1ETZ6zlh/ozmxe6mdmDjpSSCIJaTw22BgwvxLG2SPVY1yH9Dat 8tmSO+mDQw0IZLMk0B4pwci8Gmpy1VBSLRc88mRLVx/MnqVIoF5eQu/hk5InpkeQs2WVZQnn8gG EbTb7Z6pb1HFzEZ2p1rZ2qAL2j0x6pP1YiIewSBS2zcl4GtH8sO6dCDfHBGZ2JQVH6MVdaTqR2Q jmY X-Received: by 2002:a05:6000:4a1e:b0:482:f0dc:b4f7 with SMTP id ffacd0b85a97d-48587091b97mr25343836f8f.4.1788781724964; Mon, 07 Sep 2026 04:48:44 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:178:2f30:d3da:48f5:116c:5642]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-485883c5bc5sm29597421f8f.24.2026.09.07.04.48.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 04:48:44 -0700 (PDT) From: Javier Carrasco Date: Mon, 07 Sep 2026 13:48:39 +0200 Subject: [PATCH v9 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: <20260907-veml6031x00-v9-1-8c93a6c66a4d@gmail.com> References: <20260907-veml6031x00-v9-0-8c93a6c66a4d@gmail.com> In-Reply-To: <20260907-veml6031x00-v9-0-8c93a6c66a4d@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=1788781720; l=3140; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=koUYc8Dq9lWw1oLPJynOIZpYM8lkDBbSyMSmWAIup4w=; b=I8KOaew5Y3C4NAz38zM8zmjM3wQWdKLTZUK3KUULJRWZyKUyQmLO7ekmyOxIyRmC/BA1oB/DS Q/e+RwQ0oySBN9KuXlyYNg80Cm3GuZ9lG+Oz0/c4nPiIDtmQZXsPH2u 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 Reviewed-by: Andy Shevchenko Signed-off-by: Javier Carrasco --- .../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 3a19da74d00c..57202b51fb66 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29095,6 +29095,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 Fri Sep 25 23:53:49 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.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 E8F6948C403 for ; Mon, 7 Sep 2026 11:48:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781731; cv=none; b=uksmQV7q2QLsZA8JuMDul9mJp9924HaB+XDM1ZXayIc7qiCJASABtOXvL9ALOwp9cE8uD9iasPyelI6DlcjJpMHcFvy4cfJYqN8N4UofThScBAt4WVGDGuUsI4AZD1vHXTmdJTXGGpIsIH8z5BHPfUQs2rh+2ySS30AlD93OkXk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781731; c=relaxed/simple; bh=K+dZwDdX5FA+cBNgrU+MPKgYxneqoPoPqHtGtcjSp/k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ghTEzvIVBWIIOwvCQ+Hj9wb9/D0um9iSbAcIt1KrScGtMZeo70aZ/5KgmdCylftH54UhYb3W5hPWcmMjtCzxwWkf4e9XjAzF2M5Xd3FsQxiqCIJMcZ9N1JHGCaReMcOzEkBMXT+odYILOLotppeHDDQlOLZNmDE8I0geJQn/z4E= 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=CSnmq2lP; arc=none smtp.client-ip=209.85.221.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="CSnmq2lP" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-484362f5c4aso4379250f8f.3 for ; Mon, 07 Sep 2026 04:48:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788781727; x=1789386527; 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=A5Qv66gxQUrcsxq+IMMc7XxmNJGfQIwe+qAYN0zRjnQ=; b=CSnmq2lPLxcpWHeSjGETNpSxGPz9vhvtz72WjdZqM2ZJUmbSy6Xr8t08wyMNeAG+V1 30qdT21ihIxntQQHSYGNQ7JVeEM90FUhkW0fpWn/fjaHSIk6Gl+twwecolA2eqs2dnX2 SPb/gd40OXnWbR3awdAbFrC3+CFSFUjzmpv/Tf79ctqFqfFHVB0JO4OhRSxlCa/O2pqT S6+C+USwADjy6IRjm8cSeqztVvZiYW/WevAlxAxpVFboao6j9Fu9FJ9aYZ16ZatxNBHl Kfo510C2RTukDZJyF0AIX24yS97DPjxRbWoEvzNEy559FcnyhT3NoyqvQOnk+Wsc0KWE xxYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788781727; x=1789386527; 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=A5Qv66gxQUrcsxq+IMMc7XxmNJGfQIwe+qAYN0zRjnQ=; b=A9K+FLRjaq5/NK7gNBiSxw4HaWEssUjVdAjC6XPIqPWaUfNq+qm/Z03lROWrngWv4A e9Fcea6e33YLKp21pvcDOjdRZPvGE2YxFyHBN5f2sIZULCmEO8LGjCRIuQp8fZNSr2dR ps/8x0Nnx2UXAO6MuqZpCA5sYDeNpTDt2vB+eENrcFCwhmvIyOtBvXR06tHNAnDstBDM CVlIOVjqxa2YzUuxUBIdRUpBycU1CSM6C0rftXCbFzY1O3PV3wHduccZa1AE1SBWnBgz C1ps9CGQU/d9WUKmpDywgkoDtB04GXy1+l0lSNdqE1lIHuLkUTbMlxaKulWV0GRwGaW+ 2IsA== X-Forwarded-Encrypted: i=1; AKwUvBzh2+3q/wm6kKNg5XtbgjhrDqQ7Yo5pO7Dcw4G2ezmWMoFncQc3/whCZNqpw//DjxVN0XxDYOs+VXxwaD8=@vger.kernel.org X-Gm-Message-State: AFuF++neoMg2rlZ/kvelWyBxncJAElT37fDwRPFRoBsDUUx6MIEmodeD K3wLCg84+FTDVavdkX7llik/BVN8k0CEOxAe2jaKc+yBXWiuCJhMH9AD X-Gm-Gg: AYBFou3mqiCqgCcnfrgcy+PjGxtV0YJQ46q34fZA4wyh4YWkuZvLq9ji5TEfXHqpseq T9YUE37gec8t5tNzlTlqe0LDXcdUeWEG1fmUq9x3lmkNBjQ/YbMYYec5nBhsZuLUYfCHVhwlMWp 2mhHI2ryXRAyN6RJQbR2eqBYWWpj70WGexdo+NsrhiPjCnCUSnkUhuHlUhlB0jWkwXWk8w5dib6 YnV5IlsGBNXKK66Ynnnd6RQNnVHQImnp8fLH+726KM5lFXRp/PrBZ/g6F5Hqb47jddFhlxn2KwA AZg1GHUYWxWVSQ8iP9dYlH4jco4s87JrPRazSiXsTY2w3GD0nQW3iarjIfyIJqo98/OyKqdfH4p N3vUQcr0S6SUGqYcC7uMmxQbkU2kOAIt6yPKRmV6X717cCvS5CsE4oJqsncJO8ED/2Cpy2jftA0 68fPhnMBrgbQBtaVabp2uA9iFQfk8eWnASRhhwsqHIzFj085poIIdSTkd865M8j8C6n5KwSgm6E zK1 X-Received: by 2002:a05:6000:230c:b0:485:877d:ea8e with SMTP id ffacd0b85a97d-485877df2b8mr40066242f8f.14.1788781726898; Mon, 07 Sep 2026 04:48:46 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:178:2f30:d3da:48f5:116c:5642]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-485883c5bc5sm29597421f8f.24.2026.09.07.04.48.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 04:48:46 -0700 (PDT) From: Javier Carrasco Date: Mon, 07 Sep 2026 13:48:40 +0200 Subject: [PATCH v9 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: <20260907-veml6031x00-v9-2-8c93a6c66a4d@gmail.com> References: <20260907-veml6031x00-v9-0-8c93a6c66a4d@gmail.com> In-Reply-To: <20260907-veml6031x00-v9-0-8c93a6c66a4d@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=1788781720; l=21315; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=K+dZwDdX5FA+cBNgrU+MPKgYxneqoPoPqHtGtcjSp/k=; b=WOhwNrtF1X+nxoggnrC40BhmC6iGnZtsTLVczrfoaBSEhTyrcaLLonDSADAjBbDLa1hW33X1g d9jpZqlqDK4BI31q/2SI06pCwDVVj2Mk4zYssni7OgoC3hIKwpB2B2W 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. Reviewed-by: Andy Shevchenko Signed-off-by: Javier Carrasco --- MAINTAINERS | 1 + drivers/iio/light/Kconfig | 12 + drivers/iio/light/Makefile | 1 + drivers/iio/light/veml6031x00.c | 678 ++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 692 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 57202b51fb66..c83f5af23d97 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -29099,6 +29099,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 f23bbce12c72..02291abeff60 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -741,6 +741,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..f3772577a05d --- /dev/null +++ b/drivers/iio/light/veml6031x00.c @@ -0,0 +1,678 @@ +// 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; + struct device *dev =3D regmap_get_device(priv->regmap); + int ret; + + ret =3D veml6031x00_set_power(priv, false); + if (ret) + dev_warn(dev, "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) +{ + unsigned int gain_reg, pd_div4, it_reg; + int gain, it, 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); + unsigned int addr; + int 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 Fri Sep 25 23:53:49 2026 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 0C1A248F83B for ; Mon, 7 Sep 2026 11:48:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781733; cv=none; b=Q6cfVBYFbS5rYiDa4Llst6l++oN4aGh+QCOFBgRETmkBXvfKR0G8QDVPuN1j9v8UjUK28MFavWmBACxuSenZftxTZhI5CBK0k5isVQ/Jr/VoQqts/rv9sct3jYVZbyeLhl8nNMEKSyiPenG0teQTsXD5GeVIdXruT6xoGZ0S7SA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781733; c=relaxed/simple; bh=QCLyoNALvtQOVUWWgKT4N38ewa9Qau0InNlSI5vyyo0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iL4wGBaO6HPXhOMmtrEcBuaLDsd2+AomDRtU3m8vHHq2uat2C9ozOVu5uoMURaXQSqEDjOWoyvxBYyftuo33yaDnN7yRFkxoygMo5Yx8gY8429s3RjzJo2rmkQf5prGhajpeNaEtp4bjhiUaU9K+KahVgk7ZuyqyyHy58LpECvA= 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=ZL48wZOp; arc=none smtp.client-ip=209.85.221.47 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="ZL48wZOp" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-48444ec4fe2so2070221f8f.0 for ; Mon, 07 Sep 2026 04:48:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788781729; x=1789386529; 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=yRwhjp/IBhSw3Lk79MEayOHDigt6p4gE2z38qX/b6Cc=; b=ZL48wZOpti3aynBPWpPGynZI2qgKLY0zNS1fUFpcLIQglS6snJUPC4zfv2/wc3jXis 3lb6IMLraiECt495MBm2vxbS7UI5hSpsQBrplJQXtohBmDJg+NXSOpCdKrscuP2eB9zD FaLr3nhMF269NK2VxFdDkJoy55ISpS/ie9o3s96bTCBGn+hvd76+Itl67qYzEYXjhXO4 DGIX/h9uFH8jdlBVeXbFkI7IVSDwt3C21TSSuNUwan2fT8zYPUNnBTK+TMdI6NlZbn9C zlwCBAwBSakxKKhKHUzEJFLqioyY4TuYlNjSe/XAbu2Oha5CBbK/8qyYe3PuKFQMkhMG oqig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788781729; x=1789386529; 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=yRwhjp/IBhSw3Lk79MEayOHDigt6p4gE2z38qX/b6Cc=; b=LL94gLwcBHhTnZvftQqFWiTt+lEquXFJaEPDbGnHW2XOohdCRYfxWW3ZlrT4ESzjCy tgAkN3Y+QH9e4ScpXW7WM6s6Lg49rqOucxlq15b8XwUIS/VWDdwpu+hefbg0XUOGlfe3 L4NY/dLQj26ooLot2D9XMLWhSTK4QT84ALnswUhpylAi1I6MKiP5IvSk0BZytUFrRiaO c2vXiIZHDCwwr9U9je+QwlZw/vlS4mkWP/Jq7dGCrAGOzugTWcJv3r+WlJCQTZl6lZLw RzsNLSYmh93xZS7OeOod1t+MBUEqMid3e10mkgG0NiZdKzVSVX1pzYJyzT7cR9LzAPXG Dbwg== X-Forwarded-Encrypted: i=1; AKwUvBxA5mRK32tP/ypAvNY/EtaMrsba+/EItot6jlsXpC5dm4IiN+38O4b/iMR4+qQdMHdHhC6nA8TxhQDcndM=@vger.kernel.org X-Gm-Message-State: AFuF++lFK0ApFTPDGguDv0DLQ7IajipPbX54Ent3PAc0p2V32m7863F6 pvOnd9M+WFOhShxjA2ysv0zmYpfTBhe4pxfXUvYmEZPPrEBXiiCkxFQO X-Gm-Gg: AYBFou2UjWYjLyVk8idNrZ/uQ3KxTmCymJhNonp1nIG34Guc8TY2bvwzFuZoLcNZE29 WjRfSqJr7RYTP/PKidRh19fOAVBJCTEEh3e9PGaIk0dQADBbWrG8wMV1TeZNGGeUdbhfPUV2R50 Omm9uM0UE10HMDhWc7rZzzz/YYo1VaIBGBTuuhwC/xvZlDkHkiia2mZ5hPDHAsDfOqFsesxT0jI 3J8js1r4s3ujZSKdAJWerudZPzR2PG2QsqD6OGqd9mzdSdND4f7GGDiNrOW9ExuDL0L+xPM3yN1 AQPXIx2mDL4FDLIZ+Q/QiJLf/Zenu+aQdtvXxnu6q+aUQwe8cm5HKR/CY8+3t6YoPY7vC6HyIql /dD7mt5Cdn4qwAwwChU8JLm4O6xH4CE+Eh0NbcIqZHEXSe07z7+g16jy+8Tgrq/1SMMdvvG0GoK 1ZFAb0oe0zn2ODgdMbFDdLWNEF2GwjEFTI27xnbn+5OWoMHylDbvA1aBDeDExFYTpEHlSAd7/6Y axKgoL9UCZa064= X-Received: by 2002:a05:6000:4819:b0:482:fc30:a1b4 with SMTP id ffacd0b85a97d-4858704686dmr48239266f8f.5.1788781729120; Mon, 07 Sep 2026 04:48:49 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:178:2f30:d3da:48f5:116c:5642]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-485883c5bc5sm29597421f8f.24.2026.09.07.04.48.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 04:48:48 -0700 (PDT) From: Javier Carrasco Date: Mon, 07 Sep 2026 13:48:41 +0200 Subject: [PATCH v9 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: <20260907-veml6031x00-v9-3-8c93a6c66a4d@gmail.com> References: <20260907-veml6031x00-v9-0-8c93a6c66a4d@gmail.com> In-Reply-To: <20260907-veml6031x00-v9-0-8c93a6c66a4d@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=1788781720; l=6221; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=QCLyoNALvtQOVUWWgKT4N38ewa9Qau0InNlSI5vyyo0=; b=Cbv5IaFVrWUqYWfX5NlAodENPaTLkLKbIgwak6PVWJ1L3B6K4pmUQWMKbME3NXvqwpArEsdWj bqb9dxGO7puA9S72MnCGxXkWLRFXO04tIDd3oGcJYYLQX9Hiqg2SI5s 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). Reviewed-by: Andy Shevchenko Signed-off-by: Javier Carrasco --- drivers/iio/light/Kconfig | 2 + drivers/iio/light/veml6031x00.c | 113 ++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 115 insertions(+) diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index 02291abeff60..462fff1ddef2 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig @@ -745,6 +745,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 f3772577a05d..3d5a27a0baae 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 { @@ -390,6 +414,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); @@ -453,6 +481,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); @@ -484,6 +516,80 @@ 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; + 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 { + i =3D 0; + 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; @@ -573,6 +679,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 Fri Sep 25 23:53:49 2026 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FE534A6CE9 for ; Mon, 7 Sep 2026 11:48:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781736; cv=none; b=anj127Ew/a/fvMWqDERldPsSimEFUugk7Nh4qfWiogildLE3VfBziidyB5xbpfQOc9izxFhdFC8B3auHx8LZG+OUsEEYW8oTLNse04CkevyGMmq9qbG5/hhzb9/6otc6Rt/PuPfFPM/xxURKO2eJaMJ4X2+yyaBP4w1fwlFtnHM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788781736; c=relaxed/simple; bh=gxWBCLJmguTcQLUKIt4zYaCgcNR1riDbZROPEYf8mGg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FxraIU6wsq+Ate2ldJftbyL/HDh49rNrPk9VtYsXy0IjQKnpqWbcntz5NdwWE2BCdNmJO/H1GceuU4WfQEqpFaAZsDPhggFS/Xvarn69Ew5vRuiFnzx5Pxvch6tTpOWyXT5lTxZ1UGqqzc9p9z4xQJLsDC1SKruN4Kxm9OM0dLY= 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=fu09VgTq; arc=none smtp.client-ip=209.85.221.54 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="fu09VgTq" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-4843e9c5960so3450575f8f.0 for ; Mon, 07 Sep 2026 04:48:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788781731; x=1789386531; 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=OxXGhHCE5Y57hJDRc2bnMA9E2sfOegusqTsRsJCvLhI=; b=fu09VgTqlUNFlhpqUCvI/qmm9Hddk4CzGuvL02POmNa0CZPBfNggXDE595N08pXix2 MakKZLTsQ9qfzhRkajZa+fucxnkq3BenMFZ21fryV15EBLKsougOYUvKGcp/ycLH8d1T uxcE4kxs9NbHAJtxZ11Nslfftw/Z4/YFJECXIBuLZnpYitreaH330WCNFsnzmkRX5888 3ho0iBfHJgxDPM+Uspze67CjYMgVMoEdKqsSHgyeHp/UleFG0y5mEdfH/KPCin6kBSgt EEkVXI7Q36+BmbC/wrfsUBDL1Y9u8xTg96AEunKOTFZ1Sl6QsLKLJV1fuGkTJNiNKe// YRCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788781731; x=1789386531; 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=OxXGhHCE5Y57hJDRc2bnMA9E2sfOegusqTsRsJCvLhI=; b=kz4Zu6jgFZbfqkntfAGsVMy41df9SIUhM9p7CFD4mzkD9lxXXbnXyM+wgr0AXJl9nP 1GrsOIjVk/OJKa9IMQxLGVX1iFzIU7RcShH2HvHfA8R6+XiQ59Ou1VOWAME1e/ZfBXwc H/LfZKNDeVqYgIEYiyDC7u+hxDVRn+0FSEcy1A7LiDFadEgJihVacqDglunRq3+0gxQT +jda0yP5debU3kap26c90O6C/vSA4+pPkfro1DCcEAey5IyOyYluAKMWQxAoRPVugXFi +s0s59Cx1DsHc8fGCGXjb3GyLNCluRb3Gti6IDV7wEyPGl9n+1jVpWMkxDTJ3N17a9I4 GpVw== X-Forwarded-Encrypted: i=1; AKwUvBzDGKEAkLuT34LYSioH98Yl7DwlXlXCNC3QjWrJz1Nlp6YgAc33hRNa7YNWAOOsC1z+U93zW8FXyQ+V5qU=@vger.kernel.org X-Gm-Message-State: AFuF++k6mgoaP9Nj/S+CaHB/Qn17EXw0/ghItrMJh54w7DcXGOLq93fr m1kJ7+LW0OFnziLtWvPTQYKDANm0CcV5HU0Um7mpzx6RwAuQ5rxgZte8 X-Gm-Gg: AYBFou1CnRS83RL484WJNCdSw7X8z7P90yM25jDvJpiw3dkV97RhJ3RiK00X/NjKP2G 3SzNf1g0lmN0yYsLeQrLjR4/taxdzRPRTlfXkIcrYlo89BnGx4xC5KWbGdh1Q6DBHpQoQQHnvg2 /ZZlf83/fR1lyyoJuZerXdQFwDoSpb9CzkxeLpxErus4ZZxpeE2RG/BmHV+PT8Isb/uDiRO1uw9 weScT+EBWxN31yZuie0WufZ/AQyslx7unYLyDZ80B2s5aMiUZExe/oDJKsZdlYBBeAy6CpiomZR AqxPF9iF0lPko+DngCgASNqAQVFU4SucuuJXTVnAUhiByBMqdl+gWVBnxIzo/B3fTtwPc0NFoL3 qqrel6RfK7CNPEEJEmn+UhavN3iSifLwYCTpHk1SY/R261RScoaBOgOWUQwUX60qgynGon1GBU3 nUQFPDoOzk9eYw6YXZaiH3/JDkPeNKXxKoVRRX4fIyAqSytUB88ENviLe1zH49dFALQl9bis1YE 3+i X-Received: by 2002:a05:6000:1863:b0:485:83a6:b296 with SMTP id ffacd0b85a97d-485872b8d76mr26817835f8f.19.1788781731128; Mon, 07 Sep 2026 04:48:51 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:178:2f30:d3da:48f5:116c:5642]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-485883c5bc5sm29597421f8f.24.2026.09.07.04.48.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 04:48:50 -0700 (PDT) From: Javier Carrasco Date: Mon, 07 Sep 2026 13:48:42 +0200 Subject: [PATCH v9 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: <20260907-veml6031x00-v9-4-8c93a6c66a4d@gmail.com> References: <20260907-veml6031x00-v9-0-8c93a6c66a4d@gmail.com> In-Reply-To: <20260907-veml6031x00-v9-0-8c93a6c66a4d@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=1788781720; l=24322; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=gxWBCLJmguTcQLUKIt4zYaCgcNR1riDbZROPEYf8mGg=; b=03hZhQJ564QEAYvAYGh3gJzNmBHeptLw88uAD9TzJg4ljJstGsnL7kZdXT6403/EuSBMilCSj TSmUX5fsKeSDk2IEbiaIUJM3OYjewTaZGNiPqJn3YkikqwMuyJvPubC 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. Reviewed-by: Andy Shevchenko Signed-off-by: Javier Carrasco --- drivers/iio/light/veml6031x00.c | 597 ++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 590 insertions(+), 7 deletions(-) diff --git a/drivers/iio/light/veml6031x00.c b/drivers/iio/light/veml6031x0= 0.c index 3d5a27a0baae..110f59625a5b 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) dev_warn(dev, "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 { @@ -181,6 +274,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_WH_L, VEML6031X00_REG_WL_H), }; =20 static const struct regmap_access_table veml6031x00_writable_table =3D { @@ -192,6 +286,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 +294,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 +310,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 +347,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 +462,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 || !is_power_of_2(val)) + return -EINVAL; + + return regmap_field_write(data->rf.pers, ilog2(val)); +} + static int veml6031x00_set_scale(struct iio_dev *iio, int val, int val2) { struct veml6031x00_data *data =3D iio_priv(iio); @@ -395,6 +541,55 @@ 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, enum iio_event_directi= on dir, + int *val, int *val2) +{ + 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, enum iio_event_direct= ion dir, + int val, int val2) +{ + 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) { @@ -509,13 +704,243 @@ 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 { + if (!data->interrupt_users) + return 0; + + 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, dir, val, val2); + 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, dir, val, val2); + 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 (data->ev_en && + (regval & (VEML6031X00_INT_TH_H | VEML6031X00_INT_TH_L))) { + 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 data->trig_en && (regval & VEML6031X00_INT_DRDY); + } + + /* + * 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); @@ -551,11 +976,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; @@ -609,6 +1106,79 @@ 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); + unsigned int val; + __le16 regval; + int ret; + + regval =3D 0; + 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_trigger(struct iio_dev *iio) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + + 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); + + return devm_iio_trigger_register(dev, data->trig); +} + +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_trigger(iio); + if (ret) + return ret; + + return devm_add_action_or_reset(dev, veml6031x00_disable_event_action, da= ta); +} + static int veml6031x00_probe(struct i2c_client *i2c) { struct device *dev =3D &i2c->dev; @@ -631,17 +1201,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"); @@ -669,6 +1237,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, @@ -679,6 +1251,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, @@ -686,6 +1262,13 @@ static int veml6031x00_probe(struct i2c_client *i2c) if (ret) return dev_err_probe(dev, ret, "Failed to register triggered buffer\n"); =20 + if (i2c->irq) { + ret =3D devm_request_threaded_irq(dev, i2c->irq, NULL, veml6031x00_irq, + IRQF_ONESHOT, iio->name, iio); + if (ret) + return dev_err_probe(dev, ret, "Failed to request IRQ\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