From patchwork Thu Jul 23 23:03:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11681771 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 035F4722 for ; Thu, 23 Jul 2020 23:03:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DEC6F2086A for ; Thu, 23 Jul 2020 23:03:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="NPHmHdMs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727794AbgGWXD6 (ORCPT ); Thu, 23 Jul 2020 19:03:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726608AbgGWXDs (ORCPT ); Thu, 23 Jul 2020 19:03:48 -0400 Received: from mail-pf1-x42e.google.com (mail-pf1-x42e.google.com [IPv6:2607:f8b0:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0104C0619D3 for ; Thu, 23 Jul 2020 16:03:47 -0700 (PDT) Received: by mail-pf1-x42e.google.com with SMTP id u5so3924452pfn.7 for ; Thu, 23 Jul 2020 16:03:47 -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=MlXOk0hHJZhRIPU8I1ptWsva21U7aaIAzX5l2R4972o=; b=NPHmHdMsxSNkTOfl+TlcvZqmx7oUT6QgmOCbPkcRf6298vdxpB6rcIXyVM6M1ygDWD AxdQi3+sLegOD7bfh4/lH2JNvKsuQOXfI1QGq02sR6qOxWp006Wxnv4LaCohl43yV30q i7v9X9DVI5aOEM0zpkp8404bJSi63wn+8dRZg= 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=MlXOk0hHJZhRIPU8I1ptWsva21U7aaIAzX5l2R4972o=; b=sKLgp6xTAr8Gp/WymVKl9I6HcMDETzH4pw25eUbetBqZsUp/K0RYi35Jc4YVjXpsmo B7YmyqvJ8Am0pT29pTnLIxQ4nkSg+Eib3p7ePOiH7nxj1UoHS/i8mSCWeGzGOQ5FZ+1g MBDUcG0vKTUcYg5xks337OEf9yT1+TTbSars3J4mPADRGxkip/1K8L3YDkJULE1ZO4L8 TKg4HAzQEGh+fcr+l9tpSekHCOugRdsP/v6YEpAfeQo08KGulkTzH3wwlpjRJrcYUDQk 6Il1b/RDzQZPASCL0bB4QkD6B4xKGVU5cHLnzJlSVm4LBMJrftCo9XltvDV8tw832wV1 vMUA== X-Gm-Message-State: AOAM533gpcwW0IGN+kL1jEwaoOnc51NG89+z5Jwm7w3MdVoTW5i/24hd HLyfmU3WN/JSLeX6wUgWya1F3w== X-Google-Smtp-Source: ABdhPJwM4hsDU+8tCAQ7vdVBTk0lJRMcxjHoPhcCe0AIjCjHJzUVA3z1DEo3zNgbETy/U4d4Zm2nIQ== X-Received: by 2002:a62:cd89:: with SMTP id o131mr6131457pfg.195.1595545427481; Thu, 23 Jul 2020 16:03:47 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id k98sm3816070pjb.42.2020.07.23.16.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 16:03:46 -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 1/3] dt-bindings: iio: Add bindings for sx9310 sensor Date: Thu, 23 Jul 2020 16:03:42 -0700 Message-Id: <20200723230344.1422750-2-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.105.gf9edc3c819-goog In-Reply-To: <20200723230344.1422750-1-swboyd@chromium.org> References: <20200723230344.1422750-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 Cc: Douglas Anderson [swboyd@chromium.org: Add both regulators and make them optional] Signed-off-by: Stephen Boyd Reviewed-by: Douglas Anderson --- .../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 Thu Jul 23 23:03:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11681769 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 4A66A722 for ; Thu, 23 Jul 2020 23:03:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 316EB20792 for ; Thu, 23 Jul 2020 23:03:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="QVhNlV1P" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727115AbgGWXDt (ORCPT ); Thu, 23 Jul 2020 19:03:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727093AbgGWXDt (ORCPT ); Thu, 23 Jul 2020 19:03:49 -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 E4990C0619E2 for ; Thu, 23 Jul 2020 16:03:48 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id gc15so4947071pjb.0 for ; Thu, 23 Jul 2020 16:03:48 -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=6gik5lIa4hZg2yMpm21gJ3uaZzga/bvh1wizvnRR9VM=; b=QVhNlV1PaBaSSs5Sjc/PYgl9v/Jts29p2N0byah6yz52dO2oca6IwAaHUPE4vIsQWT ncdYFr8356cW71vtEzFS3lRC6zIGeihOxpBNnLltcVXNjWGzApqSshG0sAWMEqCcZRTh D86gxEVaXZUCDPbGchzpT0pwDI57Cs6kE7U/8= 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=6gik5lIa4hZg2yMpm21gJ3uaZzga/bvh1wizvnRR9VM=; b=rxTZGuPOx8B/LUcIukCastQNR5A2WKzLCXvhgbdJ3riezQE65wnh12GgLcJ4RgBgkS XZAiatgljjL/0jE7cYKeRrVw5PFygFhLhn27zxHC6NFhzHzNE8SJwohcezKkBjVySq2H 8PuEEuIwCSgJ+ZIhTHG3QQ6ei3mhD9DyoJhMVlPgl2hM8GXkyOKH9sE4kqOAfutN/7C9 Mf9Nmgg6OmIn0Hvt0SBF07d4AXsNupwHkBtVBXkP+JilwaAsHXKCiG3fZBZfscHhlWHT ev7rXLMwPvIJUcF5vEdjia6jQHilwR5hakOeuP0dlr68P5JcayVWaHYIamIohttG/kFB mASQ== X-Gm-Message-State: AOAM5325kXQVNp1dcPNUVggi5ftxJkHdGo0MNglrfbXOk68xKVJ2nLmS AuIGucesANjE62sA3APvGmvMRQ== X-Google-Smtp-Source: ABdhPJx8tNYF2HodmfcGu+Fa1S4yj5uYhQNArwNvP5aIjev0QLhFeZtHUF/5WCeXzUn7oP2Ul4tNcQ== X-Received: by 2002:a17:902:22:: with SMTP id 31mr5265629pla.120.1595545428447; Thu, 23 Jul 2020 16:03:48 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id k98sm3816070pjb.42.2020.07.23.16.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 16:03:48 -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 2/3] iio: sx9310: Add newlines to printks Date: Thu, 23 Jul 2020 16:03:43 -0700 Message-Id: <20200723230344.1422750-3-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.105.gf9edc3c819-goog In-Reply-To: <20200723230344.1422750-1-swboyd@chromium.org> References: <20200723230344.1422750-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 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 | 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 Thu Jul 23 23:03:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 11681773 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 D68CB722 for ; Thu, 23 Jul 2020 23:04:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BE03222B3F for ; Thu, 23 Jul 2020 23:04:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="LW6jPbAG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727907AbgGWXD5 (ORCPT ); Thu, 23 Jul 2020 19:03:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727794AbgGWXDu (ORCPT ); Thu, 23 Jul 2020 19:03:50 -0400 Received: from mail-pl1-x643.google.com (mail-pl1-x643.google.com [IPv6:2607:f8b0:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEAE4C0619D3 for ; Thu, 23 Jul 2020 16:03:49 -0700 (PDT) Received: by mail-pl1-x643.google.com with SMTP id x8so3370292plm.10 for ; Thu, 23 Jul 2020 16:03:49 -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=OhkToc+CMWN7b+jpoCcZqh8Ko/VUL6blm6iscU844Us=; b=LW6jPbAGLKnKZoExCXv3jwxiVvPPL2XTR25enHvl7sLKU7QEVGp++aAIwtRBvqopEz zAV9WLjSY8TyPFftu3ut2E7GHYe1hjM0rJX51H8NWdfOOOpDl0CgIAHw4OWKjgM+y8XF Vn0JxmA3BgAZ3mlS4x+QO0XK3dJELPVO3RCGI= 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=OhkToc+CMWN7b+jpoCcZqh8Ko/VUL6blm6iscU844Us=; b=c3SqTjN7dz5kK//ZsX+UMIXM44hSDNe9jImovaIvip4oB25IEXEYy7WOIQAnYgTHIQ xOSUMrRAw2TlMjghJENOmA4bkV8WHSqDH6awnnmu9/AsaLBE8BUr2VNv/VBJZjU5dvN4 FXnCwnKWWTR+EtNhYgd1KVegfUo5Ghoh3FcHZ08Ke6a81FxvrddD+osJEEqj2ugKm7aW B6ft0M1vhnWQNY2rh9v94uZ1sWV0FjShTuhXPImwhqgY/J7sEgSGdPE1riop7uDA6SHZ Rn/kR4K6kKH07wXQ5PmxzBXPmdfusmYPn1ZCNz8SsgX6q3Mx238F5JhJ7imyD6hL9VWh pt4A== X-Gm-Message-State: AOAM532qWboIfTOsazTT9py4aXNwXTzvnnR5A4UrFKZ79aDxx4Y3D2RW U3Z2Mfuv5a92UPhK9pc4P9YjqA== X-Google-Smtp-Source: ABdhPJz3a0DnpYC6w/4M5VZwNrDIcMbWdw5d/3vMmuW2A8NKijQMhft0bLzRFYqAaNYt1xkag/9/xg== X-Received: by 2002:a17:902:368:: with SMTP id 95mr5873078pld.279.1595545429380; Thu, 23 Jul 2020 16:03:49 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id k98sm3816070pjb.42.2020.07.23.16.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 16:03:48 -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 3/3] iio: sx9310: Enable regulator for svdd supply Date: Thu, 23 Jul 2020 16:03:44 -0700 Message-Id: <20200723230344.1422750-4-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.rc0.105.gf9edc3c819-goog In-Reply-To: <20200723230344.1422750-1-swboyd@chromium.org> References: <20200723230344.1422750-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 digital IO power supply (svdd) during probe so that the i2c communication works properly on boards that aggressively power gate this supply. 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 | 49 ++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 8 deletions(-) diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c index 84c3c9ae80dc..d21c17a4d541 100644 --- a/drivers/iio/proximity/sx9310.c +++ b/drivers/iio/proximity/sx9310.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -131,6 +132,7 @@ struct sx9310_data { struct i2c_client *client; struct iio_trigger *trig; struct regmap *regmap; + struct regulator *supply; /* * Last reading of the proximity status for each channel. * We only send an event to user space when this changes. @@ -914,21 +916,31 @@ static int sx9310_probe(struct i2c_client *client, mutex_init(&data->mutex); init_completion(&data->completion); + data->supply = devm_regulator_get(&client->dev, "svdd"); + if (IS_ERR(data->supply)) + return PTR_ERR(data->supply); + data->regmap = devm_regmap_init_i2c(client, &sx9310_regmap_config); if (IS_ERR(data->regmap)) return PTR_ERR(data->regmap); + ret = regulator_enable(data->supply); + if (ret) + return ret; + /* Must wait for Tpor time after initial power up */ + usleep_range(1000, 1100); + ret = regmap_read(data->regmap, SX9310_REG_WHOAMI, &data->whoami); if (ret < 0) { dev_err(&client->dev, "error in reading WHOAMI register: %d\n", ret); - return ret; + goto err; } ret = sx9310_set_indio_dev_name(&client->dev, indio_dev, id, data->whoami); if (ret < 0) - return ret; + goto err; ACPI_COMPANION_SET(&indio_dev->dev, ACPI_COMPANION(&client->dev)); indio_dev->dev.parent = &client->dev; @@ -940,7 +952,7 @@ static int sx9310_probe(struct i2c_client *client, ret = sx9310_init_device(indio_dev); if (ret < 0) - return ret; + goto err; if (client->irq) { ret = devm_request_threaded_irq(&client->dev, client->irq, @@ -949,13 +961,15 @@ static int sx9310_probe(struct i2c_client *client, IRQF_TRIGGER_LOW | IRQF_ONESHOT, "sx9310_event", indio_dev); if (ret < 0) - return ret; + goto err; data->trig = devm_iio_trigger_alloc(&client->dev, "%s-dev%d", indio_dev->name, indio_dev->id); - if (!data->trig) - return -ENOMEM; + if (!data->trig) { + ret = -ENOMEM; + goto err; + } data->trig->dev.parent = &client->dev; data->trig->ops = &sx9310_trigger_ops; @@ -963,7 +977,7 @@ static int sx9310_probe(struct i2c_client *client, ret = devm_iio_trigger_register(&client->dev, data->trig); if (ret) - return ret; + goto err; } ret = devm_iio_triggered_buffer_setup(&client->dev, indio_dev, @@ -971,9 +985,27 @@ static int sx9310_probe(struct i2c_client *client, sx9310_trigger_handler, &sx9310_buffer_setup_ops); if (ret < 0) - return ret; + goto err; return devm_iio_device_register(&client->dev, indio_dev); +err: + regulator_disable(data->supply); + return ret; +} + +static int sx9310_remove(struct i2c_client *client) +{ + struct iio_dev *indio_dev; + struct sx9310_data *data; + + indio_dev = i2c_get_clientdata(client); + if (!indio_dev) + return -ENODEV; + + data = iio_priv(indio_dev); + regulator_disable(data->supply); + + return 0; } static int __maybe_unused sx9310_suspend(struct device *dev) @@ -1059,6 +1091,7 @@ static struct i2c_driver sx9310_driver = { .pm = &sx9310_pm_ops, }, .probe = sx9310_probe, + .remove = sx9310_remove, .id_table = sx9310_id, }; module_i2c_driver(sx9310_driver);