From nobody Tue Sep 29 04:10:47 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 02E08397950 for ; Wed, 12 Aug 2026 20:27:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566478; cv=none; b=af64Yaat2lJaI3MluZmZUXUa0gzF8hXhdZaglV5K8tNVWaUtCfwYy5GL72+LckjmfqLJ3MFyfa1qWShTdXtP8YRdFBNKdSvqQq/G+RVKnk87V4zV3U6K6vpNwHM7jfajBGHvaYhwfdxScELv6pVX7BCGGY0dp67bK8E4pF28K7E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566478; 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=KF/+uzG1thUUtJFPrQalETy/ECML44aqikLGTSyajllPQMtnzh/iHA8sabw6uDN8Sl4RFx3BTx8vEXLaoamuRTryWqo6suNFXmlkJYqIm3nFOSTrfHvlBuhCMui9tcrKQ4u5xwa4HzaVrBYWIQpUtTkCJTyq2Ydt1beOvnlPmJg= 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=EnMd7x7t; arc=none smtp.client-ip=209.85.128.45 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="EnMd7x7t" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-49558ce01afso10917235e9.1 for ; Wed, 12 Aug 2026 13:27:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786566473; x=1787171273; 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=EnMd7x7tjPQ1Q5yXNtdg4M+ZBs9/cFu63vIXc8dA4/nRhxAW9IVcLRmInQCCLxrtyc R8eFDNqxsxAZJ63n+xAQNYHx4H5V+QC3iBLcFZuHDtcL26eR3CUuq35HkWsg4Fmpul9n yqUEbruL9p76rTfSqkU1DYUZcaWoDTq8jTOa1TAL9Gr1uSqzdTJJpB94TjvJzCQ7gmz5 BSnc/6HxvQ6PlqtD8f0Spde0j/IpBZClzyAU43zNoY2jQIv4r5efCWw6u3LuGV06JSLd bSSm1N2yurLfbXuw6xbROtSyLTogKqT4oGMeFV1tR80/zv9g7sWqHV5N7x9bl2yhfcmN ojPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786566473; x=1787171273; 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=R+qvgwduuPReER2U6I8IqJWrMLOyZlY4zZmlXBI/Ejnxo983HVmOq4re7yjhdg7tHx iJLtCXlYMbkcOjo2DweoKs0WR9SIwnpiV6irwTcb/aCieGet4swnjuMUeqkY7bXyGqa0 dCOcVn795LLzjArmLdxcKa0kLystUDB0NPhBD7lqhzeHtafH09zICrv63qUU5rJCEInX SExSnzjSwTByP9W7c35rXAAmn92jbnR4aXuW9VhiXHLf+cW/HWdyD57LLrVNaLR+Os41 KD+jfzl/96pyEs0nilaYlvQWuml2JWMdV2BLuevtooBXj4lcdU++KZnrGGnj3BMKFCeE nmxw== X-Forwarded-Encrypted: i=1; AHgh+RqJTFhDTQyac8TuRNSQLlouj71ZjUy6d0sSn69DgAidRlJ8T4BykDMKNmz261DXH4FKlTT5N/wfGCcSoh4=@vger.kernel.org X-Gm-Message-State: AOJu0YzQogvZaEYiY4BSuZ20GIbhQkCAyQtInMcDv1Ps5hmbN3tuyWGP k7W3XXfGMDV8+pKAS62lM+Yd+Bj4iL293jrA6TIrBuZHXDnWpYHzoUnc X-Gm-Gg: AR+sD13S7XuzpGXrI/3YpQQmuZ5tDfh5EbcSs88YxvHqX+3rxUT0VQIwZnVgKlOVhLW WgsKpMPMACwHrRa9gQA5bwqzriC6fVPh+H/AODj64qfCQr3977JVwJnsfJnptJlSgUGGBO8k5nx JVhbyjWcegmimGbeSEuEXk6+WuHdFel72CQJSF2oY1RIQAmeNAVvM//dGqMCQOv8WdcFWf22Dh2 44CRM8Yp97g8erug9Iz/KEEDJX+lV43k0eUYUb6rXTkmVjuv//4gUfpN1XCStVzUN1I/QP4WGnM GHLEW6mxQqtI1NEN4piM3fy2Kuua1ghTgogJ2MwbIpB0dx52fe//GiFtnpthHq38B/286YsJB3g s342w2AoVmgZjdCFS/XdOKSc5gy3s5nvMZLog0ZDLSA41KD3IXTw8XaonaOtS3LjTbgA00dhzXt mvp9U6SIo6U/Vt3IvbpulNn0cT+3Tonr/VRH7yXxCWjk4lXIEuohc+mmzhNxBOKliN235eWxCWm dZt X-Received: by 2002:a05:600c:4e87:b0:495:4859:8f9b with SMTP id 5b1f17b1804b1-499821add3amr3159625e9.9.1786566473100; Wed, 12 Aug 2026 13:27:53 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:16f:15e0:179c:a67f:8487:260]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981b03e70sm13911725e9.3.2026.08.12.13.27.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:27:52 -0700 (PDT) From: Javier Carrasco Date: Wed, 12 Aug 2026 22:27:40 +0200 Subject: [PATCH v6 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: <20260812-veml6031x00-v6-1-7eef6e4ce290@gmail.com> References: <20260812-veml6031x00-v6-0-7eef6e4ce290@gmail.com> In-Reply-To: <20260812-veml6031x00-v6-0-7eef6e4ce290@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=1786566469; l=3092; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=aaM+chNBUVzOK+71XSf/Mb82WOTb5qO+DxTTOj0UyJ4=; b=L2rc1mZOwca++QUVNKzBpIcHBD/wO9rBu7CiYuOmSh9z9lCXhfdTAnvhlKptNWoRw35L577CZ SxXPI/S75yZCaUN1XfjspkSNKIOYuEcjZQehXT1JljRO9hTNLrtk1uI 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 --- .../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 Tue Sep 29 04:10:47 2026 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 8B4DD398910 for ; Wed, 12 Aug 2026 20:27:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566481; cv=none; b=heifINvRToYc4rCOiccdnZ6K3Vr6q3l/JuZSGMBzRzlFOv3WwFCpNu84HDzemnuIg57UDXn5A+7Nu4Z4qebdyZAE+omtQJTs2SpqgzfMCDzNuGd5OiapuCAnxDC4wTc8kABlCIywWAL+VP4dcKcAADLoiGN0ib5MxnxbYuyQbS0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566481; c=relaxed/simple; bh=ikF5EsRrDPCQ2e3NZf9ZmiNgqlLGU221gxatBhk2VT4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NBbY47BpVzuCwnTw18BVEXyivzXI0YDtt1jEQQ7LudiiF9vBFKeJPr3MNPfBrJebVQ0OkA6SySXY0kG+wFC2d/xQNZ1tCFjF5WUAUvWqYLWjWDb9sizPJVqefyYPDfaM9odh7Wm4MGC8UUXrWTjS7G3PaQQsHyMvf25+VKCfT6g= 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=mMFMZYhC; arc=none smtp.client-ip=209.85.128.51 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="mMFMZYhC" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-4953de5be0aso9835975e9.0 for ; Wed, 12 Aug 2026 13:27:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786566475; x=1787171275; 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=lQR17Jy6lleu1+v0+GCKAb+enu+n7feV4TURKYYXeEU=; b=mMFMZYhC1zFwcPoi3TkIW/SJcgBEza8mnmjyC0YWDmYTrRGtBg/ZjNSGLPONKWUfFm vKePav1SG6q2Kzb59ooSMKwk6jLEl0SR805OsMwoLg45JwYaOTWGBGsxl3Lc4U5nGJjQ 4K1T0g5peP9hko8M5Mn6V+UKqMf9KSj4riEiQOS9o+ruQmvWX8WCY4K3DM7LJ+yPbIGv 9bRpDT3vRcQ7A0cLB7P1yFFq+RHLn5oDOj4cAUxViPf6X7pv+de0uQ86r+mJ6BMHvjHj hrxT6XIA9jbd9NnuL2OpL0vlHInL+VQgEoWB8D+YfY6e86HIqT3u9/AzNeLOA61LMOjc NZhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786566475; x=1787171275; 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=lQR17Jy6lleu1+v0+GCKAb+enu+n7feV4TURKYYXeEU=; b=SJ/bbjjlSQghSDJhyltgtXgPdmH/RVXyGMtb1qb0VYIgihSCnT6TWZM/QsdMtnfDaX cq17tLOu8QILW6nhWhxx3UxJVVC4NOCU7yeyCgtHKYgIGrSN6sg0I/lhSMPi4GaMj2MH kaN6J2tIXl7jz2ydOza/SDZfflDG39UcyB518vF5Jx+pdO4JqQsP69/O5WHv+p3QNyAz HKAApJ1hJ6Dzmci03IF0ZqvQOt418Zob+CHG7tUNpv8U/2tx9AquDnwLM+T/o0u+AbHB qhxCnUGd6uqfOfWIX6NuWe73hIvBI4qyG5Be5HL8MwJ+sLX8aMBcgPbfv1HpKzKH3/su uY4w== X-Forwarded-Encrypted: i=1; AHgh+RoFwpysZiWOoxjWOpKa+JLkSjXFehHZDedrwEh4qqvFETps+p7cJK2SBrIBP38ALq3Olw+UM2HjKMFPUdo=@vger.kernel.org X-Gm-Message-State: AOJu0Yyr5Y+KM/EscIl1gJEmS7c5SdTUx71af+eKLtyTsDWLHyOQjJXE dNcTepkMqNxNsjbuARW725/cqLXlxQy7VFGngVVStvzo02Z8zxUvh47U X-Gm-Gg: AR+sD11k0ATxBymkR8q3/mpAoXWX+KLY0cG0lj32UTNqWPU3UtsCi9ptuq2dY6+umqI IpA72xuKD8Peh2Dm6GBTod/wMWzZp5uwYcQgV5Fmjb2eHl5cGMYYQG/EZQkH8t3GgC/h6PEgJbJ Be3NzEufACHtVW0imU7WZCz3rEapK8SfdZVv2/CIXr12PO6g+AUJFm/PBNYrIAGy48U7iynTpUR Kz85f/SDVT8RTPjP1HjZJnmEhIdedJswKU2Q43fiSDULvwHEMCbipcvteKeY07hGPp7uX/PUOpA kKM9xVE2Gii7TCDHjG8m1aqE7VOSAmr5k3/UaVW9bphvJbIp3BIHb7wO8J1pvy1L2AaN4b6JyWZ 5mUAe8fDb7VQyKTnz5uzOg/0D3yUu5Q+PvO1bgHccmrZW07ZMhQC3f0HrhB2LBQkFG/ZRv7t6rG GlgqWO9qn084CGGmPhVBTEhpnCh7pkcyO0TUGCPwOJsor3+TF8GKnM4pm1aERYDRC5oIyqXe+/F XQV X-Received: by 2002:a05:600c:8b54:b0:493:a613:56b2 with SMTP id 5b1f17b1804b1-4998216b3bdmr4971985e9.8.1786566475073; Wed, 12 Aug 2026 13:27:55 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:16f:15e0:179c:a67f:8487:260]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981b03e70sm13911725e9.3.2026.08.12.13.27.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:27:54 -0700 (PDT) From: Javier Carrasco Date: Wed, 12 Aug 2026 22:27:41 +0200 Subject: [PATCH v6 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: <20260812-veml6031x00-v6-2-7eef6e4ce290@gmail.com> References: <20260812-veml6031x00-v6-0-7eef6e4ce290@gmail.com> In-Reply-To: <20260812-veml6031x00-v6-0-7eef6e4ce290@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=1786566469; l=21890; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=ikF5EsRrDPCQ2e3NZf9ZmiNgqlLGU221gxatBhk2VT4=; b=5F6Un2XbWVa2Ahnx7UK7wtfQZzmgfE0/6NTdzt564pJthJOB3xWB60gckH+V1VsZli2Ou9emx 9C6jw+kvcALAYQacKuKiOynGt0Khn5bd6Z333qeSqlINC3TMDK3LMcR X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=Lge8w8xidNSf/INy7JAIbAW+Hezkp3nsBh2OjKL7lLU= These sensors provide two light channels (ALS and IR), I2C communication and a multiplexed interrupt line to signal data ready and configurable threshold alarms. This first implementation provides basic functionality (measurement configuration, raw reads and ID validation) and defines the different register regions in preparation for extended features in the subsequent patches of the series. Signed-off-by: Javier Carrasco --- MAINTAINERS | 1 + drivers/iio/light/Kconfig | 12 + drivers/iio/light/Makefile | 1 + drivers/iio/light/veml6031x00.c | 696 ++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 710 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..021bf726c60b --- /dev/null +++ b/drivers/iio/light/veml6031x00.c @@ -0,0 +1,696 @@ +// 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 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_update_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_SD, + state ? 0 : VEML6031X00_CONF0_SD); + if (ret) + return ret; + + return regmap_update_bits(data->regmap, VEML6031X00_REG_CONF1, + VEML6031X00_CONF1_IR_SD, + state ? 0 : VEML6031X00_CONF1_IR_SD); +} + +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 device *dev =3D regmap_get_device(data->regmap); + struct regmap_field *rm_field; + struct veml6031x00_rf *rf =3D &data->rf; + + rm_field =3D devm_regmap_field_alloc(dev, data->regmap, veml6031x00_rf_ga= in); + if (IS_ERR(rm_field)) + return PTR_ERR(rm_field); + rf->gain =3D rm_field; + + rm_field =3D devm_regmap_field_alloc(dev, data->regmap, 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, data->regmap, 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); + int ret, gain_sel, new_gain, prev_gain, prev_it; + unsigned int gain_reg, it_idx, pd_div4; + bool gain_in_range; + + if (val || !iio_gts_valid_time(&data->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(&data->gts, it_idx); + if (prev_it < 0) + return prev_it; + + if (prev_it =3D=3D val2) + return 0; + + prev_gain =3D iio_gts_find_gain_by_sel(&data->gts, + VEML6031X00_GAIN_SEL(pd_div4, gain_reg)); + if (prev_gain < 0) + return prev_gain; + + ret =3D iio_gts_find_new_gain_by_gain_time_min(&data->gts, prev_gain, pre= v_it, + val2, &new_gain, &gain_in_range); + if (ret) + return ret; + + if (!gain_in_range) + dev_dbg(regmap_get_device(data->regmap), "Optimal gain out of range\n"); + + ret =3D iio_gts_find_sel_by_int_time(&data->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(&data->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); + int gain_sel, it_sel, ret; + + ret =3D iio_gts_find_gain_time_sel_for_scale(&data->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 device *dev =3D regmap_get_device(data->regmap); + int part_id, ret; + __le16 regval; + + ret =3D regmap_bulk_read(data->regmap, VEML6031X00_REG_ID_L, ®val, + sizeof(regval)); + 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 ID %04x\n", part_id); + + return 0; +} + +static int veml6031x00_hw_init(struct iio_dev *iio) +{ + struct veml6031x00_data *data =3D iio_priv(iio); + struct device *dev =3D regmap_get_device(data->regmap); + int 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"); + + 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, -EINVAL, "Failed to get chip data\n"); + + 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 devm_mutex_init(dev, &data->scale_lock); + if (ret) + return ret; + + 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"); + + pm_runtime_get_noresume(dev); + + ret =3D veml6031x00_validate_part_id(data); + if (ret) + goto err_pm_put; + + ret =3D veml6031x00_hw_init(iio); + if (ret) + goto err_pm_put; + + pm_runtime_put_autosuspend(dev); + + ret =3D devm_iio_device_register(dev, iio); + if (ret) + return dev_err_probe(dev, ret, "Failed to register iio device\n"); + + return 0; + +err_pm_put: + pm_runtime_put_noidle(dev); + return ret; +} + +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 Tue Sep 29 04:10:47 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 92E0D39B956 for ; Wed, 12 Aug 2026 20:27:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566482; cv=none; b=nJXkUtTuHuvGwXiGYFN1HLH6Z6QtfIF0KKYxo0lsUv+gH/4mDtXwF3KjHsLf1rFFFkQUFk5TwmjiC28MlCW3YwmirHGaKSbsf5enf+U9HnQv1tWPVCaYTmfC8/8EQA2clIfEBjAVihTcw03ruDTGelWXqhTyjjAZ8u9K3HO6QvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566482; c=relaxed/simple; bh=mZWcrlYjY//9rQAddGilLIxqCK5ZjF6fhciasIp8Ero=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=sdEJVb0BIyTgsItOvK18Jt194KublZR6lEFFDsknFsz2BMfPZF8IrmW2+hW3r0iDH5sizIKKawo3+Cv2JwgaPPpAwAetQ14NxkWlgLnrI0/G1lxzFhDZ4nQ9wJnen9Ih7E826R+VnuEqrj4FzNG5nn2Q/e6ilx/ekCEbiZdjXs4= 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=QETLWmc6; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QETLWmc6" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4954a9e8490so1552995e9.1 for ; Wed, 12 Aug 2026 13:27:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786566478; x=1787171278; 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=c68EQofm7oM0lVUYZUc75pHfBtTFDbVVctq7EgUpEL8=; b=QETLWmc62iRZzOHDG5TdBhiLi6z47x1fkijpsKge+seqOvrIHrlpQ5vm6v/l/y+SS2 jDilTpdfAHi/ywGmlx7xEuQu5Kt2yDmiZnKiz+oH90homq5s+zQkwSDQNYotRAUnAy5Y 6Vy+eZmqGLvt8VamYXVCIECO8AESVxACLEEGrpDV9lre+i8hoJPM4o8Ax7ZIIgSZgu3y A3rrHO0vA0CQhNPrbH58Bhlm1CMLX0Vld6ZokUL9+jPDb2FkQlcVmIYPaVLxUrXOG34d PF4p2dIqDlbrwGA+y5jcEc3Tu3T8h42bRDWJle9G8kTWsjQwUt0PVf240HrN+29lFWzA 5h5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786566478; x=1787171278; 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=c68EQofm7oM0lVUYZUc75pHfBtTFDbVVctq7EgUpEL8=; b=pIDiTwpOzBQzP83QEbDj+T8E+WUZxR5rXp3J04jwDAxN31TGwdvtBa3sXGz/7wc1oo AwyuHENTLZ0cqADudRa92wo8soA5XvRwgoZL4XR2l+39wHl+XAkksEWRRud6Nt7qT7/q kvZz3jOUBALL/rsz8V/Qg4E+zyrsHGi3kvSeB9QM7+/w8q1Yw4kC9ji4KqavhobuoWCR wmOxosASSkjwImmQin6qmXQyje0jSm5ZzUGC6smHR7635bksD0esE0zNGlibj1NWxNsn Zd2TWPk5C6sRRT53jk+EJSQlKkp32cP/Z9r9rGHCXRps+9hiDdtPjz/J2ln18pg07oF5 CFzA== X-Forwarded-Encrypted: i=1; AHgh+RosVd5GpavCPYJtVqVy4rEXQTE8mYLN+REKXHmiqN2jmKe2PIPxtLwtEJXtA2JLRQCEd0audDRetvx3rSw=@vger.kernel.org X-Gm-Message-State: AOJu0Yz0adl+wdBejEdHQoP5OGnO5ngApjLWAYhFbwZTgFijJU4NFBw4 oSpyRI29OMWkweVoaIDvZYIQjY+oSsTu4f8O1A/jxis5zXhA+07opFrB X-Gm-Gg: AR+sD12X8XXxaDcrw66MR7840tEY03YqqIT6OZNacUVAeArJSPm2yxh9KxTmXkSzju+ FLXW7o1K7BkEkwtRFRqPzvq3eVRpxAvwXvMLk7jQiCwVOWM8HQaK+Lm2XZ10wzH5x3NgW/pzL/d ukZVNGg/UtdiG4EVx7EIYlXyFBDGzhfhWyt3j9kBKDbiMiQOuc0BtaU1l3aFPuk3uNMRWiDN5pr XvxyHmjvwFWbs8eUnC22EmpubF9RInUvqOt7YsayG0WPymERUN+M7mWkZAU69g7vBT9D7Au6wdC Boxs06B7Itle5LmQs8hZxpQGOEj+9gQz4CYZhEnhT0TxuZnXcSvL/BL55NpJcYNgDmuXNyohv3h 13eb3Osxbvy8wj2rgnatF2+LUKMGhYhMohQetJ5i1ycCSHDChi7CY/eoFDLqy8d8bi3xO6fNF57 c9KDdqbDkl6nm9hOLHa9rOgFN+pZMx4u8ZVIY8mkj7xxSWi6JswX6BRvY6gxPWWI4S9ck5iR09Z 8Us X-Received: by 2002:a05:600c:19c8:b0:495:69eb:27d3 with SMTP id 5b1f17b1804b1-4998220c7bbmr1684675e9.8.1786566477645; Wed, 12 Aug 2026 13:27:57 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:16f:15e0:179c:a67f:8487:260]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981b03e70sm13911725e9.3.2026.08.12.13.27.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:27:56 -0700 (PDT) From: Javier Carrasco Date: Wed, 12 Aug 2026 22:27:42 +0200 Subject: [PATCH v6 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: <20260812-veml6031x00-v6-3-7eef6e4ce290@gmail.com> References: <20260812-veml6031x00-v6-0-7eef6e4ce290@gmail.com> In-Reply-To: <20260812-veml6031x00-v6-0-7eef6e4ce290@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=1786566469; l=6202; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=mZWcrlYjY//9rQAddGilLIxqCK5ZjF6fhciasIp8Ero=; b=zScNwt7GUsruoRxLmTZSMCFZ+JNKQHf0jKi353MfKqfPQs+KWe7BrsEg/YtV0PxwFdqS8cB00 7vAwj7Ku2vdD7L3ezDBPwTMInth0OaOLhmX6PgKoRil7Go6pfvA3NaV 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 --- drivers/iio/light/Kconfig | 2 + drivers/iio/light/veml6031x00.c | 117 ++++++++++++++++++++++++++++++++++++= +++- 2 files changed, 118 insertions(+), 1 deletion(-) 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 021bf726c60b..43a701f62aea 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; @@ -137,6 +146,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, @@ -144,7 +160,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,82 @@ 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); + 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(data->regmap, + 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(data->regmap, + 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 device *dev =3D regmap_get_device(data->regmap); @@ -587,6 +695,13 @@ static int veml6031x00_probe(struct i2c_client *i2c) =20 pm_runtime_put_autosuspend(dev); =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 Tue Sep 29 04:10:47 2026 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 9615A39CD1F for ; Wed, 12 Aug 2026 20:28:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566484; cv=none; b=Ak5ENC7jdqz4jTz0y0nG9xeLmTiB/NfkoaFc9waPXvwpGvqm86bA1+VxTdmCAXYYbeVXDL8ULX6y3bxqKIcc5hwFgyjSUHzV6uWF+qdOXTpL7R4rKQxxu6WtJ1F/tg2oK8ZQMuEPNohQcfO78e6ZSoAXQMHIxi6xbIbYCi5km08= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786566484; c=relaxed/simple; bh=Jmwp5W9ocJLKQIyWVChbhUF2z9e8EYdskBmvhqsv1sM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=f6sojlWmZtiXeAbIq10uWBmaYzODRjviEU51bNXDgtHoF6f5GkLFevLX9rvpMMoM2pSzVFRriNDQtrYRltOT32GrRgVDeqxrSawEpwVdRCcnqfxhNlDGx7KuzUJuCND4Bu51cHMq0AU3FQvekfk7Ub7EaUaytdKP4Wjqg7l8/Mg= 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=F2ADshV2; arc=none smtp.client-ip=209.85.128.45 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="F2ADshV2" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-49954b88fffso150885e9.0 for ; Wed, 12 Aug 2026 13:28:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786566480; x=1787171280; 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=93CJBJv6OS9Vk7US5Du2ob8OOPoYZ9b/7eod01+bRNI=; b=F2ADshV2Y5AQmpuktE/5czgkQ3ZkiYmx33MO5v1Zm/oAIhbthjHAIqg0PR7Jj5FoaP /xD/raXMAZPkztHRVA2HrDdhxprC07BO5EWFs2BIo0KA0tFl2iPQ1PHGFu9u5EDB0x6U dW0/YGCg+cWSJy38yO2kxD2twd/mHSkocHjkEqATyT+qTtYz4G0jz4dsDdFW+vZ0qkGr 1V6+9k2leLHaLCobFgIMpJKSut/yYSb9kFwN7qfWo1DhlvNm5oecBHVAFri/1Gu/qAzM 0m9Wgj8m4vX+QDl+UZDWp7BWk+INu8DZs8cxz0EZD0YueseZB2KUqzouQNg7LXaNQLGB kG2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786566480; x=1787171280; 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=93CJBJv6OS9Vk7US5Du2ob8OOPoYZ9b/7eod01+bRNI=; b=d4sj7k/YMhs+fyeUii25HFFPztRhGmALvGQyAYhmQcocSkvFG1XGvpJNEAF5MM7Bck guPmQ4XFHF/C2dwmT3VrM9S8Si/y97vUC320fw4Ix1yhB9wpLsDVgJP5A7GlEtEVzvjw L6rIsOeB/yB8i1j16TbgdhBPvuN5NezOg4CoK5eXjNIb7L/jCI52VZqdOvvW/RHFBX0V 4vM2XIrQLLO0DUFOP73h63V/4FTrn5X1ETztXN7Ut5UPhM5+E0YCD4owlmJS2ppJg4iS aPTmlJqFlMLCkrOadDSF1r0nRtgbLaFlSE2qdc6AzSsymA8oY+DBvBxCzTAsQUUWz8ri 0PpA== X-Forwarded-Encrypted: i=1; AHgh+Ro9STzFyk8RmQ5zclKM+vxVYatDAsP20OHbL0N7AsbZy/4X+1LcGKxwJ/zybTfD8GvasHx0/iXdi0GEhmQ=@vger.kernel.org X-Gm-Message-State: AOJu0YwZnelA9GnQn7BdwYkVNQchwx1pFrgxH+QS9D/V6Oev9DV08pHn a2Vqnfn48GFJuPWyqTDzC0Bir0qJ5syhI6rN9AKJC+rxufjzL70n3lAC X-Gm-Gg: AR+sD10iULYQqsgCuQcuftEzgwwp70RpepLRGNRLcYoKkh6yT7s8r1HYZ/t9FSFI2NC zmLFgw+FZdssAz42mmTZRlDltHYnxagu69by0dgrjCiuTqd73ZYk6EuOL4ROCcVft8yeZJTMhvM AqzIuPIRv1J6WtoL4+5AyQXNwCP1O90IuelaYiMRz2QtSVtBaQ0oliZQWum7XvtVh4RHm4WWKjE PHEff2lIa/8BJaBL6ckYyN1fBksU037xHBoQoAZMqpwwWm/HLMVHywSxoKr7t+HxD8fWOlTHQan 3xdtsL4Xvolq2HTwGX/kmcCkmSHz1vePcUJsimo4VjP4tZDPJShPGfk8KrwsXQ2q6wFas3b1nIi fRXGi8iwTyGo5BMGEKQaYlaOMfPS1Zd82RmfSfLzCG5ZHnkGJn7R2K774Y7dhUimKI1TDt5dRRy p4SLllwOMF2/1K4iOl4WXuDJElWDCSP6tuadZdgABfcuMh4oaRefZhI22iJHmEumWVJFK8xCFr2 6eI X-Received: by 2002:a05:600c:a4b:b0:495:5858:8101 with SMTP id 5b1f17b1804b1-499821f2e1bmr2793175e9.15.1786566479456; Wed, 12 Aug 2026 13:27:59 -0700 (PDT) Received: from [127.0.1.1] ([2001:4bb8:16f:15e0:179c:a67f:8487:260]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49981b03e70sm13911725e9.3.2026.08.12.13.27.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Aug 2026 13:27:59 -0700 (PDT) From: Javier Carrasco Date: Wed, 12 Aug 2026 22:27:43 +0200 Subject: [PATCH v6 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: <20260812-veml6031x00-v6-4-7eef6e4ce290@gmail.com> References: <20260812-veml6031x00-v6-0-7eef6e4ce290@gmail.com> In-Reply-To: <20260812-veml6031x00-v6-0-7eef6e4ce290@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=1786566469; l=22805; i=javier.carrasco.cruz@gmail.com; s=20260111; h=from:subject:message-id; bh=Jmwp5W9ocJLKQIyWVChbhUF2z9e8EYdskBmvhqsv1sM=; b=hfq1S71HuBtV/GpXjFytfpkpXR7ejD7hha2jTwXsd6Uofd2/5/0jEQGfXeMobkR3xlWF+AAuM +jUtNoGtZW6DhA+u8Qyhn/fSdvnRvI9ZZQK2CBY6l6Tr3v+FwJXUCJL X-Developer-Key: i=javier.carrasco.cruz@gmail.com; a=ed25519; pk=Lge8w8xidNSf/INy7JAIbAW+Hezkp3nsBh2OjKL7lLU= The device provides a shared interrupt line for to notify events and data ready, which can be used as a trigger. The interrupt line is not a requirement for the device to work. Implement variants for the cases whether the interrupt line is provided or not. Signed-off-by: Javier Carrasco --- drivers/iio/light/veml6031x00.c | 545 ++++++++++++++++++++++++++++++++++++= +++- 1 file changed, 539 insertions(+), 6 deletions(-) diff --git a/drivers/iio/light/veml6031x00.c b/drivers/iio/light/veml6031x0= 0.c index 43a701f62aea..6dc7ea7e8a4f 100644 --- a/drivers/iio/light/veml6031x00.c +++ b/drivers/iio/light/veml6031x00.c @@ -25,6 +25,9 @@ #include =20 #include +#include +#include +#include #include #include #include @@ -32,16 +35,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 +68,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 +82,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 +91,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; + int int_users; + bool ev_en; + bool trig_en; }; =20 static const struct iio_itime_sel_mul veml6031x00_it_sel[] =3D { @@ -107,6 +133,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. @@ -137,6 +174,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, @@ -171,9 +225,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 { @@ -182,7 +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_CONF0, VEML6031X00_REG_WL_H), }; =20 static const struct regmap_access_table veml6031x00_writable_table =3D { @@ -194,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 { @@ -201,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, @@ -208,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 @@ -237,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, data->regmap, veml6031x00_rf_in= t_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, data->regmap, 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, data->regmap, veml6031x00_rf_pe= rs); + if (IS_ERR(rm_field)) + return PTR_ERR(rm_field); + rf->pers =3D rm_field; + return 0; } =20 @@ -340,6 +459,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 +538,53 @@ static int veml6031x00_get_scale(struct veml6031x00_da= ta *data, int *val, 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 +698,221 @@ 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->int_users++; + if (data->int_users > 1) + return 0; + } else { + data->int_users--; + if (data->int_users > 0) + return 0; + } + + ret =3D regmap_field_write(data->rf.int_en, state); + if (ret) { + if (state) + data->int_users--; + else + data->int_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_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); + struct device *dev =3D regmap_get_device(data->regmap); + int ret; + + guard(mutex)(&data->irq_lock); + + /* avoid multiple increments/decrements from one source */ + if (state =3D=3D data->ev_en) + return 0; + + if (state) { + ret =3D pm_runtime_resume_and_get(dev); + if (ret) + return ret; + } + + ret =3D veml6031x00_set_interrupt(data, state); + if (ret) { + if (state) + pm_runtime_put_autosuspend(dev); + return ret; + } + + data->ev_en =3D state; + + if (!state) + pm_runtime_put_autosuspend(dev); + + return 0; +} + +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); + + data->ev_en =3D false; + pm_runtime_put_autosuspend(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 +948,78 @@ static int veml6031x00_buffer_postdisable(struct iio_= dev *iio) return 0; } =20 +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); + int ret; + + guard(mutex)(&data->irq_lock); + + if (state =3D=3D data->trig_en) + return 0; + + ret =3D veml6031x00_set_interrupt(data, state); + if (ret) + return ret; + + /* The AF bit must be updated before updating AF_TRIG */ + ret =3D regmap_update_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF, + FIELD_PREP(VEML6031X00_CONF0_AF, state)); + if (ret) { + veml6031x00_set_interrupt(data, !state); + + return ret; + } + + ret =3D regmap_update_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF_TRIG, + FIELD_PREP(VEML6031X00_CONF0_AF_TRIG, state)); + if (ret) { + regmap_update_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF, + FIELD_PREP(VEML6031X00_CONF0_AF, !state)); + veml6031x00_set_interrupt(data, !state); + + return ret; + } + + data->trig_en =3D state; + + return 0; +} + 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_update_bits(data->regmap, VEML6031X00_REG_CONF0, + VEML6031X00_CONF0_AF_TRIG, + FIELD_PREP(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; @@ -612,7 +1078,8 @@ static int veml6031x00_hw_init(struct iio_dev *iio) { struct veml6031x00_data *data =3D iio_priv(iio); struct device *dev =3D regmap_get_device(data->regmap); - int ret; + int ret, val; + __le16 regval; =20 /* 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, @@ -624,9 +1091,54 @@ static int veml6031x00_hw_init(struct iio_dev *iio) if (ret) return dev_err_probe(dev, ret, "Failed to init IIO GTS\n"); =20 + regval =3D 0; + ret =3D regmap_bulk_write(data->regmap, VEML6031X00_REG_WL_L, ®val, + sizeof(regval)); + 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(data->regmap, VEML6031X00_REG_WH_L, ®val, + sizeof(regval)); + 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(data->regmap, VEML6031X00_REG_INT, &val); + if (ret) + return dev_err_probe(dev, ret, "Failed to clear interrupts\n"); + return 0; } =20 +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; + + iio->trig =3D iio_trigger_get(data->trig); + + return devm_request_threaded_irq(dev, i2c->irq, + NULL, veml6031x00_irq, + IRQF_ONESHOT, iio->name, iio); +} + static int veml6031x00_probe(struct i2c_client *i2c) { struct device *dev =3D &i2c->dev; @@ -651,15 +1163,16 @@ static int veml6031x00_probe(struct i2c_client *i2c) "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; =20 ret =3D devm_mutex_init(dev, &data->scale_lock); if (ret) return ret; =20 + ret =3D devm_mutex_init(dev, &data->irq_lock); + if (ret) + return ret; + ret =3D veml6031x00_regfield_init(data); if (ret) return dev_err_probe(dev, ret, "Failed to init regfield\n"); @@ -685,6 +1198,12 @@ static int veml6031x00_probe(struct i2c_client *i2c) =20 pm_runtime_get_noresume(dev); =20 + ret =3D devm_add_action_or_reset(dev, veml6031x00_disable_event_action, d= ata); + if (ret) { + dev_err_probe(dev, ret, "Failed to add event cleanup action\n"); + goto err_pm_put; + } + ret =3D veml6031x00_validate_part_id(data); if (ret) goto err_pm_put; @@ -693,6 +1212,20 @@ static int veml6031x00_probe(struct i2c_client *i2c) if (ret) goto err_pm_put; =20 + if (i2c->irq) { + iio->channels =3D veml6031x00_channels_irq; + iio->num_channels =3D ARRAY_SIZE(veml6031x00_channels_irq); + ret =3D veml6031x00_setup_irq(i2c, iio); + if (ret) + goto err_pm_put; + + iio->info =3D &veml6031x00_info; + } else { + iio->channels =3D veml6031x00_channels; + iio->num_channels =3D ARRAY_SIZE(veml6031x00_channels); + iio->info =3D &veml6031x00_info_no_irq; + } + pm_runtime_put_autosuspend(dev); =20 ret =3D devm_iio_triggered_buffer_setup(dev, iio, --=20 2.43.0