From patchwork Sun Mar 17 15:47:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10856395 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A2B7615AC for ; Sun, 17 Mar 2019 15:48:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C31528630 for ; Sun, 17 Mar 2019 15:48:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7FF59292B4; Sun, 17 Mar 2019 15:48:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DA6E28630 for ; Sun, 17 Mar 2019 15:48:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727376AbfCQPsL (ORCPT ); Sun, 17 Mar 2019 11:48:11 -0400 Received: from node.akkea.ca ([192.155.83.177]:34228 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726784AbfCQPsL (ORCPT ); Sun, 17 Mar 2019 11:48:11 -0400 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id D1B0C4E2051; Sun, 17 Mar 2019 15:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837690; bh=s+6m1sYsHHJqUIM+QrwqYy+oYJGYPAMDNtRdXukaGbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wTxv4dNQUR9r3V1sZ/19c2+snMijeIp3ZidSKTtAmpQPGb5b+9tljfKo1yeUO4s8e sgt12Yw6qrumyue++4s/S9fy5HjOz9Q5gpRyh+ryJgz/urM70vboLTeSvnc//C+mWW V6uhCp9e9voRhGDkN3oT4BTDyoB5i72bXs/D4r6I= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GEZDAtmBLnGq; Sun, 17 Mar 2019 15:48:10 +0000 (UTC) Received: from midas.localdomain (S0106788a2041785e.gv.shawcable.net [70.66.86.75]) by node.akkea.ca (Postfix) with ESMTPSA id 0EF834E204D; Sun, 17 Mar 2019 15:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837690; bh=s+6m1sYsHHJqUIM+QrwqYy+oYJGYPAMDNtRdXukaGbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wTxv4dNQUR9r3V1sZ/19c2+snMijeIp3ZidSKTtAmpQPGb5b+9tljfKo1yeUO4s8e sgt12Yw6qrumyue++4s/S9fy5HjOz9Q5gpRyh+ryJgz/urM70vboLTeSvnc//C+mWW V6uhCp9e9voRhGDkN3oT4BTDyoB5i72bXs/D4r6I= From: "Angus Ainslie (Purism)" To: Jonathan Cameron Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Mark Rutland , "Angus Ainslie (Purism)" , Tomas Novotny , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] iio: light: vcnl4000 use word writes instead of byte writes Date: Sun, 17 Mar 2019 08:47:58 -0700 Message-Id: <20190317154802.15174-2-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190317154802.15174-1-angus@akkea.ca> References: <20190317154802.15174-1-angus@akkea.ca> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The VCNL4200 datasheet says that word read and writes should be used to access the registers. Signed-off-by: Angus Ainslie (Purism) Tested-by: Tomas Novotny --- drivers/iio/light/vcnl4000.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 04fd0d4b6f19..5295330b65e2 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -140,10 +140,10 @@ static int vcnl4200_init(struct vcnl4000_data *data) data->rev = (ret >> 8) & 0xf; /* Set defaults and enable both channels */ - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_AL_CONF, 0x00); + ret = i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, 0x00); if (ret < 0) return ret; - ret = i2c_smbus_write_byte_data(data->client, VCNL4200_PS_CONF1, 0x00); + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, 0x00); if (ret < 0) return ret; From patchwork Sun Mar 17 15:47:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10856393 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AF68B6C2 for ; Sun, 17 Mar 2019 15:48:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 999BD28630 for ; Sun, 17 Mar 2019 15:48:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8DAF0292B4; Sun, 17 Mar 2019 15:48:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 722A028630 for ; Sun, 17 Mar 2019 15:48:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727404AbfCQPsN (ORCPT ); Sun, 17 Mar 2019 11:48:13 -0400 Received: from node.akkea.ca ([192.155.83.177]:34250 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726782AbfCQPsM (ORCPT ); Sun, 17 Mar 2019 11:48:12 -0400 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 729AA4E2056; Sun, 17 Mar 2019 15:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837691; bh=rKJyCKYehJxa9HWEDvX0uM4L4oEIc6dpgHKd9QL9f+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Hw5l19dTWlaOcBOaJMGoai2/NecFH61h1agDTczrHGcfwXjBte4uO6ieSLrV2LZTH 75Gx1W78Ae1KwHZehL8uCpged63ycci6XLc0zGXmPg8+50BXMUirN3QKtaSeJwl4tt GR9E4vUTLkt7iLPiHvJgBLabSeP8PGlEHqlloWGQ= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HvROGue_SdbH; Sun, 17 Mar 2019 15:48:11 +0000 (UTC) Received: from midas.localdomain (S0106788a2041785e.gv.shawcable.net [70.66.86.75]) by node.akkea.ca (Postfix) with ESMTPSA id A190E4E204B; Sun, 17 Mar 2019 15:48:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837691; bh=rKJyCKYehJxa9HWEDvX0uM4L4oEIc6dpgHKd9QL9f+I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Hw5l19dTWlaOcBOaJMGoai2/NecFH61h1agDTczrHGcfwXjBte4uO6ieSLrV2LZTH 75Gx1W78Ae1KwHZehL8uCpged63ycci6XLc0zGXmPg8+50BXMUirN3QKtaSeJwl4tt GR9E4vUTLkt7iLPiHvJgBLabSeP8PGlEHqlloWGQ= From: "Angus Ainslie (Purism)" To: Jonathan Cameron Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Mark Rutland , "Angus Ainslie (Purism)" , Tomas Novotny , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] iio: light: vcnl4000 add devicetree hooks Date: Sun, 17 Mar 2019 08:47:59 -0700 Message-Id: <20190317154802.15174-3-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190317154802.15174-1-angus@akkea.ca> References: <20190317154802.15174-1-angus@akkea.ca> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add an of_match table for devicetree probing. Signed-off-by: Angus Ainslie (Purism) --- drivers/iio/light/vcnl4000.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 5295330b65e2..836fa97b4e0c 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -363,9 +363,31 @@ static int vcnl4000_probe(struct i2c_client *client, return devm_iio_device_register(&client->dev, indio_dev); } +static const struct of_device_id vcnl_4000_of_match[] = { + { + .compatible = "vishay,vcnl4000", + .data = "VCNL4000", + }, + { + .compatible = "vishay,vcnl4010", + .data = "VCNL4010", + }, + { + .compatible = "vishay,vcnl4010", + .data = "VCNL4020", + }, + { + .compatible = "vishay,vcnl4200", + .data = "VCNL4200", + }, + {}, +}; +MODULE_DEVICE_TABLE(of, vcnl4000_of_match); + static struct i2c_driver vcnl4000_driver = { .driver = { .name = VCNL4000_DRV_NAME, + .of_match_table = of_match_ptr(vcnl_4000_of_match), }, .probe = vcnl4000_probe, .id_table = vcnl4000_id, From patchwork Sun Mar 17 15:48:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10856391 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CB52D1823 for ; Sun, 17 Mar 2019 15:48:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B27A428630 for ; Sun, 17 Mar 2019 15:48:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A6282292B4; Sun, 17 Mar 2019 15:48:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52AA0292A9 for ; Sun, 17 Mar 2019 15:48:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727437AbfCQPs1 (ORCPT ); Sun, 17 Mar 2019 11:48:27 -0400 Received: from node.akkea.ca ([192.155.83.177]:34276 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727390AbfCQPsO (ORCPT ); Sun, 17 Mar 2019 11:48:14 -0400 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 143864E205C; Sun, 17 Mar 2019 15:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837692; bh=4TFo43pNxPR5bE8qq1l7k0ic0qIUblTF7AASecUk58s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=M8023vFKaw/b0KMgCrSJkoEtuoUPgdX4pO8wgDLM5TMh6wU8ZySeIk8ZusT2mKCYg Nj2XxqEkiIvXQjH7/o3Fl2xq02OSNR4UJ7qktDZfDb/HM+05TJ3NvRy386kQh4/l2W KLE3yzLwVYtJCHh1aZhowsqS/YUqcbixRqQldgVM= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WgsHLtUOjcEQ; Sun, 17 Mar 2019 15:48:11 +0000 (UTC) Received: from midas.localdomain (S0106788a2041785e.gv.shawcable.net [70.66.86.75]) by node.akkea.ca (Postfix) with ESMTPSA id 3DACC4E204D; Sun, 17 Mar 2019 15:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837691; bh=4TFo43pNxPR5bE8qq1l7k0ic0qIUblTF7AASecUk58s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=oZ56cnsy1qQ7tkGM25cMmHE7ntOk27CDMmIUY+jazE9wzVJs1qhrd4u6eZPwktHnv pOXMnU1NVuT6XYhppyvheGPJg7Unfp86vj6GtZ5NACdyX5c17wZbis9RWfncO8JrdP TSQgL7u4rE+46cRXA2l1onEFXX5IMmg3SMCdR97c= From: "Angus Ainslie (Purism)" To: Jonathan Cameron Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Mark Rutland , "Angus Ainslie (Purism)" , Tomas Novotny , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] dt-bindings: iio: light: add vcnl4000 devicetree bindings Date: Sun, 17 Mar 2019 08:48:00 -0700 Message-Id: <20190317154802.15174-4-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190317154802.15174-1-angus@akkea.ca> References: <20190317154802.15174-1-angus@akkea.ca> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Document the vishay VCNL4000 devicetree bindings. Signed-off-by: Angus Ainslie (Purism) --- .../bindings/iio/light/vcnl4000.txt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt diff --git a/Documentation/devicetree/bindings/iio/light/vcnl4000.txt b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt new file mode 100644 index 000000000000..4a9d558a412a --- /dev/null +++ b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt @@ -0,0 +1,22 @@ +VISHAY VCNL4000 - Ambient Light and proximity sensor + +This driver supports the VCNL4000/10/20 and VCNL4200 chips + +Required properties: + + -compatible: must be one of : + vishay,vcnl4000 + vishay,vcnl4010 + vishay,vcnl4020 + vishay,vcnl4200 + + -reg: I2C address of the sensor, should be one from below based on the model: + 0x13 + 0x51 + +Example: + +light-sensor@51 { + compatible = "vishay,vcnl4200"; + reg = <0x51>; +}; From patchwork Sun Mar 17 15:48:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10856389 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9371215AC for ; Sun, 17 Mar 2019 15:48:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CA1828630 for ; Sun, 17 Mar 2019 15:48:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FF80292B6; Sun, 17 Mar 2019 15:48:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFDEC28630 for ; Sun, 17 Mar 2019 15:48:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727445AbfCQPs1 (ORCPT ); Sun, 17 Mar 2019 11:48:27 -0400 Received: from node.akkea.ca ([192.155.83.177]:34294 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727393AbfCQPsO (ORCPT ); Sun, 17 Mar 2019 11:48:14 -0400 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id CE8374E2058; Sun, 17 Mar 2019 15:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837692; bh=C8eX/Q/Cvw3ZlHVFcCJXrh+AEs1hjbHeETT9wwkszlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NLjFJ84zLBtqh9ZwjvGladM0z5e/RdIoeU+JywE+wW7vL4JontnsbOQlEF6k51YHI j3pDcRRVtLSaMrnrt/4Q7vPdBIB4vfqhoFiE3PIqlaMcBVg8vnLRweUa+bo3CPipKN kCIOg+h8L7GOzOBRdbUdse8wLCOXloTrCK7bnKP4= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n1UuniW3ILVg; Sun, 17 Mar 2019 15:48:12 +0000 (UTC) Received: from midas.localdomain (S0106788a2041785e.gv.shawcable.net [70.66.86.75]) by node.akkea.ca (Postfix) with ESMTPSA id D3A1C4E204B; Sun, 17 Mar 2019 15:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837692; bh=C8eX/Q/Cvw3ZlHVFcCJXrh+AEs1hjbHeETT9wwkszlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NLjFJ84zLBtqh9ZwjvGladM0z5e/RdIoeU+JywE+wW7vL4JontnsbOQlEF6k51YHI j3pDcRRVtLSaMrnrt/4Q7vPdBIB4vfqhoFiE3PIqlaMcBVg8vnLRweUa+bo3CPipKN kCIOg+h8L7GOzOBRdbUdse8wLCOXloTrCK7bnKP4= From: "Angus Ainslie (Purism)" To: Jonathan Cameron Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Mark Rutland , "Angus Ainslie (Purism)" , Tomas Novotny , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] iio: light: vcnl4000 add support for the VCNL4040 proximity and light sensor Date: Sun, 17 Mar 2019 08:48:01 -0700 Message-Id: <20190317154802.15174-5-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190317154802.15174-1-angus@akkea.ca> References: <20190317154802.15174-1-angus@akkea.ca> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The VCNL4040 is almost identical to the VCNL4200 as far as register layout goes but just need to check a different ID register location. Signed-off-by: Angus Ainslie (Purism) --- drivers/iio/light/vcnl4000.c | 51 ++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 8 deletions(-) diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 836fa97b4e0c..d354143e5529 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -1,8 +1,9 @@ /* - * vcnl4000.c - Support for Vishay VCNL4000/4010/4020/4200 combined ambient + * vcnl4000.c - Support for Vishay VCNL4000/4010/4020/4040/4200 combined ambient * light and proximity sensor * * Copyright 2012 Peter Meerwald + * Copyright 2019 Pursim SPC * * This file is subject to the terms and conditions of version 2 of * the GNU General Public License. See the file COPYING in the main @@ -10,13 +11,14 @@ * * IIO driver for: * VCNL4000/10/20 (7-bit I2C slave address 0x13) + * VCNL4040 (7-bit I2C slave address 0x60) * VCNL4200 (7-bit I2C slave address 0x51) * * TODO: * allow to adjust IR current * proximity threshold and event handling * periodic ALS/proximity measurement (VCNL4010/20) - * interrupts (VCNL4010/20, VCNL4200) + * interrupts (VCNL4010/20/40, VCNL4200) */ #include @@ -30,6 +32,7 @@ #define VCNL4000_DRV_NAME "vcnl4000" #define VCNL4000_PROD_ID 0x01 #define VCNL4010_PROD_ID 0x02 /* for VCNL4020, VCNL4010 */ +#define VCNL4040_PROD_ID 0x86 #define VCNL4200_PROD_ID 0x58 #define VCNL4000_COMMAND 0x80 /* Command register */ @@ -49,6 +52,8 @@ #define VCNL4200_AL_DATA 0x09 /* Ambient light data */ #define VCNL4200_DEV_ID 0x0e /* Device ID, slave address and version */ +#define VCNL4040_DEV_ID 0x0c /* Device ID and version */ + /* Bit masks for COMMAND register */ #define VCNL4000_AL_RDY BIT(6) /* ALS data ready? */ #define VCNL4000_PS_RDY BIT(5) /* proximity data ready? */ @@ -58,6 +63,7 @@ enum vcnl4000_device_ids { VCNL4000, VCNL4010, + VCNL4040, VCNL4200, }; @@ -90,6 +96,7 @@ static const struct i2c_device_id vcnl4000_id[] = { { "vcnl4000", VCNL4000 }, { "vcnl4010", VCNL4010 }, { "vcnl4020", VCNL4010 }, + { "vcnl4040", VCNL4040 }, { "vcnl4200", VCNL4200 }, { } }; @@ -128,14 +135,26 @@ static int vcnl4000_init(struct vcnl4000_data *data) static int vcnl4200_init(struct vcnl4000_data *data) { - int ret; + int ret, id; ret = i2c_smbus_read_word_data(data->client, VCNL4200_DEV_ID); if (ret < 0) return ret; - if ((ret & 0xff) != VCNL4200_PROD_ID) - return -ENODEV; + id = ret & 0xff; + + if (id != VCNL4200_PROD_ID) { + ret = i2c_smbus_read_word_data(data->client, VCNL4040_DEV_ID); + if (ret < 0) + return ret; + + id = ret & 0xff; + + if (id != VCNL4040_PROD_ID) + return -ENODEV; + } + + dev_dbg(&data->client->dev, "device id 0x%x", id); data->rev = (ret >> 8) & 0xf; @@ -150,9 +169,19 @@ static int vcnl4200_init(struct vcnl4000_data *data) data->al_scale = 24000; data->vcnl4200_al.reg = VCNL4200_AL_DATA; data->vcnl4200_ps.reg = VCNL4200_PS_DATA; - /* Integration time is 50ms, but the experiments show 54ms in total. */ - data->vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000); - data->vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000); + switch (id) { + case VCNL4200_PROD_ID: + /* Integration time is 50ms, but the experiments */ + /* show 54ms in total. */ + data->vcnl4200_al.sampling_rate = ktime_set(0, 54000 * 1000); + data->vcnl4200_ps.sampling_rate = ktime_set(0, 4200 * 1000); + break; + case VCNL4040_PROD_ID: + /* Integration time is 80ms, add 10ms. */ + data->vcnl4200_al.sampling_rate = ktime_set(0, 100000 * 1000); + data->vcnl4200_ps.sampling_rate = ktime_set(0, 100000 * 1000); + break; + } data->vcnl4200_al.last_measurement = ktime_set(0, 0); data->vcnl4200_ps.last_measurement = ktime_set(0, 0); mutex_init(&data->vcnl4200_al.lock); @@ -271,6 +300,12 @@ static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] = { .measure_light = vcnl4000_measure_light, .measure_proximity = vcnl4000_measure_proximity, }, + [VCNL4040] = { + .prod = "VCNL4040", + .init = vcnl4200_init, + .measure_light = vcnl4200_measure_light, + .measure_proximity = vcnl4200_measure_proximity, + }, [VCNL4200] = { .prod = "VCNL4200", .init = vcnl4200_init, From patchwork Sun Mar 17 15:48:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angus Ainslie X-Patchwork-Id: 10856387 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 611776C2 for ; Sun, 17 Mar 2019 15:48:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47AC7292A9 for ; Sun, 17 Mar 2019 15:48:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37AF9292B6; Sun, 17 Mar 2019 15:48:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0AC0292A9 for ; Sun, 17 Mar 2019 15:48:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727420AbfCQPsS (ORCPT ); Sun, 17 Mar 2019 11:48:18 -0400 Received: from node.akkea.ca ([192.155.83.177]:34300 "EHLO node.akkea.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727400AbfCQPsP (ORCPT ); Sun, 17 Mar 2019 11:48:15 -0400 Received: from localhost (localhost [127.0.0.1]) by node.akkea.ca (Postfix) with ESMTP id 5C8E84E204E; Sun, 17 Mar 2019 15:48:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837693; bh=YtdSndT+Zi4H2ytZ+tYpf/nUtlDxjWqNqGUqu3RpO8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WXT5Y5eeTyc94+vTc0/e37cDBh224BQxoN7p9x9PnbPeRbt8H41sFu/IkjzHPuEym GarIvKTRJcwrA1YbjoAXtsajd6LEqXzhUf5Poe9qrE+Mpc7gA2zuk10g52+1ZA787x 7gg3Y7bB5WotLxXnQysjN3PGLYJwNmHVforpDq1c= X-Virus-Scanned: Debian amavisd-new at mail.akkea.ca Received: from node.akkea.ca ([127.0.0.1]) by localhost (mail.akkea.ca [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xYlyr1HGZOkk; Sun, 17 Mar 2019 15:48:13 +0000 (UTC) Received: from midas.localdomain (S0106788a2041785e.gv.shawcable.net [70.66.86.75]) by node.akkea.ca (Postfix) with ESMTPSA id 7C1714E204D; Sun, 17 Mar 2019 15:48:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akkea.ca; s=mail; t=1552837693; bh=YtdSndT+Zi4H2ytZ+tYpf/nUtlDxjWqNqGUqu3RpO8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WXT5Y5eeTyc94+vTc0/e37cDBh224BQxoN7p9x9PnbPeRbt8H41sFu/IkjzHPuEym GarIvKTRJcwrA1YbjoAXtsajd6LEqXzhUf5Poe9qrE+Mpc7gA2zuk10g52+1ZA787x 7gg3Y7bB5WotLxXnQysjN3PGLYJwNmHVforpDq1c= From: "Angus Ainslie (Purism)" To: Jonathan Cameron Cc: Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Mark Rutland , "Angus Ainslie (Purism)" , Tomas Novotny , linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] dt-bindings: iio: light: add vcnl4040 devicetree bindings Date: Sun, 17 Mar 2019 08:48:02 -0700 Message-Id: <20190317154802.15174-6-angus@akkea.ca> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190317154802.15174-1-angus@akkea.ca> References: <20190317154802.15174-1-angus@akkea.ca> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Document the vishay VCNL4040 devicetree bindings. Signed-off-by: Angus Ainslie (Purism) --- Documentation/devicetree/bindings/iio/light/vcnl4000.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/iio/light/vcnl4000.txt b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt index 4a9d558a412a..955af4555c90 100644 --- a/Documentation/devicetree/bindings/iio/light/vcnl4000.txt +++ b/Documentation/devicetree/bindings/iio/light/vcnl4000.txt @@ -1,6 +1,6 @@ VISHAY VCNL4000 - Ambient Light and proximity sensor -This driver supports the VCNL4000/10/20 and VCNL4200 chips +This driver supports the VCNL4000/10/20/40 and VCNL4200 chips Required properties: @@ -8,11 +8,13 @@ Required properties: vishay,vcnl4000 vishay,vcnl4010 vishay,vcnl4020 + vishay,vcnl4040 vishay,vcnl4200 -reg: I2C address of the sensor, should be one from below based on the model: 0x13 0x51 + 0x60 Example: