From patchwork Sun Apr 22 23:07:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 133940 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp369421lji; Sun, 22 Apr 2018 16:11:53 -0700 (PDT) X-Google-Smtp-Source: AIpwx48Xp4Qoh3de6fxjY4wW1npTi6UcFUziKh6qC4d1yp1XpALtxqPi/gzFaylTL5cbKW/I8jKW X-Received: by 10.98.133.15 with SMTP id u15mr17728629pfd.160.1524438713734; Sun, 22 Apr 2018 16:11:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524438713; cv=none; d=google.com; s=arc-20160816; b=JXeMrVwGXJPoNgL9ATz81qSwIYnOyJ1GnSgz/8rvnKKkWnd3faYR+vjbybb208UjEd ZcXCZxGK46k1ULVODJwLWIz4e0B6Xp93CRW5akbqaksCHp1C6Oh2MgiCuLM1gmxxDcBK +s8dKbDYksFGLzY/MTasOHCQcJr6sfh9Sakj8LshRENF9fQnU4cpJ6GkncG4uWymqV75 d8e2bXflLhcsRFssVCNTDaNUVJIXgABfFwdpqvzFMVTLpe7k5g6b3hSF4p3K0wrRNNVu b1JbkU5NXtKwbPa6djHKlBs7ayl1I1GfhIVNBrIvp1brWr2glq/7ZxKMABwSAsljkqSU 2e2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=4tsKjEB3Uq++ewbri23rjtwYKlpf+kEYJmA1qq2FZVk=; b=TBAk+8APh0uRUnoGXhkDnJJFztiCJO2CqPl5dlqWu67VnG//F7S656vEK+u5o9YnFg pF4l5HOZxE46aalia5+3g3qAphXyy4yPit+K6nGKBD8AITN6o2WcSZ/JisJboCpgmoH2 cL60H8jxALfInt1D/rpY8uyY2xodF4OCsYOHQogxAPyfsD112I4NtPDSDppCZhVjJ5X8 EN1M+i93NgHW/O2UJdC0rfcqr87NYwMqsX+bhcfR70LlZskRt8eFNE1zhxIn8R3NvVyb el785Jpq8Eu9PecVOQiAwa3/+3zWrHmqnVb2Ya+6LiHRk6dXkDX7VBUuQ6QyqJZRnYyO I2Hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O3IqNGQD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y7-v6si10569375plh.583.2018.04.22.16.11.53; Sun, 22 Apr 2018 16:11:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=O3IqNGQD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754046AbeDVXLv (ORCPT + 29 others); Sun, 22 Apr 2018 19:11:51 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:39873 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753898AbeDVXKT (ORCPT ); Sun, 22 Apr 2018 19:10:19 -0400 Received: by mail-lf0-f66.google.com with SMTP id p142-v6so12222640lfd.6 for ; Sun, 22 Apr 2018 16:10:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4tsKjEB3Uq++ewbri23rjtwYKlpf+kEYJmA1qq2FZVk=; b=O3IqNGQDQzBzvh8lFl/YdkiM5dCbRXun01lfw/ujK2eUtATp+IsKJg8dntVmZZoYIk HklIdzVXmfEk6gVo8eIZmS+ESibQEnv06EmOKjE9NkQkOOG64LxQOitkYP4830DXfYoW QTvcPjIjvRm9m4Yz5E8to7z6HnT9s0g4H89EA= 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; bh=4tsKjEB3Uq++ewbri23rjtwYKlpf+kEYJmA1qq2FZVk=; b=oDNDxjjiDMnU2R1P+dsxL7+56j6MA1tYynUtfRTcleutgXulg3TAq06qwgg2Ckz5yV bBHtH0t0GEt72B858m0kJTmQEz7z+zne3R1trmKe/esFrNUaCgAa2gD16sEwcfpUZ52q OQDVNFvYr7v1M/gRtoitJoR8qtezNc1TSeHJA0B5cGpM9f22MLK3f1TliVQEVNscgCi2 ztdGFr6K0kCMKB6fuA8cBVUcQbGcd/u0o8VkTovwKuJNobsB1kaf23N/80bQwLutcOaH Mhbi3fmqrS3+Fbh93gCp9RwfsDn6uXuQCKYDzxAU4TvBusXtRP5fkmydBQ7WZuewVFLm NHsA== X-Gm-Message-State: ALQs6tA3AfiIEYQ/synYwVCp1BiS9QTK6oJAjlyAwcnipMsCk/nMFii+ 72Ip9KpaqpPCDz6NQtxX4q/Ynw== X-Received: by 10.46.144.69 with SMTP id n5mr7776548ljg.109.1524438617829; Sun, 22 Apr 2018 16:10:17 -0700 (PDT) Received: from localhost.localdomain (c-ae7b71d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id r25sm2036291ljc.8.2018.04.22.16.10.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 16:10:17 -0700 (PDT) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Linus Walleij Subject: [PATCH 12/18 v2] regulator: tps65090: Pass descriptor instead of GPIO number Date: Mon, 23 Apr 2018 01:07:36 +0200 Message-Id: <20180422230742.3729-12-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180422230742.3729-1-linus.walleij@linaro.org> References: <20180422230742.3729-1-linus.walleij@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead of passing a global GPIO number for the enable GPIO, pass a descriptor looked up from the device tree node for the regulator. This regulator supports passing platform data, but enable/sleep regulators are looked up from the device tree exclusively, so we can need not touch other files. Acked-by: Lee Jones Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebase the patch on the other changes. - Collect Lee's ACK. --- drivers/regulator/tps65090-regulator.c | 50 ++++++++++++++++------------------ include/linux/mfd/tps65090.h | 8 ++++-- 2 files changed, 28 insertions(+), 30 deletions(-) -- 2.14.3 diff --git a/drivers/regulator/tps65090-regulator.c b/drivers/regulator/tps65090-regulator.c index 395f35dc8cdb..2d398fa3b720 100644 --- a/drivers/regulator/tps65090-regulator.c +++ b/drivers/regulator/tps65090-regulator.c @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -300,26 +300,6 @@ static int tps65090_regulator_disable_ext_control( return tps65090_config_ext_control(ri, false); } -static void tps65090_configure_regulator_config( - struct tps65090_regulator_plat_data *tps_pdata, - struct regulator_config *config) -{ - if (gpio_is_valid(tps_pdata->gpio)) { - int gpio_flag = GPIOF_OUT_INIT_LOW; - - if (tps_pdata->reg_init_data->constraints.always_on || - tps_pdata->reg_init_data->constraints.boot_on) - gpio_flag = GPIOF_OUT_INIT_HIGH; - - config->ena_gpio = tps_pdata->gpio; - config->ena_gpio_initialized = true; - config->ena_gpio_flags = gpio_flag; - } else { - config->ena_gpio = -EINVAL; - config->ena_gpio_initialized = false; - } -} - #ifdef CONFIG_OF static struct of_regulator_match tps65090_matches[] = { { .name = "dcdc1", }, @@ -385,9 +365,26 @@ static struct tps65090_platform_data *tps65090_parse_dt_reg_data( rpdata->enable_ext_control = of_property_read_bool( tps65090_matches[idx].of_node, "ti,enable-ext-control"); - if (rpdata->enable_ext_control) - rpdata->gpio = of_get_named_gpio(np, - "dcdc-ext-control-gpios", 0); + if (rpdata->enable_ext_control) { + enum gpiod_flags gflags; + + if (ri_data->constraints.always_on || + ri_data->constraints.boot_on) + gflags = GPIOD_OUT_HIGH; + else + gflags = GPIOD_OUT_LOW; + + rpdata->gpiod = devm_gpiod_get_from_of_node(&pdev->dev, + tps65090_matches[idx].of_node, + "dcdc-ext-control-gpios", 0, + gflags, + "tps65090"); + if (IS_ERR(rpdata->gpiod)) + return ERR_CAST(rpdata->gpiod); + if (!rpdata->gpiod) + dev_err(&pdev->dev, + "could not find DCDC external control GPIO\n"); + } if (of_property_read_u32(tps65090_matches[idx].of_node, "ti,overcurrent-wait", @@ -455,8 +452,7 @@ static int tps65090_regulator_probe(struct platform_device *pdev) */ if (tps_pdata && is_dcdc(num) && tps_pdata->reg_init_data) { if (tps_pdata->enable_ext_control) { - tps65090_configure_regulator_config( - tps_pdata, &config); + config.ena_gpiod = tps_pdata->gpiod; ri->desc->ops = &tps65090_ext_control_ops; } else { ret = tps65090_regulator_disable_ext_control( diff --git a/include/linux/mfd/tps65090.h b/include/linux/mfd/tps65090.h index 67d144b3b8f9..f05bf4a146e2 100644 --- a/include/linux/mfd/tps65090.h +++ b/include/linux/mfd/tps65090.h @@ -83,6 +83,8 @@ enum { #define TPS65090_MAX_REG TPS65090_REG_AD_OUT2 #define TPS65090_NUM_REGS (TPS65090_MAX_REG + 1) +struct gpio_desc; + struct tps65090 { struct device *dev; struct regmap *rmap; @@ -95,8 +97,8 @@ struct tps65090 { * @reg_init_data: The regulator init data. * @enable_ext_control: Enable extrenal control or not. Only available for * DCDC1, DCDC2 and DCDC3. - * @gpio: Gpio number if external control is enabled and controlled through - * gpio. + * @gpiod: Gpio descriptor if external control is enabled and controlled through + * gpio * @overcurrent_wait_valid: True if the overcurrent_wait should be applied. * @overcurrent_wait: Value to set as the overcurrent wait time. This is the * actual bitfield value, not a time in ms (valid value are 0 - 3). @@ -104,7 +106,7 @@ struct tps65090 { struct tps65090_regulator_plat_data { struct regulator_init_data *reg_init_data; bool enable_ext_control; - int gpio; + struct gpio_desc *gpiod; bool overcurrent_wait_valid; int overcurrent_wait; };