From patchwork Sun Apr 22 23:07:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 133930 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp368209lji; Sun, 22 Apr 2018 16:10:14 -0700 (PDT) X-Google-Smtp-Source: AIpwx49/wE+IM+1Np8YLtPVgHjwT6KW9xuumg8/mINXNTmqhpjp1nNeDs65DAUEIv7k2reaZ+gdz X-Received: by 2002:a17:902:7c0e:: with SMTP id x14-v6mr19081886pll.392.1524438613955; Sun, 22 Apr 2018 16:10:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524438613; cv=none; d=google.com; s=arc-20160816; b=Z3X/pH56Rd1u+KKoODqL74QdRYgPuuB3bVJCWTiWbSShizRNmjvBAwWi52dlX34S6r ZxdL2WBIQvbj+S+SL0DaR27O/V5BpRBO9x93L9ry7D7RaKRkjL9w1BcblbqPR22xSnQs LK2suJHdPVywZsRYCedhP3s/s21Ow1JnY+EoiTozmrS+LHAZwcDGsDDSXJ5SUIl6yPJq TBNpQTMOQNzE01EPAYwrXjNUoMposNUSqfXCnCc54WBvdbeWUHOtzJH7XSwvEo+/U4uT vLk8/Ze1xEeJY6YieYlTS3bKe+cRZC4Tmk/1SgmlJfehmoRWCLDOAmqnQzcSkAEm85dg QSMg== 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=t7UGbbBFvbxu1BIVCL8+ik8ewwJkUge6BHhtP3paDlE=; b=i7GVWwn+MhBXXiZ3uhJT8I4578TaKkhVgHV4KGp8+4BZQ+R/xJwev3PMbOa+dSmPaa RJMK8rwhEBRE+ZGmkOcef9ka/XmYQvLrXVQo8Z364wNJoKfHZ+jSusVu6g07tLsV5TUF h9m08i+u3u7ASg9R5zd1jKgHlrSLALYKUM86SDPcWy+9E0+6Xo1bhbQXVUmYBxXV2RUu sEkYTy6KCzu82MfryTjRvFZT/fFvwOTZ7rafLcGTidN1uxm1iYL8QOAUeqmj5rzDShGu 7FAIZ26GwiJUOpE2hliT+wa5qHEHdRMr3kSR38XnGQp6nGx302RCBxD+s1hKnPoQk9Xc VOiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=e09xkB4m; 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 k10si7616465pgs.304.2018.04.22.16.10.13; Sun, 22 Apr 2018 16:10:13 -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=e09xkB4m; 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 S1753860AbeDVXKE (ORCPT + 29 others); Sun, 22 Apr 2018 19:10:04 -0400 Received: from mail-lf0-f68.google.com ([209.85.215.68]:40592 "EHLO mail-lf0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753707AbeDVXJ6 (ORCPT ); Sun, 22 Apr 2018 19:09:58 -0400 Received: by mail-lf0-f68.google.com with SMTP id i18-v6so12224879lfc.7 for ; Sun, 22 Apr 2018 16:09:57 -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=t7UGbbBFvbxu1BIVCL8+ik8ewwJkUge6BHhtP3paDlE=; b=e09xkB4mR6p3RhnilzsQ9zD4J5pREi5zXBkH6ZgbwVZm8pUwWXMioSTantIVClphdk y+khvzx4PKH+RLC2y4CdG0/80Ikn+XI+ouVgDpCheWvDKoo/mBCdbnXRgoEvEYmBYnhS aEXbR0DRq4c9P9SqmUJjNPRVgkGsQ1lUZb6Tg= 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=t7UGbbBFvbxu1BIVCL8+ik8ewwJkUge6BHhtP3paDlE=; b=Ja7s62sjWF2R4osT5PBd9KOqJnXDzy1f9lQvXGM1U71GkTjb5eBHbcdY4/U7pTQIbi lA3NbhNEDb8yET8u6Y+i3cplMMP+kSlpOPnSNJtJjmJEtUz2Nyyck5vx/2zSp/DwfHmc DhnabrNqtTdcrzmtn/5yT8w+ZAEIEDcA89SBikY4KYMjchb/6FGg6ifjj1NiW/vjwo2N +5bYnZjVdh6SuHZHVYNdI78IP0heA/JXUm0yhkLwXZL0cCw3LCKsNocSam0guBY7HxO0 Y1B9VChc7Mwqe5r7tMIZH5CBXuAgvH1kqU2NiOCL0xZS4PdUd+M+KzqWb3gvw51Ryyd1 6bFQ== X-Gm-Message-State: ALQs6tClAdN/lTm8TSaoG4ihHgHbwsqDLoX/czyzAHF8fpRJ03RBOjqw 6d2nqfu0qX9Whsp6vVrEFza8jA== X-Received: by 2002:a19:e444:: with SMTP id b65-v6mr7152530lfh.61.1524438596876; Sun, 22 Apr 2018 16:09:56 -0700 (PDT) Received: from localhost.localdomain (c-ae7b71d5.014-348-6c756e10.cust.bredbandsbolaget.se. [213.113.123.174]) by smtp.gmail.com with ESMTPSA id r25sm2036291ljc.8.2018.04.22.16.09.55 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 16:09:56 -0700 (PDT) From: Linus Walleij To: Liam Girdwood , Mark Brown Cc: linux-kernel@vger.kernel.org, Linus Walleij , patches@opensource.cirrus.com, Richard Fitzgerald , Charles Keepax Subject: [PATCH 03/18 v2] regulator: arizona-ldo1: Look up a descriptor and pass to the core Date: Mon, 23 Apr 2018 01:07:27 +0200 Message-Id: <20180422230742.3729-3-linus.walleij@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180422230742.3729-1-linus.walleij@linaro.org> References: <20180422230742.3729-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_optional() call. We have augmented the GPIO core to look up the regulator special GPIO "wlf,ldoena" in commit 6a537d48461d "gpio: of: Support regulator nonstandard GPIO properties". Cc: patches@opensource.cirrus.com Cc: Richard Fitzgerald Cc: Charles Keepax Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebase the patch on the other changes. - Make sure to update some s3c64xx platform data properly. --- arch/arm/mach-s3c64xx/mach-crag6410-module.c | 28 ++++++++++++++++++++++------ drivers/regulator/arizona-ldo1.c | 19 ++++++------------- include/linux/regulator/arizona-ldo1.h | 3 --- 3 files changed, 28 insertions(+), 22 deletions(-) -- 2.14.3 diff --git a/arch/arm/mach-s3c64xx/mach-crag6410-module.c b/arch/arm/mach-s3c64xx/mach-crag6410-module.c index f00988705408..5da041edd3b4 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410-module.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410-module.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include @@ -206,9 +207,6 @@ static const struct i2c_board_info wm1277_devs[] = { }; static struct arizona_pdata wm5102_reva_pdata = { - .ldo1 = { - .ldoena = S3C64XX_GPN(7), - }, .gpio_base = CODEC_GPIO_BASE, .irq_flags = IRQF_TRIGGER_HIGH, .micd_pol_gpio = CODEC_GPIO_BASE + 4, @@ -237,10 +235,16 @@ static struct spi_board_info wm5102_reva_spi_devs[] = { }, }; -static struct arizona_pdata wm5102_pdata = { - .ldo1 = { - .ldoena = S3C64XX_GPN(7), +static struct gpiod_lookup_table wm5102_reva_gpiod_table = { + .dev_id = "spi0.1", /* SPI device name */ + .table = { + GPIO_LOOKUP("GPION", 7, + "wlf,ldo1ena", GPIO_ACTIVE_HIGH), + { }, }, +}; + +static struct arizona_pdata wm5102_pdata = { .gpio_base = CODEC_GPIO_BASE, .irq_flags = IRQF_TRIGGER_HIGH, .micd_pol_gpio = CODEC_GPIO_BASE + 2, @@ -264,6 +268,15 @@ static struct spi_board_info wm5102_spi_devs[] = { }, }; +static struct gpiod_lookup_table wm5102_gpiod_table = { + .dev_id = "spi0.1", /* SPI device name */ + .table = { + GPIO_LOOKUP("GPION", 7, + "wlf,ldo1ena", GPIO_ACTIVE_HIGH), + { }, + }, +}; + static struct spi_board_info wm5110_spi_devs[] = { [0] = { .modalias = "wm5110", @@ -366,6 +379,9 @@ static int wlf_gf_module_probe(struct i2c_client *i2c, rev == gf_mods[i].rev)) break; + gpiod_add_lookup_table(&wm5102_reva_gpiod_table); + gpiod_add_lookup_table(&wm5102_gpiod_table); + if (i < ARRAY_SIZE(gf_mods)) { dev_info(&i2c->dev, "%s revision %d\n", gf_mods[i].name, rev + 1); diff --git a/drivers/regulator/arizona-ldo1.c b/drivers/regulator/arizona-ldo1.c index 96fddfff5dc4..f6d6a4ad9e8a 100644 --- a/drivers/regulator/arizona-ldo1.c +++ b/drivers/regulator/arizona-ldo1.c @@ -17,12 +17,11 @@ #include #include #include -#include +#include #include #include #include #include -#include #include #include @@ -198,16 +197,6 @@ static int arizona_ldo1_of_get_pdata(struct arizona_ldo1_pdata *pdata, struct device_node *init_node, *dcvdd_node; struct regulator_init_data *init_data; - pdata->ldoena = of_get_named_gpio(np, "wlf,ldoena", 0); - if (pdata->ldoena < 0) { - dev_warn(config->dev, - "LDOENA GPIO property missing/malformed: %d\n", - pdata->ldoena); - pdata->ldoena = 0; - } else { - config->ena_gpio_initialized = true; - } - init_node = of_get_child_by_name(np, "ldo1"); dcvdd_node = of_parse_phandle(np, "DCVDD-supply", 0); @@ -264,7 +253,11 @@ static int arizona_ldo1_common_init(struct platform_device *pdev, } } - config.ena_gpio = pdata->ldoena; + /* We assume that high output = regulator off */ + config.ena_gpiod = devm_gpiod_get_optional(&pdev->dev, "wlf,ldoena", + GPIOD_OUT_HIGH); + if (IS_ERR(config.ena_gpiod)) + return PTR_ERR(config.ena_gpiod); if (pdata->init_data) config.init_data = pdata->init_data; diff --git a/include/linux/regulator/arizona-ldo1.h b/include/linux/regulator/arizona-ldo1.h index c685f1277c63..fe74ab9990e6 100644 --- a/include/linux/regulator/arizona-ldo1.h +++ b/include/linux/regulator/arizona-ldo1.h @@ -14,9 +14,6 @@ struct regulator_init_data; struct arizona_ldo1_pdata { - /** GPIO controlling LDOENA, if any */ - int ldoena; - /** Regulator configuration for LDO1 */ const struct regulator_init_data *init_data; };