From patchwork Mon Oct 2 12:08:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 114588 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp608013qgn; Mon, 2 Oct 2017 05:12:28 -0700 (PDT) X-Google-Smtp-Source: AOwi7QD1SkhrsNyTu39rh1b6f4tWFM1i9fnFE4rLlQIVK6cFYDHXdkqN7fScBVaTRowrhO6+xklE X-Received: by 10.98.49.67 with SMTP id x64mr14697227pfx.11.1506946348211; Mon, 02 Oct 2017 05:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506946348; cv=none; d=google.com; s=arc-20160816; b=zF4h2ccgAbCQbQhFoFetuwKZ1/oYbPH5bWW27n73LbpD2plKXNDCHgwSrVwKYa6A1M Xjb341OWF7DbwpsyZo47CSdPSzDMe5eIBwsso5BVO0rXLWNb54XoUiea2FYWc59tJ2h0 BBmMn4faYyDOljbOnKmfigB9Tbedd4fq82RxsRVKs9IY4YA1jX4LUUMjsi3zQcOvw5WK aHtWaxW/AG7F/Tb01p4m9RpznphI9NP3KdrI9gfCzbLNv42b0ridJjVJT7KBn/OILKFF E0A8NoXGxWJcqd7r9g699a05EZpgrPiLGSR4YQkz28HLw7f9NJ5YQ0qrRDvOIJxdNMm5 51gQ== 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:arc-authentication-results; bh=ced3kB7YHTYdpgRZrcYuYZXxJuGn4aeijM2R5vX18N0=; b=NgqpVXymBco5bVFnL1zPkjJM0kIWbAudh78C/iSiXgKiKS6rLUPAkhmzW4mALuTeVE x6oaHSUQ5a8xSIMs1rarKxmknKMZ4KCD+5a9QaMymSCK6be4GyzYixAA5kSpkY/iUOpO xs1/FhT+GPCaOV3MbKVEnjuofOSqXP3dbOl8YvmW539Te9ig0gJTJLKJn9TyMm8gBmcb 454+WBESJ/zncEEFasU+fzEgOhMlDXFzsfcAZYEq4UtVI9exnRQBIw1bOAp+MPwqDOPT KpiBNhxWrP4cY12QdG/Omk+FHpp910Wy1VTnl4TrEF9jQIXNj5atqaQ0Gbksn5VHYD29 soVQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si8068776pli.407.2017.10.02.05.12.27; Mon, 02 Oct 2017 05:12:28 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751875AbdJBMM0 (ORCPT + 26 others); Mon, 2 Oct 2017 08:12:26 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:45582 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751214AbdJBMKG (ORCPT ); Mon, 2 Oct 2017 08:10:06 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id A791C20A1E; Mon, 2 Oct 2017 14:10:02 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4820020A17; Mon, 2 Oct 2017 14:10:02 +0200 (CEST) From: Quentin Schulz To: linus.walleij@linaro.org, robh+dt@kernel.org, mark.rutland@arm.com, wens@csie.org, linux@armlinux.org.uk, maxime.ripard@free-electrons.com, lee.jones@linaro.org Cc: linux-gpio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, thomas.petazzoni@free-electrons.com, linux-sunxi@googlegroups.com, Quentin Schulz Subject: [PATCH v3 05/12] pinctrl: axp209: add support for AXP813 GPIOs Date: Mon, 2 Oct 2017 14:08:47 +0200 Message-Id: <20171002120854.5212-6-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171002120854.5212-1-quentin.schulz@free-electrons.com> References: <20171002120854.5212-1-quentin.schulz@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The AXP813 has only two GPIOs. GPIO0 can either be used as a GPIO, an LDO regulator or an ADC. GPIO1 can be used either as a GPIO or an LDO regulator. Moreover, the status bit of the GPIOs when in input mode is not offset by 4 unlike the AXP209. Signed-off-by: Quentin Schulz --- .../devicetree/bindings/pinctrl/pinctrl-axp209.txt | 13 ++++++++- drivers/pinctrl/pinctrl-axp209.c | 32 ++++++++++++++++------ 2 files changed, 36 insertions(+), 9 deletions(-) -- 2.11.0 diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-axp209.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-axp209.txt index 388c04492afd..a4e4dbef65d6 100644 --- a/Documentation/devicetree/bindings/pinctrl/pinctrl-axp209.txt +++ b/Documentation/devicetree/bindings/pinctrl/pinctrl-axp209.txt @@ -4,7 +4,9 @@ This driver follows the usual GPIO bindings found in Documentation/devicetree/bindings/gpio/gpio.txt Required properties: -- compatible: Should be "x-powers,axp209-gpio" +- compatible: Should be one of: + - "x-powers,axp209-gpio" + - "x-powers,axp813-gpio" - #gpio-cells: Should be two. The first cell is the pin number and the second is the GPIO flags. - gpio-controller: Marks the device node as a GPIO controller. @@ -49,8 +51,17 @@ Example: GPIOs and their functions ------------------------- +axp209 +------ GPIO | Functions ------------------------ GPIO0 | gpio_in, gpio_out, ldo, adc GPIO1 | gpio_in, gpio_out, ldo, adc GPIO2 | gpio_in, gpio_out + +axp813 +------ +GPIO | Functions +------------------------ +GPIO0 | gpio_in, gpio_out, ldo, adc +GPIO1 | gpio_in, gpio_out, ldo diff --git a/drivers/pinctrl/pinctrl-axp209.c b/drivers/pinctrl/pinctrl-axp209.c index 17146496b22a..4466b2541137 100644 --- a/drivers/pinctrl/pinctrl-axp209.c +++ b/drivers/pinctrl/pinctrl-axp209.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -70,6 +71,11 @@ static const struct pinctrl_pin_desc axp209_pins[] = { PINCTRL_PIN(2, "GPIO2"), }; +static const struct pinctrl_pin_desc axp813_pins[] = { + PINCTRL_PIN(0, "GPIO0"), + PINCTRL_PIN(1, "GPIO1"), +}; + static const struct axp20x_pctrl_desc axp20x_data = { .pins = axp209_pins, .npins = ARRAY_SIZE(axp209_pins), @@ -78,6 +84,14 @@ static const struct axp20x_pctrl_desc axp20x_data = { .gpio_status_offset = 4, }; +static const struct axp20x_pctrl_desc axp813_data = { + .pins = axp813_pins, + .npins = ARRAY_SIZE(axp813_pins), + .ldo_mask = BIT(0) | BIT(1), + .adc_mask = BIT(0), + .gpio_status_offset = 0, +}; + static int axp20x_gpio_get_reg(unsigned offset) { switch (offset) { @@ -341,10 +355,18 @@ static void axp20x_build_funcs_groups(struct platform_device *pdev) pctl->desc->pins); } +static const struct of_device_id axp20x_pctl_match[] = { + { .compatible = "x-powers,axp209-gpio", .data = &axp20x_data, }, + { .compatible = "x-powers,axp813-gpio", .data = &axp813_data, }, + { } +}; +MODULE_DEVICE_TABLE(of, axp20x_pctl_match); + static int axp20x_pctl_probe(struct platform_device *pdev) { struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent); struct axp20x_pctl *pctl; + struct device *dev = &pdev->dev; struct pinctrl_desc *pctrl_desc; int ret; @@ -372,9 +394,9 @@ static int axp20x_pctl_probe(struct platform_device *pdev) pctl->chip.set = axp20x_gpio_set; pctl->chip.direction_input = axp20x_gpio_input; pctl->chip.direction_output = axp20x_gpio_output; - pctl->chip.ngpio = 3; + pctl->chip.ngpio = pctl->desc->npins; - pctl->desc = &axp20x_data; + pctl->desc = (struct axp20x_pctrl_desc *)of_device_get_match_data(dev); pctl->regmap = axp20x->regmap; @@ -421,12 +443,6 @@ static int axp20x_pctl_probe(struct platform_device *pdev) return 0; } -static const struct of_device_id axp20x_pctl_match[] = { - { .compatible = "x-powers,axp209-gpio" }, - { } -}; -MODULE_DEVICE_TABLE(of, axp20x_pctl_match); - static struct platform_driver axp20x_pctl_driver = { .probe = axp20x_pctl_probe, .driver = {