From patchwork Fri Jul 24 21:33:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11684433 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C071D722 for ; Fri, 24 Jul 2020 21:33:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A95A12070E for ; Fri, 24 Jul 2020 21:33:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="R9EEgjxJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726754AbgGXVde (ORCPT ); Fri, 24 Jul 2020 17:33:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726576AbgGXVdd (ORCPT ); Fri, 24 Jul 2020 17:33:33 -0400 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBCAEC0619E4 for ; Fri, 24 Jul 2020 14:33:33 -0700 (PDT) Received: by mail-pj1-x1032.google.com with SMTP id il6so447368pjb.0 for ; Fri, 24 Jul 2020 14:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EQu0tFDBs7nTU9QjLdEGcqiYQ7Nm3KNjVk5VDWWffio=; b=R9EEgjxJkvQAvTFL/5/62WC78D5X3A48nYJuzZfaIMBVaXj4VDTNJds252rbo64URO IMuDmkbiwwEOv8zduzP/ZCHSxL6/34C7OfAHaNig9uV9mULzn8AHqL5i+Pl7fO+TqrQV wdy7ry/PclzuMQHtuKAzlb9EeYBDCQDNifTGo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EQu0tFDBs7nTU9QjLdEGcqiYQ7Nm3KNjVk5VDWWffio=; b=n0EwxvPagnI8qu1Eo8LXckABbO3IAE2FY/TTuPxcUARn+hRMRJX7C9kX+/lBy70oGH Q13fPqbaVERW3/d+Web1jHPvz68IM2GmahbPn1hiWaz83e+dsilMpJwWSBCOb24Iu2G8 hj0Yfea1/5ACQuHYRzDt6NrphDzqP/aVBLhELHkxbZMK144sWnFJzt3IYynLRdjAx3lG BO2d4alPXVkaP5OcWhatPhhJGN4BenoHwZFwjP+gTSmXxWnCVVwbAv6El5oOVEDSIj/n SymegRSZG6a9/f8o2ZJdPKToxeXz4ZXf97ShWEiMuaIPVZS6gXK8p+MFrIRsh93E33zN DZVg== X-Gm-Message-State: AOAM5321W2R6GEXmhXhJxBYCLjYMQN2KJLr5z6SykGcDsbZ5Xk6LnoGm q8oCd2FAmDG+sUDYf8EDiA+EUg== X-Google-Smtp-Source: ABdhPJz4N+iywNFXMFem3YoR0WagfRPgtF5OXhDcB+SHTCmfzr4ZNEB2Zs9RrcFUAi+LNawn/+9Cbg== X-Received: by 2002:a17:90a:14a5:: with SMTP id k34mr7624743pja.37.1595626412535; Fri, 24 Jul 2020 14:33:32 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id z6sm7312919pfn.173.2020.07.24.14.33.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 14:33:31 -0700 (PDT) From: Stephen Boyd To: Jonathan Cameron Cc: Daniel Campello , linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Rob Herring , Douglas Anderson Subject: [PATCH v2 1/5] dt-bindings: iio: Add bindings for sx9310 sensor Date: Fri, 24 Jul 2020 14:33:25 -0700 Message-Id: <20200724213329.899216-2-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.142.g3c755180ce-goog In-Reply-To: <20200724213329.899216-1-swboyd@chromium.org> References: <20200724213329.899216-1-swboyd@chromium.org> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org From: Daniel Campello Adds device tree bandings for sx9310 sensor. Signed-off-by: Daniel Campello Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Rob Herring Reviewed-by: Douglas Anderson [swboyd@chromium.org: Add both regulators and make them optional] Signed-off-by: Stephen Boyd --- .../iio/proximity/semtech,sx9310.yaml | 60 +++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/proximity/semtech,sx9310.yaml diff --git a/Documentation/devicetree/bindings/iio/proximity/semtech,sx9310.yaml b/Documentation/devicetree/bindings/iio/proximity/semtech,sx9310.yaml new file mode 100644 index 000000000000..ba734ee868c7 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/proximity/semtech,sx9310.yaml @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/proximity/semtech,sx9310.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Semtech's SX9310 capacitive proximity sensor + +maintainers: + - Daniel Campello + +description: | + Semtech's SX9310/SX9311 capacitive proximity/button solution. + + Specifications about the devices can be found at: + https://www.semtech.com/products/smart-sensing/sar-sensors/sx9310 + +properties: + compatible: + enum: + - semtech,sx9310 + - semtech,sx9311 + + reg: + maxItems: 1 + + interrupts: + description: + The sole interrupt generated by the device used to announce the + preceding reading request has finished and that data is + available or that a close/far proximity event has happened. + maxItems: 1 + + vdd-supply: + description: Main power supply + + svdd-supply: + description: Host interface power supply + +required: + - compatible + - reg + +additionalProperties: false + +examples: + - | + #include + i2c { + #address-cells = <1>; + #size-cells = <0>; + proximity@28 { + compatible = "semtech,sx9310"; + reg = <0x28>; + interrupt-parent = <&pio>; + interrupts = <5 IRQ_TYPE_LEVEL_LOW 5>; + vdd-supply = <&pp3300_a>; + svdd-supply = <&pp1800_prox>; + }; + }; From patchwork Fri Jul 24 21:33:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11684431 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2D03B138C for ; Fri, 24 Jul 2020 21:33:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 158142070E for ; Fri, 24 Jul 2020 21:33:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="bueanFjG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726763AbgGXVdp (ORCPT ); Fri, 24 Jul 2020 17:33:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726730AbgGXVde (ORCPT ); Fri, 24 Jul 2020 17:33:34 -0400 Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02173C0619E5 for ; Fri, 24 Jul 2020 14:33:34 -0700 (PDT) Received: by mail-pl1-x644.google.com with SMTP id m16so5292879pls.5 for ; Fri, 24 Jul 2020 14:33:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5Or2hRyZ+DJD2fMv0vkFvtUzR/cluRUiM0su+3Iw/kY=; b=bueanFjGE8P6y0aX0kwLr2tZV2YD96YtUUUTOZYK/ammPsZ0QoUt0HZCNi1ZOtnfN2 9gedv4E86CKFfdSifS9RuWJ7hPiVHPmSsGQsOJZNE3NneGyBG/L2woCwcQHCZRlJDtTg dBEkIFoYCBcSRPmhMMzNwfYN7pVeD8XIqlPi8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5Or2hRyZ+DJD2fMv0vkFvtUzR/cluRUiM0su+3Iw/kY=; b=mr6Y/kJ2PSPXJj7BQKfbVAclJXXL/odSzXLsYLKLAtVkbGACptiC0d8uv/r0iq0mgE D9ajqNWiwgfllpJbQ8WtE0YYqM2Ym3AtQFYNNl1l5wAoS6VgEl/5KxjU49CpyjrmXNBR EG5uau1J7VFeU7NbPhE8wEHcomDTQr2fw2X7D6ayIKBgL1rSu4faapVSePLNHy2unQp3 suTMOq1EzY4ZIKdzyx42CQUuT+74ODLOnm0PMvUZGhL9etmX+dU4mnVUtpNCb1XkoLhd HA3QsAEN5TNYuoeNpJSUeSiyubjhlUp2HA47gDfCwjb3bRfDmQkOApPMkj/BVqXs12Ac O+tA== X-Gm-Message-State: AOAM531B5mAvp5jweeuaofppeHg3mLorPfu7aY0SnOQOTujSmeBKpBW9 ySmAc8zfSRBEVvJSlq1LhXgYBQ== X-Google-Smtp-Source: ABdhPJyHNEX4/GvHCS4/49Y3LcVSQrJYa3M5O+TtF5sMRlADwPsO/3YJw0/2WqHVUucWSfwuDbYpgA== X-Received: by 2002:a17:90a:62c1:: with SMTP id k1mr7522698pjs.107.1595626413574; Fri, 24 Jul 2020 14:33:33 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id z6sm7312919pfn.173.2020.07.24.14.33.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 14:33:33 -0700 (PDT) From: Stephen Boyd To: Jonathan Cameron Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Gwendal Grignou , Daniel Campello , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Douglas Anderson Subject: [PATCH v2 2/5] iio: sx9310: Add newlines to printks Date: Fri, 24 Jul 2020 14:33:26 -0700 Message-Id: <20200724213329.899216-3-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.142.g3c755180ce-goog In-Reply-To: <20200724213329.899216-1-swboyd@chromium.org> References: <20200724213329.899216-1-swboyd@chromium.org> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Printks in the kernel have newlines at the end. Add them to the few printks in this driver. Cc: Gwendal Grignou Reviewed-by: Daniel Campello Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Reviewed-by: Douglas Anderson Fixes: 72ad02b15d63 ("iio: Add SEMTECH SX9310/9311 sensor driver") Signed-off-by: Stephen Boyd --- drivers/iio/proximity/sx9310.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c index d161f3061e35..84c3c9ae80dc 100644 --- a/drivers/iio/proximity/sx9310.c +++ b/drivers/iio/proximity/sx9310.c @@ -824,7 +824,7 @@ static int sx9310_init_compensation(struct iio_dev *indio_dev) if (i < 0) { dev_err(&data->client->dev, - "initial compensation timed out: 0x%02x", val); + "initial compensation timed out: 0x%02x\n", val); ret = -ETIMEDOUT; } @@ -871,14 +871,14 @@ static int sx9310_set_indio_dev_name(struct device *dev, /* id will be NULL when enumerated via ACPI */ if (id) { if (id->driver_data != whoami) - dev_err(dev, "WHOAMI does not match i2c_device_id: %s", + dev_err(dev, "WHOAMI does not match i2c_device_id: %s\n", id->name); } else if (ACPI_HANDLE(dev)) { acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev); if (!acpi_id) return -ENODEV; if (acpi_id->driver_data != whoami) - dev_err(dev, "WHOAMI does not match acpi_device_id: %s", + dev_err(dev, "WHOAMI does not match acpi_device_id: %s\n", acpi_id->id); } else return -ENODEV; @@ -891,7 +891,7 @@ static int sx9310_set_indio_dev_name(struct device *dev, indio_dev->name = "sx9311"; break; default: - dev_err(dev, "unexpected WHOAMI response: %u", whoami); + dev_err(dev, "unexpected WHOAMI response: %u\n", whoami); return -ENODEV; } @@ -920,7 +920,7 @@ static int sx9310_probe(struct i2c_client *client, ret = regmap_read(data->regmap, SX9310_REG_WHOAMI, &data->whoami); if (ret < 0) { - dev_err(&client->dev, "error in reading WHOAMI register: %d", + dev_err(&client->dev, "error in reading WHOAMI register: %d\n", ret); return ret; } From patchwork Fri Jul 24 21:33:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11684429 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5BF63138C for ; Fri, 24 Jul 2020 21:33:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 439822070E for ; Fri, 24 Jul 2020 21:33:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="YI+6Na2c" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726696AbgGXVdp (ORCPT ); Fri, 24 Jul 2020 17:33:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57248 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726763AbgGXVdf (ORCPT ); Fri, 24 Jul 2020 17:33:35 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 19F7BC0619D3 for ; Fri, 24 Jul 2020 14:33:35 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id o13so6158995pgf.0 for ; Fri, 24 Jul 2020 14:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4A/xN+mXAd0EqJ9PitQzyrnaHXwvg7/Xc99KzMDWZ6w=; b=YI+6Na2cEfWiYpn8cueJuwa/rEh9Eh3xNHKi83BjmkgAVNk0CTuHUwQIzIcKDuIcZr l9QFMLcnYrtI+Mumkp9boy+k+7iZYRqGbxw1hnJl36JZ2D9d5q1UPjSu/qw5SnjL/4xg xLwzDzDjh3Xy3P1lk019ShKO/cGDie18gz0/U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4A/xN+mXAd0EqJ9PitQzyrnaHXwvg7/Xc99KzMDWZ6w=; b=XkfKNGpbac1+HMWApQ9Kl88oy26jOq2H/Cps30it7eqcNX7euL3154tLTJYjoeNah9 MuHh9zhH9x301IuZ9guP5ZeLHniFtsjuTqFNiW0VHcQxr3jVb2nc3l7imCPt0HE0ZPXI 6gTzAX+lr9E+7ymWF4pQiJyGd8tf0ez3XNUMzCzkqAI5SI/1FUybjsrhACJdbjzZColq BzibTRB6FqfVbZ+S6sk/jtvM4WZO14OjqfhXImMciSrUDlmh2hYlzT8IW/c/h/pQ36s1 4fUY66uZwbGU5hQJ35SVheiAmn+PI2j7nT+VLkgpVD9WdoMSNUCT+7gT8nrEJ5iEZusA LX9A== X-Gm-Message-State: AOAM531Xuhg9M6tt9IHDHW1o6I+NqApBuP4B9yX6wUS3KbmC9mfeRfOT 27ijrHZuEBnBDN2SFhvDXYyNFg== X-Google-Smtp-Source: ABdhPJwKephH8VtzFk07GkM8Dq9QzB0TSBf214Np+Lq3nSPVJM/VWnFzsOJl2E3Uv9tD+GrMv5xSCA== X-Received: by 2002:a62:79cd:: with SMTP id u196mr10322543pfc.152.1595626414664; Fri, 24 Jul 2020 14:33:34 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id z6sm7312919pfn.173.2020.07.24.14.33.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 14:33:34 -0700 (PDT) From: Stephen Boyd To: Jonathan Cameron Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Gwendal Grignou , Daniel Campello , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Douglas Anderson Subject: [PATCH v2 3/5] iio: sx9310: whoami is unsigned Date: Fri, 24 Jul 2020 14:33:27 -0700 Message-Id: <20200724213329.899216-4-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.142.g3c755180ce-goog In-Reply-To: <20200724213329.899216-1-swboyd@chromium.org> References: <20200724213329.899216-1-swboyd@chromium.org> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org This is an unsigned value, actually it's a u8 but regmap doesn't handle that easily. Let's make it unsigned throughout so that we don't need to worry about signed vs. unsigned comparison behavior. Cc: Gwendal Grignou Cc: Daniel Campello Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Douglas Anderson Fixes: 72ad02b15d63 ("iio: Add SEMTECH SX9310/9311 sensor driver") Signed-off-by: Stephen Boyd Reviewed-by: Douglas Anderson Reviewed-by: Daniel Campello --- drivers/iio/proximity/sx9310.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c index 84c3c9ae80dc..fca871ad82ba 100644 --- a/drivers/iio/proximity/sx9310.c +++ b/drivers/iio/proximity/sx9310.c @@ -144,7 +144,7 @@ struct sx9310_data { struct completion completion; unsigned int chan_read, chan_event; int channel_users[SX9310_NUM_CHANNELS]; - int whoami; + unsigned int whoami; }; static const struct iio_event_spec sx9310_events[] = { @@ -864,7 +864,8 @@ static int sx9310_init_device(struct iio_dev *indio_dev) static int sx9310_set_indio_dev_name(struct device *dev, struct iio_dev *indio_dev, - const struct i2c_device_id *id, int whoami) + const struct i2c_device_id *id, + unsigned int whoami) { const struct acpi_device_id *acpi_id; From patchwork Fri Jul 24 21:33:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11684425 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45095722 for ; Fri, 24 Jul 2020 21:33:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2A8E720714 for ; Fri, 24 Jul 2020 21:33:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="mLAtcyR7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726824AbgGXVdh (ORCPT ); Fri, 24 Jul 2020 17:33:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57256 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726821AbgGXVdg (ORCPT ); Fri, 24 Jul 2020 17:33:36 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F41C4C0619E4 for ; Fri, 24 Jul 2020 14:33:35 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id md7so6240430pjb.1 for ; Fri, 24 Jul 2020 14:33:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=t+wfLK+jRzoEaeSZTF77nah9ZjAJpOiCxA+PzRL9qxM=; b=mLAtcyR784TRkCRrR4IRTfb9vao7peH9X39dm44ROVmmofcdArlmKq+mEqSE9Toqlu rFH5miGAzdjGBa6uyLOedKw0s2DtQUHv5JkAiJd4nRonuVF23gIs1TWlF8f/N2e9DJVb wX8lR7GF8D3mrPp09mzRussGWnCrLxEj2wZJ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t+wfLK+jRzoEaeSZTF77nah9ZjAJpOiCxA+PzRL9qxM=; b=rb7CbyiQpU51OIl2yZGihIX98i6lCg4Rlii/hc0Jc8pCMjMw5YhuDSVpJ5S9jLy0W/ qJMCpIh+4L7c0fL5aUM+TXrOSBBTpfckhOtvUBfm0u3VFA1rb5VL626ZYbTPBj2Y9sMd qub5MlWwuCkR0myc1/FvgVxaCHEqfxD8okA+yG1WehqlQD8XDb4cvxtb60Z50UT8hVxo IkJze7MLF6vmtUDIE/4O99Hz0AUSYR1ybQdJi4hWrP6m+HmS8ryx5yiIMrccXBm4Fqwh mej9aE1CGNDTFAFSZ99Le6aRXqiDW97PKwDq7jrWOz8B5P61w3J3VOf1gPy3V6jzla5f 47uA== X-Gm-Message-State: AOAM532kI0gNbvBvIdYcldcg0HOa89fQ92d5YwNjIRQWm2uDTeQb9Tnt O+d2EDpmiq+fVCFbGJn+vmUI4A== X-Google-Smtp-Source: ABdhPJy2o1jAadrqyaeCklg07hrfg6+Ljmtjv6KrP4itXpLPvSILQJifpHbNx3f1AdtA4pBtOSdvew== X-Received: by 2002:a17:90b:289:: with SMTP id az9mr7771380pjb.122.1595626415525; Fri, 24 Jul 2020 14:33:35 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id z6sm7312919pfn.173.2020.07.24.14.33.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 14:33:35 -0700 (PDT) From: Stephen Boyd To: Jonathan Cameron Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Gwendal Grignou , Daniel Campello , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Douglas Anderson Subject: [PATCH v2 4/5] iio: sx9310: Drop channel_users[] Date: Fri, 24 Jul 2020 14:33:28 -0700 Message-Id: <20200724213329.899216-5-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.142.g3c755180ce-goog In-Reply-To: <20200724213329.899216-1-swboyd@chromium.org> References: <20200724213329.899216-1-swboyd@chromium.org> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org This struct member isn't used. Drop it. Cc: Gwendal Grignou Cc: Daniel Campello Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Douglas Anderson Fixes: 72ad02b15d63 ("iio: Add SEMTECH SX9310/9311 sensor driver") Signed-off-by: Stephen Boyd Reviewed-by: Douglas Anderson Reviewed-by: Daniel Campello --- drivers/iio/proximity/sx9310.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c index fca871ad82ba..1e1f6bba50f6 100644 --- a/drivers/iio/proximity/sx9310.c +++ b/drivers/iio/proximity/sx9310.c @@ -142,8 +142,8 @@ struct sx9310_data { /* Remember enabled channels and sample rate during suspend. */ unsigned int suspend_ctrl0; struct completion completion; - unsigned int chan_read, chan_event; - int channel_users[SX9310_NUM_CHANNELS]; + unsigned int chan_read; + unsigned int chan_event; unsigned int whoami; }; From patchwork Fri Jul 24 21:33:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11684427 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1FD4F722 for ; Fri, 24 Jul 2020 21:33:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 051AA20748 for ; Fri, 24 Jul 2020 21:33:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="STyOXqoW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726841AbgGXVdi (ORCPT ); Fri, 24 Jul 2020 17:33:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726826AbgGXVdh (ORCPT ); Fri, 24 Jul 2020 17:33:37 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03C57C0619E4 for ; Fri, 24 Jul 2020 14:33:37 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id q17so5283456pls.9 for ; Fri, 24 Jul 2020 14:33:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7r5P7yY97nIyh5VEzHl8IWXtXY0874kQ28pbPaAX6qA=; b=STyOXqoW5ATgPELLwQQ+htug+4PwoBB7dhN8Zr+us4YTpwo6KWpaLdQ9vA7dvEmTn0 OoDH/1U/qklppbzvfH52Cfcws+RcgFNHewY9GvymoxFT8cogRC8mj1SpAmA/RBfam/an DEZlRBCGTseP5LiJfhi5DcDMVLOW/5iFsrkMk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7r5P7yY97nIyh5VEzHl8IWXtXY0874kQ28pbPaAX6qA=; b=dqj5l0EzzXoCdqRnYPl6OfG4GxVPqEf/GCJA0m1qw0cHP8Y96Tred3UxaNFXCEs2Q0 6jMt/RvwiHzR3g+yZ2M1A8Bsz01KkuPvQsZzydEGlHj+B76BMaMCmrdhN18KO2wEcyfO JaFkfXZASuWkU4Hx4IMb08So4Eo+Qpu8TPeUxznpnjxarSvpsGb0eOAMfBydvUMsSj99 gCiQUweXWXbDp6/JBjpBNIfth/tA2KivaiNYWA3+bv3EluODBj4m0tlp04PN/CMki/Sq NlrKo4ZUKHCO5z7nAlqTtVCGu3IYj7iQ5jPvyffW957uYgemlK8xp8j9zXhEyT2XK7Lk 4lwA== X-Gm-Message-State: AOAM532ZHFDno2a/j1XZlTQwqgZ69VqnFjKGeJ8/qbbQ1tD0IxRxphOl Zy1uhR5sr9uP8qSadE6BH+7wQrEAGxI= X-Google-Smtp-Source: ABdhPJypUULXnzt+wfn35DBVEVvoWc6T57rYbQ4sYcNEUCnquL9y0upEE6DaTrBVpCMFf8Iw+DUYBQ== X-Received: by 2002:a17:90b:30d7:: with SMTP id hi23mr7703975pjb.69.1595626416540; Fri, 24 Jul 2020 14:33:36 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id z6sm7312919pfn.173.2020.07.24.14.33.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 14:33:36 -0700 (PDT) From: Stephen Boyd To: Jonathan Cameron Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Gwendal Grignou , Daniel Campello , Hartmut Knaack , Lars-Peter Clausen , Peter Meerwald-Stadler , Douglas Anderson Subject: [PATCH v2 5/5] iio: sx9310: Enable vdd and svdd regulators at probe Date: Fri, 24 Jul 2020 14:33:29 -0700 Message-Id: <20200724213329.899216-6-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.142.g3c755180ce-goog In-Reply-To: <20200724213329.899216-1-swboyd@chromium.org> References: <20200724213329.899216-1-swboyd@chromium.org> MIME-Version: 1.0 Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Enable the main power supply (vdd) and digital IO power supply (svdd) during probe so that the i2c communication and device works properly on boards that aggressively power gate these supplies. Cc: Gwendal Grignou Cc: Daniel Campello Cc: Hartmut Knaack Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Douglas Anderson Signed-off-by: Stephen Boyd --- drivers/iio/proximity/sx9310.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c index 1e1f6bba50f6..ad6ed100c7a6 100644 --- a/drivers/iio/proximity/sx9310.c +++ b/drivers/iio/proximity/sx9310.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -899,12 +900,21 @@ static int sx9310_set_indio_dev_name(struct device *dev, return 0; } +static void sx9310_regulator_disable(void *supplies) +{ + regulator_bulk_disable(2, supplies); +} + static int sx9310_probe(struct i2c_client *client, const struct i2c_device_id *id) { int ret; struct iio_dev *indio_dev; struct sx9310_data *data; + struct regulator_bulk_data supplies[] = { + { .supply = "vdd" }, + { .supply = "svdd" }, + }; indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); if (indio_dev == NULL) @@ -919,6 +929,23 @@ static int sx9310_probe(struct i2c_client *client, if (IS_ERR(data->regmap)) return PTR_ERR(data->regmap); + ret = devm_regulator_bulk_get(&client->dev, ARRAY_SIZE(supplies), supplies); + if (ret) + return ret; + + ret = regulator_bulk_enable(ARRAY_SIZE(supplies), supplies); + if (ret) + return ret; + /* Must wait for Tpor time after initial power up */ + usleep_range(1000, 1100); + + /* Update sx9310_regulator_disable() size if this bug is hit */ + BUILD_BUG_ON(ARRAY_SIZE(supplies) != 2); + ret = devm_add_action_or_reset(&client->dev, sx9310_regulator_disable, + supplies); + if (ret) + return ret; + ret = regmap_read(data->regmap, SX9310_REG_WHOAMI, &data->whoami); if (ret < 0) { dev_err(&client->dev, "error in reading WHOAMI register: %d\n",