From patchwork Mon Feb 12 13:17:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 128072 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3202667ljc; Mon, 12 Feb 2018 05:19:51 -0800 (PST) X-Google-Smtp-Source: AH8x224e2Q6d7g4pjaOyimtFJoc125dqZFKHxvivj3fwWKW+pp8xkVPkGlFDb+I0LKvX+4ZtJ5NC X-Received: by 10.101.93.142 with SMTP id f14mr9150433pgt.82.1518441591524; Mon, 12 Feb 2018 05:19:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518441591; cv=none; d=google.com; s=arc-20160816; b=t91xp4vhYhMd19TirABdNkxIQ4OO3y5ToziAw2S5S015EcLizqrD6Qrmx5xS+5oGAp 5mJnYo5t/gp3NnbvccAgZoxzXYTxMn9iXHiuQj4lPsYlx0//L6GlIys8OFFh3obGs3vu l4A892rFLeZVA6VCMJoyJFf/Jc9g8bqQ2b6EPx21ueB5XIPR/7TnDLmYYu50EsFTjUnN 9phbjM8/l94DQeW/KopT+jJdz4lGUG5cwO7/7lXJgbEGtZjuivQoBweR6KwEKWU5AXFN Sqa3ea5TAm2lw/jg0n7RU8U4lbdqhL8EZ3rffMr4dBMYewMKhojaZA2x9UbOAFrpC7iG c68Q== 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=iS7YMbMa3i6KrieAXv7AYFWFkYDgLO+yTHSLHkI0Vbg=; b=p1WLLzgwLfcYTr6ufZl8UPOJUJrH5RxNuOWPqwdYtAfXnqiQG/hwIYnGIUO0QIfzqq 9Ns3hYh7/BoGb6Kz1WR+FVMHM9Tv8e0X7r+J1vzu4Uwg/q0j9LOoApLkDjL6gn5eA4jQ THqpNowAVVsGhP4qMXG3Tz9PaTnCBrKTtirewVizoar1/11Rbt2Cx2yYlfErin51ZU9s 7cMRbnceolAx5YNtcytcCjkes1s3BzIgGABkuIQvcpG1gsZsojcrWa4N8Ep7DPYVYejO 8yyOBJDuppEuudNYMktn01xxlHsJ0DRXW32jLln3DemMd1/mhfMitWHPGxQE0FIKUJL4 4ofQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QZS3nBVb; 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 j11-v6si3781695pll.485.2018.02.12.05.19.51; Mon, 12 Feb 2018 05:19:51 -0800 (PST) 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=QZS3nBVb; 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 S935419AbeBLNTr (ORCPT + 13 others); Mon, 12 Feb 2018 08:19:47 -0500 Received: from mail-lf0-f68.google.com ([209.85.215.68]:36312 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935287AbeBLNSD (ORCPT ); Mon, 12 Feb 2018 08:18:03 -0500 Received: by mail-lf0-f68.google.com with SMTP id t79so20401612lfe.3 for ; Mon, 12 Feb 2018 05:18:02 -0800 (PST) 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=iS7YMbMa3i6KrieAXv7AYFWFkYDgLO+yTHSLHkI0Vbg=; b=QZS3nBVblcC1MMyk+ENU6hPVc71rsqLMp49EkzpFmjgm60c3PZinFmXgHrjQptPecL WmVuqE4Nf0hN2cvfdmypG9i/3roe0XqMufQ7OXhlC/0cF4eoTeNxKLOGXFzpd9zDbuEl dKiUqH2qcxAXWGFSTWzIRMOE6gIRSoF6H6KrU= 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=iS7YMbMa3i6KrieAXv7AYFWFkYDgLO+yTHSLHkI0Vbg=; b=Rb07AF2v5KITI/7YTKXcFEWZjMXwv2wAtgP7D2/ELR0czJXOAMSXdrIjoXf6bbw4B6 Cf4GRm6ze7rSFhcgmXumqWHS/k7i0pOZgPvbXJVn2w51R7VVGtTObqrks+A91vXlXCEk zciyeb6aWtiRsQAicYpUodz/UhtEmdT7FxMh62mjHM4siwHeE2ICbO7uIzXJrPNjBifv PrEOIVyaTcWc68D29JOkCMPlu35dX6cu9oEg0vA7d3FZ8pdpJ//KR7JtRBh92amEKl7Z uPYm3UBJjtriX19nUqJErJMuH5WlPqYyRi7I4YNanhId2ey9JSIlJlmJ2//JPs3pzUJJ OoLQ== X-Gm-Message-State: APf1xPD6GjLPbIF1HHiApf2VuWQ9zY/n+SPzsS59oRIBtQKp9gz2hLR1 bsHGnfBJ3fQtDRl3/WDOoa+7pg== X-Received: by 10.46.65.152 with SMTP id d24mr7384703ljf.109.1518441481868; Mon, 12 Feb 2018 05:18:01 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id r88sm1584648lje.30.2018.02.12.05.18.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 05:18:01 -0800 (PST) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, Linus Walleij , Lee Jones Subject: [PATCH 15/21] regulator: tps65090: Pass descriptor instead of GPIO number Date: Mon, 12 Feb 2018 14:17:11 +0100 Message-Id: <20180212131717.27193-16-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180212131717.27193-1-linus.walleij@linaro.org> References: <20180212131717.27193-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. Cc: Lee Jones Signed-off-by: Linus Walleij --- Lee: it would be nice if you could ACK this smallish patch to the MFD header. --- drivers/regulator/tps65090-regulator.c | 50 ++++++++++++++++------------------ include/linux/mfd/tps65090.h | 8 ++++-- 2 files changed, 28 insertions(+), 30 deletions(-) -- 2.14.3 Acked-by: Lee Jones 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; };