From patchwork Mon May 14 08:06:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 135684 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp1444160lji; Mon, 14 May 2018 01:12:14 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrtHotfpNqIJZbI7Wgn1hNlMdA/wAb6ULFpL5K4wWYhFj1Kgm42y6RVtRbFPAPH380/Y3Kc X-Received: by 2002:a17:902:704c:: with SMTP id h12-v6mr8799690plt.269.1526285534210; Mon, 14 May 2018 01:12:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526285534; cv=none; d=google.com; s=arc-20160816; b=B/cY0G4PPqXsqkHEcExivDVZKkuw0B9Igfue3cGE0JCERr9IPQkwfmf51ilxjaWdcL YncBQpIMHsK/OIGo6DXB7KfzBrzH9Rx2S9GwfGbd/KhSvL/CEYyhnIr5j+McD/zHOYKO EHCvSF++IyBxuKXwF1HETfWrDCtoxLyJzg8a/wmcFaE2SUZxKQ/NyQghrlu0R4A3DT7D SHfJ3X1AGy6EyCHbJWTqBDrQKd4hhmUQMwD+cP3oXoBgpwXvtntGZFOFvPMIOIkbRVwU F32I3iaq+Ok1pITjPKNf/NG+7RbhRsPQ/mCj6ciNE0EJmxvF6Zsp2ZpHfyjYTTNN3+Ti Zo4w== 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=H3W8X/oQAyR92nkO70yecClyKJhVPUQDgCQhu9u9v3A=; b=s7irjdmn30nP0Sq7O0IWfFknMlACyW6bkIhrft/bmjUe7Ps6S2KPu1hdHMIMEdAHez TtlfLgCb//aa0qiUPqDqU5YFgIGT1YWosZTZcUy6l1I9p36gxd3adkUXJKLkTCkFNB0E N15RRczrCT2KxcBzZVBoGW//uYOkuRbUXw8/XptZcvhKfRmzTKySBf4KUIIABSpy5AUX QLe5J0+7qcPFRUynfR8eNvDa9+RLWjxgpQhRrb/4hYABLriOOY4SKJ2K5k6dWdi5FEjr a3xoxhyN2zXnr1HDK3zR9g6uG6GUu4kpviUleFTjonqbRO2zK5+052cVMB6srURMvL4L 4zaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WiS/gsFz; 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 n9-v6si7106669pgq.470.2018.05.14.01.12.13; Mon, 14 May 2018 01:12:14 -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=WiS/gsFz; 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 S1752441AbeENIMK (ORCPT + 29 others); Mon, 14 May 2018 04:12:10 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:37494 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751982AbeENIHE (ORCPT ); Mon, 14 May 2018 04:07:04 -0400 Received: by mail-lf0-f68.google.com with SMTP id r2-v6so16556942lff.4 for ; Mon, 14 May 2018 01:07:03 -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=H3W8X/oQAyR92nkO70yecClyKJhVPUQDgCQhu9u9v3A=; b=WiS/gsFzmncmt1M+InsIqF044DoJdCTnofHmwjmptgf1ntglznGcHPwk22/qoRAZXg IELJwURHoc7smmKknAVQYSX5oHLQMuwPM6t8Ajmc7cNI982VX1wQ6AWgsAvhR5fMorDD /R2e3GSpiKT3/KULNCTYbMmiW/mrh0y+FoAXo= 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=H3W8X/oQAyR92nkO70yecClyKJhVPUQDgCQhu9u9v3A=; b=hoiPg3uXsC9Q/P7vjZCjvLhVJA9GycmKT/cZfqKj7yydNORnROtThCGBLWhugaDw9m qIe+15s+mNusAuzom5i9ehrGj1H1zblZLxMGfJ7wCt5A1/G7aWvsykN+pQtAPGsvmXSl DoJqRpm7j6rIfaWCIP40oy7R0IDvQ8x8oMY8r9jUQxSXp/doj1n4PmsbOLn67sLby38k AyI0iKVhem9xlG7i0OoBE1M4aHxNmZWV/7WwpflW6nlKHFJQq+oCVVztyHGSBqj5HS2W I5aXOhFFlHhAQ38Vx+h3+Ilni0OBjHc+CNbjaBDts9btmZwHKSzChGA0/x7/PMQmW35D HAjQ== X-Gm-Message-State: ALKqPwd5xUXY10SparDsK6qbkZW7iijMGbRVwBwPHVWH0XvPDK5wxEW9 awn2QViZgjFmOnpUPaR8JdszzQ== X-Received: by 2002:a19:c749:: with SMTP id x70-v6mr8253232lff.32.1526285222548; Mon, 14 May 2018 01:07:02 -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.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 14 May 2018 01:07:01 -0700 (PDT) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Linus Walleij , Milo Kim Subject: [PATCH 07/19 v3] regulator: lp8788-ldo: Pass descriptor instead of GPIO number Date: Mon, 14 May 2018 10:06:28 +0200 Message-Id: <20180514080640.12515-8-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 with the standard devm_gpiod_get_index_optional() call. This driver has supported passing a LDO enable GPIO for years, yet this facility has never been put to use in the upstream kernel. If someone desires to put in place GPIO control for the LDOs, this can be done by adding a GPIO descriptor table in the MFD nexus in drivers/mfd/lp8788.c for the LDO device when spawning the MFD children, or using a board file. Cc: Milo Kim 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/lp8788-ldo.c | 32 ++++++++++++++++---------------- include/linux/mfd/lp8788.h | 16 ---------------- 2 files changed, 16 insertions(+), 32 deletions(-) -- 2.17.0 diff --git a/drivers/regulator/lp8788-ldo.c b/drivers/regulator/lp8788-ldo.c index cbfd35873575..f2347474a106 100644 --- a/drivers/regulator/lp8788-ldo.c +++ b/drivers/regulator/lp8788-ldo.c @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include /* register address */ @@ -85,8 +85,6 @@ #define LP8788_STARTUP_TIME_S 3 #define ENABLE_TIME_USEC 32 -#define ENABLE GPIOF_OUT_INIT_HIGH -#define DISABLE GPIOF_OUT_INIT_LOW enum lp8788_ldo_id { DLDO1, @@ -117,7 +115,7 @@ struct lp8788_ldo { struct lp8788 *lp; struct regulator_desc *desc; struct regulator_dev *regulator; - struct lp8788_ldo_enable_pin *en_pin; + struct gpio_desc *ena_gpiod; }; /* DLDO 1, 2, 3, 9 voltage table */ @@ -469,7 +467,6 @@ static int lp8788_config_ldo_enable_mode(struct platform_device *pdev, enum lp8788_ldo_id id) { struct lp8788 *lp = ldo->lp; - struct lp8788_platform_data *pdata = lp->pdata; enum lp8788_ext_ldo_en_id enable_id; u8 en_mask[] = { [EN_ALDO1] = LP8788_EN_SEL_ALDO1_M, @@ -504,11 +501,18 @@ static int lp8788_config_ldo_enable_mode(struct platform_device *pdev, return 0; } - /* if no platform data for ldo pin, then set default enable mode */ - if (!pdata || !pdata->ldo_pin || !pdata->ldo_pin[enable_id]) + /* FIXME: check default mode for GPIO here: high or low? */ + ldo->ena_gpiod = devm_gpiod_get_index_optional(&pdev->dev, + "enable", + enable_id, + GPIOD_OUT_HIGH); + if (IS_ERR(ldo->ena_gpiod)) + return PTR_ERR(ldo->ena_gpiod); + + /* if no GPIO for ldo pin, then set default enable mode */ + if (!ldo->ena_gpiod) goto set_default_ldo_enable_mode; - ldo->en_pin = pdata->ldo_pin[enable_id]; return 0; set_default_ldo_enable_mode: @@ -533,10 +537,8 @@ static int lp8788_dldo_probe(struct platform_device *pdev) if (ret) return ret; - if (ldo->en_pin) { - cfg.ena_gpio = ldo->en_pin->gpio; - cfg.ena_gpio_flags = ldo->en_pin->init_state; - } + if (ldo->ena_gpiod) + cfg.ena_gpiod = ldo->ena_gpiod; cfg.dev = pdev->dev.parent; cfg.init_data = lp->pdata ? lp->pdata->dldo_data[id] : NULL; @@ -582,10 +584,8 @@ static int lp8788_aldo_probe(struct platform_device *pdev) if (ret) return ret; - if (ldo->en_pin) { - cfg.ena_gpio = ldo->en_pin->gpio; - cfg.ena_gpio_flags = ldo->en_pin->init_state; - } + if (ldo->ena_gpiod) + cfg.ena_gpiod = ldo->ena_gpiod; cfg.dev = pdev->dev.parent; cfg.init_data = lp->pdata ? lp->pdata->aldo_data[id] : NULL; diff --git a/include/linux/mfd/lp8788.h b/include/linux/mfd/lp8788.h index 786bf6679a28..2010e0de3e34 100644 --- a/include/linux/mfd/lp8788.h +++ b/include/linux/mfd/lp8788.h @@ -181,20 +181,6 @@ struct lp8788_buck2_dvs { enum lp8788_dvs_sel vsel; }; -/* - * struct lp8788_ldo_enable_pin - * - * Basically, all LDOs are enabled through the I2C commands. - * But ALDO 1 ~ 5, 7, DLDO 7, 9, 11 can be enabled by external gpio pins. - * - * @gpio : gpio number which is used for enabling ldos - * @init_state : initial gpio state (ex. GPIOF_OUT_INIT_LOW) - */ -struct lp8788_ldo_enable_pin { - int gpio; - int init_state; -}; - /* * struct lp8788_chg_param * @addr : charging control register address (range : 0x11 ~ 0x1C) @@ -288,7 +274,6 @@ struct lp8788_vib_platform_data { * @aldo_data : regulator initial data for analog ldo * @buck1_dvs : gpio configurations for buck1 dvs * @buck2_dvs : gpio configurations for buck2 dvs - * @ldo_pin : gpio configurations for enabling LDOs * @chg_pdata : platform data for charger driver * @alarm_sel : rtc alarm selection (1 or 2) * @bl_pdata : configurable data for backlight driver @@ -306,7 +291,6 @@ struct lp8788_platform_data { struct regulator_init_data *aldo_data[LP8788_NUM_ALDOS]; struct lp8788_buck1_dvs *buck1_dvs; struct lp8788_buck2_dvs *buck2_dvs; - struct lp8788_ldo_enable_pin *ldo_pin[EN_LDOS_MAX]; /* charger */ struct lp8788_charger_platform_data *chg_pdata;