From patchwork Mon May 14 08:06:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 135686 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1450546lji; Mon, 14 May 2018 01:18:38 -0700 (PDT) X-Google-Smtp-Source: AB8JxZomW9+szWEESYNFKMTMIJ+dwaGj8irlnk6W4TwmkeCNMCP/3sAUOhWaVV8fb1FMMhKsDAr4 X-Received: by 2002:a62:62c2:: with SMTP id w185-v6mr9453541pfb.78.1526285918313; Mon, 14 May 2018 01:18:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526285918; cv=none; d=google.com; s=arc-20160816; b=J6QlT1/Bxll4mcP0PsyucxETsM0e/HY79SV/rVTUqj6u4oaDbHw+CgqXBI7EgJfIt2 u5OYAjXLuyr2GQXQSdVZgc37yFxjhXzTX7e+Qud+ntVgp2FVmQzEYcl3jj+zAZ8cxXJr eXH4Mjr1AT69bMCZr98i2H1P/pJdUoH8ELsbNpIqGmvzNc8pF3zei9yZqjuDnaHWkS8x yE/+PIXrSeV4jUqjxAtWooIZRJfyzYzhzrdJE4CQBIxtvfGDrOddhtDR42E7VTw0+h15 pek526hmnDMUmZC4PKMGtPw3Ed2ysrz8n/HuDxIEAzssigENuZVod/pkICN5Kziez9wK vbBQ== 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=RdP7YtCvCRm+SKxjNunfqP/kd9Y28Uyre/s4qOHu8jw=; b=mcOnrI8UYMCRaKm2vQpA1T2fCaUjqq8BHP42Zjle6NONBQMPl2iJ3bZMdQ8SC0ZUJJ EZUCiAOsfrz0bLEHL/aECQkYgWk2AgIpBViH+4ewMPHk5f5mlgiJvkVpeIwY0Tne60/s Gm+vJW9bgul0x4yb0nudwCyujsLHIIyb8PVkCi9nMoecorTdw/RrNHvJUDRUmY8zsgxC ZPUth9rN2hUOCvLUhWVWYJFhg5Gkp8gSlkSQQOECdDK3clAbW5LcEVRsRjEFOdtRMsPS HGkyFXJ6UzD+uk9Y/or/nrdz+8VJJR/mOKR1tqxtdtgFlfKLpBeSMzhTAe2o5i3Ed6pu S/CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kZW+bUFl; 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 t24-v6si9001757pfj.231.2018.05.14.01.18.38; Mon, 14 May 2018 01:18:38 -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=kZW+bUFl; 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 S1752590AbeENISe (ORCPT + 29 others); Mon, 14 May 2018 04:18:34 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:40007 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752137AbeENIG7 (ORCPT ); Mon, 14 May 2018 04:06:59 -0400 Received: by mail-lf0-f68.google.com with SMTP id p85-v6so16543103lfg.7 for ; Mon, 14 May 2018 01:06:58 -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=RdP7YtCvCRm+SKxjNunfqP/kd9Y28Uyre/s4qOHu8jw=; b=kZW+bUFlOba/g5mRpBVl2vTb2ecr8jpKs3ZQbglsQVGOYYHoHUiHj3m+CueJ/qRsCi 6VexccaOAb7ACoHM9Zbg2O/UEIjDQEsstwXu/66Zzy2Y912kKQLNDFA+0RZRyNvbDuAl T+/mAQN403ZDkr2PygmqqMD55zjODotfeffXA= 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=RdP7YtCvCRm+SKxjNunfqP/kd9Y28Uyre/s4qOHu8jw=; b=RCCwK2b6LoCRpbV5sNtENyc81Wx0xUH+JUafRsXj9Irj8kJiWg9VEDpwT8nPdlpkJl xhZ/ybt8TC5R9ey1eRWXVYkV3D1KH3x/feretjwPLl+i4MXKInR4h2ZPmnhNvcTxeRQS +n9mhEaOuEPo+AnrLqlSKNQSbV+P0RUPMM+/FDtDbJl6npRvXbZ7alVDDnzh6Zp3rMdI lWX0EF2/QeyHn4zXBg5Q/I61CWWduQSCRSkMAha/EYV+9M2m3itHnYU5lip4kmughvDg +yWyold/F5GRdD9CS+pGgoeLJZ7DQl5Yw2t30LCKGjMGecD/eXp9U8TOMB/GlCOoWUzX bNIg== X-Gm-Message-State: ALKqPwcWrNtgQjYc78VkfHJbSYpk8OFTmO01clQ2jhAVkiVxpJh2Y3Kw x5yF64apjGbXwQJrN1iI/ufmZA== X-Received: by 2002:a19:ca5b:: with SMTP id h27-v6mr7593130lfj.69.1526285217923; Mon, 14 May 2018 01:06:57 -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.06.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 01:06:56 -0700 (PDT) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Linus Walleij , Chanwoo Choi , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz Subject: [PATCH 05/19 v3] regulator: max77686: Pass descriptor instead of GPIO number Date: Mon, 14 May 2018 10:06:26 +0200 Message-Id: <20180514080640.12515-6-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, pass a descriptor looked up from the device tree configuration node. Cc: Chanwoo Choi Cc: Krzysztof Kozlowski Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Walleij --- ChangeLog v2->v3: - Name the regulator "max77686-regulator" - Set the regulator to NULL on erroneous lookup, restoring the old init data lookup behaviour. ChangeLog v1->v2: - Rebase the patch on the other changes. --- drivers/regulator/max77686-regulator.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) -- 2.17.0 Reviewed-by: Krzysztof Kozlowski Tested-by: Krzysztof Kozlowski diff --git a/drivers/regulator/max77686-regulator.c b/drivers/regulator/max77686-regulator.c index c301f3733475..37f98a8350f0 100644 --- a/drivers/regulator/max77686-regulator.c +++ b/drivers/regulator/max77686-regulator.c @@ -25,8 +25,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -90,6 +89,7 @@ enum max77686_ramp_rate { }; struct max77686_data { + struct device *dev; DECLARE_BITMAP(gpio_enabled, MAX77686_REGULATORS); /* Array indexed by regulator id */ @@ -269,16 +269,20 @@ static int max77686_of_parse_cb(struct device_node *np, case MAX77686_BUCK8: case MAX77686_BUCK9: case MAX77686_LDO20 ... MAX77686_LDO22: - config->ena_gpio = of_get_named_gpio(np, - "maxim,ena-gpios", 0); - config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH; - config->ena_gpio_initialized = true; + config->ena_gpiod = devm_gpiod_get_from_of_node(max77686->dev, + np, + "maxim,ena", + 0, + GPIOD_OUT_HIGH, + "max77686-regulator"); + if (IS_ERR(config->ena_gpiod)) + config->ena_gpiod = NULL; break; default: return 0; } - if (gpio_is_valid(config->ena_gpio)) { + if (config->ena_gpiod) { set_bit(desc->id, max77686->gpio_enabled); return regmap_update_bits(config->regmap, desc->enable_reg, @@ -521,6 +525,7 @@ static int max77686_pmic_probe(struct platform_device *pdev) if (!max77686) return -ENOMEM; + max77686->dev = &pdev->dev; config.dev = iodev->dev; config.regmap = iodev->regmap; config.driver_data = max77686;