From patchwork Mon Feb 12 13:17:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 128061 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3201219ljc; Mon, 12 Feb 2018 05:18:10 -0800 (PST) X-Google-Smtp-Source: AH8x226fov6Clxx8xAFyOlyrIgNoYssIJIFGoCif8X7RIA2rMK0cs6rl0zlnl9wsURkOzXClkiJg X-Received: by 2002:a17:902:7008:: with SMTP id y8-v6mr10783229plk.358.1518441490134; Mon, 12 Feb 2018 05:18:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518441490; cv=none; d=google.com; s=arc-20160816; b=StHrprGmOtNvdoAJtzyBS2/JnAM2vgCq0dzvrvMFMqD8Aspugu2Q+ZRhLxxjutf1tn h8ESIdJ+PzL3Xc4QB5ZqbsY7Stb/Ydhc+hm/g+JbAJfeM6MZCaVD5k8e6hTYxFxzWLIi boG2TyQ/yyKhuiAnbrqoe18dDpPd8tacUTeE0y78Wxkw9qlKvaabmYSErWqjG8MWs1PH 5QXw+Sk+GvUpovUQbagE2SliSbuQAsFh+YBvnSjaaErBppWKOtnOytxUJ9bOpkMVD75K YvZ84FdG0r/tlFhNEDYCy7JSAPDntvmgthwzHFeyjwWndXuLKK9l+zt8QYd2oYDEod2Y 8JYA== 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=5qmUC/1eGwV+uOvff6xJWgLGLq07yd1DLO8dgHO0TXw=; b=hm2o+vJYvUO21LCdpPxcWpp73CBFRUCCTZbDK0PU+WvTOxoQl9yVlAPyscSFlotiOK NoJb+VcPF6ZSR56iPZvgnmuIJV2gAd/zXvJPD3oNSBXfZNmAprLgolmCP8+aNEzPWcnt zGLNbmbXCjvYiH1JZhQ6EoVmaO1dBJ70cifaC43Xjr9eujUXbQBh5IikamlJskXed+e4 GqaJMHJJA+A/JUeDNVgBWo35hPO5MUNxbi/YLAk2VRRd+MzhqMzwGq7qY1FWwD4pV1m9 Ah3ghiFtnS7PYMV8/YOH91S+PoXXUbhPewQKEzSsSD7VFJvPjXTru6LurV6WSfyVrmCM 4ynw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iEvkvdGK; 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 j15si3605235pgt.173.2018.02.12.05.18.09; Mon, 12 Feb 2018 05:18:10 -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=iEvkvdGK; 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 S935322AbeBLNSH (ORCPT + 13 others); Mon, 12 Feb 2018 08:18:07 -0500 Received: from mail-lf0-f66.google.com ([209.85.215.66]:38477 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935300AbeBLNSB (ORCPT ); Mon, 12 Feb 2018 08:18:01 -0500 Received: by mail-lf0-f66.google.com with SMTP id g72so20371782lfg.5 for ; Mon, 12 Feb 2018 05:18:00 -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=5qmUC/1eGwV+uOvff6xJWgLGLq07yd1DLO8dgHO0TXw=; b=iEvkvdGK2lGbgx0IbXyut1dl6imeI5yv1RUygTliPHEnrNQgomW8n2yW16PAIRq8/Z Y0e0BGuNSK4KFI9R3jdhQawzLGeKtBS2rwvd6sMfRzOfyJYgzjKfMyGAIagCFG5S0TrU wD7ecW6zhsntMEvPGKKKn+cTsSn7aWIC8e/vQ= 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=5qmUC/1eGwV+uOvff6xJWgLGLq07yd1DLO8dgHO0TXw=; b=ZAyN2ZQEMH3XNUPhp+0rqVwWE4cfFwVOV8q8oqyY1U9K3rS8AaddjdWTodcnovTyH0 wUJFeWlSW2XxqFKViGv29VwQpiuO59edF1wdQnoBZsJCimCoQgYHyHPAX6QkkXiImbQe w009bv8aTn+HD+SVrRnaUZ3kde4EKI+aoC1U86f1bCy+06aQfsK4SBc52tkKGiIjgWP4 EFwKnhUw1MH055q6V34iqFGXYF2OpRi1w0Kee8UQKgxLNBtZG3WLq4C9lv6VNmBjOAao yMp+8AxbOqkGYWblKjejQiXQ0/bgfSb2lRD+TPmD4rYjnMpJDetnfvKhALelLbfoYxZ3 lvYQ== X-Gm-Message-State: APf1xPD8pc1xR6v4U17x1h4js1S/ffVLyjB7nK2jwmjdOOd9OHMHZi59 zwVRtNNOuTqSPw85cUUMpDLcv8SDA9E= X-Received: by 10.46.74.17 with SMTP id x17mr7629225lja.84.1518441480063; Mon, 12 Feb 2018 05:18:00 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id r88sm1584648lje.30.2018.02.12.05.17.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Feb 2018 05:17:59 -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 14/21] regulator: s5m8767: Pass descriptor instead of GPIO number Date: Mon, 12 Feb 2018 14:17:10 +0100 Message-Id: <20180212131717.27193-15-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: would be nice if you could ACK this smallish patch to the MFD header. --- drivers/regulator/s5m8767.c | 26 +++++++++++++++----------- include/linux/mfd/samsung/core.h | 4 +++- 2 files changed, 18 insertions(+), 12 deletions(-) -- 2.14.3 Acked-by: Lee Jones diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 4836947e1521..b8443a360646 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c @@ -13,6 +13,7 @@ #include #include +#include #include #include #include @@ -459,15 +460,14 @@ static void s5m8767_regulator_config_ext_control(struct s5m8767_info *s5m8767, return; } - if (!gpio_is_valid(rdata->ext_control_gpio)) { + if (!rdata->ext_control_gpiod) { dev_warn(s5m8767->dev, "ext-control for %s: GPIO not valid, ignoring\n", - rdata->reg_node->name); + rdata->reg_node->name); return; } - config->ena_gpio = rdata->ext_control_gpio; - config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH; + config->ena_gpiod = rdata->ext_control_gpiod; } /* @@ -577,8 +577,14 @@ static int s5m8767_pmic_dt_parse_pdata(struct platform_device *pdev, continue; } - rdata->ext_control_gpio = of_get_named_gpio(reg_np, - "s5m8767,pmic-ext-control-gpios", 0); + rdata->ext_control_gpiod = devm_gpiod_get_from_of_node(&pdev->dev, + reg_np, + "s5m8767,pmic-ext-control-gpios", + 0, + GPIOD_OUT_HIGH, + "s5m8767"); + if (IS_ERR(rdata->ext_control_gpiod)) + return PTR_ERR(rdata->ext_control_gpiod); rdata->id = i; rdata->initdata = of_get_regulator_init_data( @@ -954,10 +960,8 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) config.driver_data = s5m8767; config.regmap = iodev->regmap_pmic; config.of_node = pdata->regulators[i].reg_node; - config.ena_gpio = -EINVAL; - config.ena_gpio_flags = 0; - config.ena_gpio_initialized = true; - if (gpio_is_valid(pdata->regulators[i].ext_control_gpio)) + config.ena_gpiod = NULL; + if (pdata->regulators[i].ext_control_gpiod) s5m8767_regulator_config_ext_control(s5m8767, &pdata->regulators[i], &config); @@ -970,7 +974,7 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) return ret; } - if (gpio_is_valid(pdata->regulators[i].ext_control_gpio)) { + if (pdata->regulators[i].ext_control_gpiod) { ret = s5m8767_enable_ext_control(s5m8767, rdev); if (ret < 0) { dev_err(s5m8767->dev, diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h index 5a23dd4df432..28f4ae76271d 100644 --- a/include/linux/mfd/samsung/core.h +++ b/include/linux/mfd/samsung/core.h @@ -39,6 +39,8 @@ #define STEP_12_5_MV 12500 #define STEP_6_25_MV 6250 +struct gpio_desc; + enum sec_device_type { S5M8751X, S5M8763X, @@ -151,7 +153,7 @@ struct sec_regulator_data { int id; struct regulator_init_data *initdata; struct device_node *reg_node; - int ext_control_gpio; + struct gpio_desc *ext_control_gpiod; }; /*