From patchwork Mon May 14 08:06:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 135682 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1443074lji; Mon, 14 May 2018 01:11:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZovbITxCJJAMPXvmr1vjs9oAtX6hpLR5hJFuqKlq0pun3KKb0vaxLAp4E7lV9e4yN42t9+z X-Received: by 2002:a65:5b8e:: with SMTP id i14-v6mr7740378pgr.352.1526285469380; Mon, 14 May 2018 01:11:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526285469; cv=none; d=google.com; s=arc-20160816; b=A/Fmk8OxG43VIQii+Ipta/bJ2U7OTYawpFa6eQFGbwN8QVyLwFw/JvL6Jqy8/998fL nz4NLEQ/w1/14vzykn2IwHjpyXVlZOtRTHQfAlU8l0dm2rECSa7nl5aDS311ua5CnPUs KcbKXxtlTL3Xda9bVe5D/RF4xc71hv/96kSSllcWkOGO0uesAJ5SyWuWA9zSE+v/j5aA R/SxdGTq9P9Lo2gtydfCD4wiqSwA/+TABvG9ow4yYXQUQkCKdSp8ZcCznlMEpknQioaf ZfGSe4oyBUJkJ9cqstrKv67oOcQD3ffw/nOtFJOiLAR9kjzIAEQ7WE9aySSxamvG6I2T HJzw== 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=ttlgodo/0t7qIpnc2skubxKgJENhJJNr4mwPZICnA50=; b=p082DonbHdjF0uJHWUFOwOAxMSu4n16MA5EK2BWbzvBFSoR3jao1ouUSh1yjFThMET c/Ia+xlV2N09vDcHHg20p59GoKviH0/elzTWs/kZdqdCndMYQOIEPvOdF0CSlHk+NDkJ dprzbdYNyBRwd+RVx0fFtQMXE7KczkRwozz/QGhNg6vSLP6syFzSLo1hdayatmP/kjbx mf8+k4GAT/l4dOfFNXGBLdcnPZY9OJ0b1Mcxo+PGVk29iR4tnhWaJ3m1dWPAqH8D+Mu3 IFf6ATnhvXj88Uo9LZ7C9Tk+y30+YBGEeOfMWb7gFNoRsbqjlGP7sNmY4gxWVwhFWRcE SVDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jz3Lpcg2; 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 y25-v6si8784004pfn.248.2018.05.14.01.11.09; Mon, 14 May 2018 01:11:09 -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=jz3Lpcg2; 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 S1752572AbeENILE (ORCPT + 29 others); Mon, 14 May 2018 04:11:04 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:32818 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752226AbeENIHP (ORCPT ); Mon, 14 May 2018 04:07:15 -0400 Received: by mail-lf0-f68.google.com with SMTP id h9-v6so15560264lfi.0 for ; Mon, 14 May 2018 01:07:14 -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=ttlgodo/0t7qIpnc2skubxKgJENhJJNr4mwPZICnA50=; b=jz3Lpcg2bSZP58fMauzhhFHmNDbaDmiL6ceBZM+7Coa83hmnzKcLxYYUSvb8sMGCFp n1cEzGHEGgtQZ5tnOUIiZp33IJCqlHjj+/ynO6H9lV6/XiM6xzbcoALLJd6hWagler6I F3iywUfoTTnzi589F/InUA142QR0Q3dOzPfjQ= 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=ttlgodo/0t7qIpnc2skubxKgJENhJJNr4mwPZICnA50=; b=H6srX1sBtwrdCvY8oincrAotb3RgS7xCO+qhWyTbP58nscmWgkN/nbzeJloR649xTg FThie7cIH6c8seKDsMnYmUMue5emdYtJfENP3Xd+VaJYgYq4Ud/X3ss+AfJakZyBTIe7 QtDR8hT3/ncurqQaenwTE5VNrBLNMOcznw2+rSsSWdaR2q4Idd/tdmclb7FKNAHVVX4r sjsWnK6IM3dpHAe6kjy56Mo34q79TghU7XG2LCQ4fLWJfafbhL0h+ZoT/JZMM21TxaMW gX4U0MbgQ6SG7zmJ1MZqfHGzM6Vha09CXXclyYBPwOpYFC9H11L/xeMH9qEZoxZCi0mC EmGg== X-Gm-Message-State: ALKqPwd5NkoCC4GeNIFtDjQ3dcFkVrOGepPFNXwjlNgOUmsaoaC8O5q2 rbkcBq+DK8KFS3BY3ZfAt2/uwj1CSgg= X-Received: by 2002:a19:4ed1:: with SMTP id u78-v6mr7650333lfk.40.1526285234125; Mon, 14 May 2018 01:07:14 -0700 (PDT) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id s4-v6sm1725265ljh.9.2018.05.14.01.07.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 01:07:12 -0700 (PDT) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Linus Walleij Subject: [PATCH 12/19 v3] regulator: tps65090: Pass descriptor instead of GPIO number Date: Mon, 14 May 2018 10:06:33 +0200 Message-Id: <20180514080640.12515-13-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180514080640.12515-1-linus.walleij@linaro.org> References: <20180514080640.12515-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 v2->v3: - Resending. 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.17.0 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; };