From patchwork Tue Sep 26 12:17:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 9971939 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E86C6037E for ; Tue, 26 Sep 2017 12:48:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3261A28A15 for ; Tue, 26 Sep 2017 12:48:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26E0628A75; Tue, 26 Sep 2017 12:48:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 67B2B28A15 for ; Tue, 26 Sep 2017 12:48:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=eYW1QIXnDXOB6J/Qpe/md/lyYpUA67Wf9jKoglKIUz4=; b=bmzBGElqFFsQ1UasoYiCwUglfF Mm6ddjF8w6U41/EWVnnumJ8R3N5cdP8x5dIB0INX9EJXnpeD9SYXiUR6vcLZHnSJ4/QeWMfG9V5Lo bUbZIfoSRPAlNGqZqVIr2iS05w6D0Z52vJsDaaZvOmDdz6kMqOmzP4E6MFOX7TswE1HDmh3IiruFh jSkBNK6aXYkDj0I+W7SVuhq7lQTiHR+o7H8LB274/BF0mGfk42200LPdTILv7YUmXl7Ih1F5xsoyF tRQHu9uHAaw1wFxERIkZ/5vfN/e29BfsIaTGANGD04dQHIr/25EsCZO1HvnkaCSiG3XhLo48k62XD 0nCCMuqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dwpHi-0003qu-TH; Tue, 26 Sep 2017 12:48:22 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dwop7-0006Rn-Tu for linux-arm-kernel@lists.infradead.org; Tue, 26 Sep 2017 12:19:08 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 5579220933; Tue, 26 Sep 2017 14:18:14 +0200 (CEST) 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 D3F582088F; Tue, 26 Sep 2017 14:17:55 +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 Subject: [PATCH v2 06/10] pinctrl: axp209: add support for AXP813 GPIOs Date: Tue, 26 Sep 2017 14:17:16 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170926_051850_832694_BAD44F74 X-CRM114-Status: GOOD ( 15.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thomas.petazzoni@free-electrons.com, devicetree@vger.kernel.org, Quentin Schulz , linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org, linux-sunxi@googlegroups.com, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- Documentation/devicetree/bindings/pinctrl/pinctrl-axp209.txt | 13 ++- drivers/pinctrl/pinctrl-axp209.c | 30 ++++++- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/pinctrl-axp209.txt b/Documentation/devicetree/bindings/pinctrl/pinctrl-axp209.txt index a5bfe87..a1d5dec 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-pctl" - #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 11f871e..500862b 100644 --- a/drivers/pinctrl/pinctrl-axp209.c +++ b/drivers/pinctrl/pinctrl-axp209.c @@ -108,11 +108,28 @@ static const struct axp20x_desc_pin axp209_pins[] = { AXP20X_FUNCTION(0x2, "gpio_in")), }; +static const struct axp20x_desc_pin axp813_pins[] = { + AXP20X_PIN(AXP20X_PINCTRL_PIN(0, "GPIO0", (void *)AXP20X_GPIO0_CTRL), + AXP20X_FUNCTION(0x0, "gpio_out"), + AXP20X_FUNCTION(0x2, "gpio_in"), + AXP20X_FUNCTION(0x3, "ldo"), + AXP20X_FUNCTION(0x4, "adc")), + AXP20X_PIN(AXP20X_PINCTRL_PIN(1, "GPIO1", (void *)AXP20X_GPIO1_CTRL), + AXP20X_FUNCTION(0x0, "gpio_out"), + AXP20X_FUNCTION(0x2, "gpio_in"), + AXP20X_FUNCTION(0x3, "ldo")), +}; + static const struct axp20x_pinctrl_desc axp20x_pinctrl_data = { .pins = axp209_pins, .npins = ARRAY_SIZE(axp209_pins), }; +static const struct axp20x_pinctrl_desc axp813_pinctrl_data = { + .pins = axp813_pins, + .npins = ARRAY_SIZE(axp813_pins), +}; + static int axp20x_gpio_input(struct gpio_chip *chip, unsigned offset) { return pinctrl_gpio_direction_input(chip->base + offset); @@ -479,6 +496,7 @@ static int axp20x_pctl_probe(struct platform_device *pdev) struct axp20x_pctl *pctl; struct pinctrl_desc *pctrl_desc; struct pinctrl_pin_desc *pins; + struct device_node *np = pdev->dev.of_node; int ret, i; if (!of_device_is_available(pdev->dev.of_node)) @@ -505,13 +523,18 @@ 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->regmap = axp20x->regmap; - pctl->desc = &axp20x_pinctrl_data; - pctl->gpio_status_offset = 4; + if (of_device_is_compatible(np, "x-powers,axp209-gpio")) { + pctl->desc = &axp20x_pinctrl_data; + pctl->gpio_status_offset = 4; + } else { + pctl->desc = &axp813_pinctrl_data; + pctl->gpio_status_offset = 0; + } pctl->dev = &pdev->dev; + pctl->chip.ngpio = pctl->desc->npins; platform_set_drvdata(pdev, pctl); @@ -566,6 +589,7 @@ static int axp20x_pctl_probe(struct platform_device *pdev) static const struct of_device_id axp20x_pctl_match[] = { { .compatible = "x-powers,axp209-gpio" }, + { .compatible = "x-powers,axp813-pctl" }, { } }; MODULE_DEVICE_TABLE(of, axp20x_pctl_match);