From patchwork Tue Dec 5 14:46:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 120657 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5836592qgn; Tue, 5 Dec 2017 06:48:41 -0800 (PST) X-Google-Smtp-Source: AGs4zMb2RDnqL/88Ala1mtYdj3+BmVmv7t53RClByghET0Apijfb/SIqN5uX3pcGcRe+DKO9Tx9y X-Received: by 10.84.171.193 with SMTP id l59mr18888087plb.33.1512485321463; Tue, 05 Dec 2017 06:48:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512485321; cv=none; d=google.com; s=arc-20160816; b=X/9LOaYe30oyGUuJTDhXbejR0sULZiGTBtti2afmR/Zrg9RyJkE+l2gHnfvJujmR14 vEXW/FvAZ7kx+06ctp80ccyGteTE/LLBVYcCPtIF2I8o7NOwxKyZGXOqwW2O8RdbrqMh pru07zahn43MPp3duVCsXX6otCK2S07iMX9dD8m7ct3m+pUYPLINuMG2l2bfGfdUksT/ k7K7BwG4vx8c4Xjdsn2L2GD8E+VYMA5TfIeFp2yXyiGlX1l8B6oifNNi/FZ5E6j6oXOa nY6zkGrGusqL5lYpoTe4VN2hIVuXUKGEVEg707BD1zYhNiI2i9MwjadRnCtAQXkuBnMS cKGA== 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=TyEFM61cI2csmiN83aGoF6pMlHM0IXfLzn/f6bpN2V0=; b=a1A0JvQTAtcYyrh1Nt5miihdrVmfsZhP/FSW0Qfzx3xvZ+EO6SI7QMrIR+Rj+JgNn9 ozUKEirxkJ8FRR1H1yKLy73sjJavJnk24P/2cowRUF740cpGX8Mj8cEE7zELvf+SoDcD U5UUlaoFS3r18PL2ntzu4p2Gxk1BbpMjKIGlw7sKLitqUEhIYnwHYDR9mg6iq9Q7jlaB 3fjFLoH+lYF4djdkV39hCwyG9h5CylVWnWI3FdQwzZ6598iwt3wkzCGM2sC1aMwvOF3Z VwFWKrt1OyoWs9mrniz1rB6/M2T5a86m1EogSa8sUEAl4KstqQePYI0kS6VyGkO8T7Ny pjBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-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 h1si168887pld.629.2017.12.05.06.48.41; Tue, 05 Dec 2017 06:48:41 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-gpio-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-gpio-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-gpio-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752235AbdLEOsj (ORCPT + 6 others); Tue, 5 Dec 2017 09:48:39 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:54777 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752587AbdLEOsf (ORCPT ); Tue, 5 Dec 2017 09:48:35 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id E0CB220744; Tue, 5 Dec 2017 15:48:33 +0100 (CET) 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 8EF812055D; Tue, 5 Dec 2017 15:48:33 +0100 (CET) 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 v5 2/9] pinctrl: move gpio-axp209 to pinctrl Date: Tue, 5 Dec 2017 15:46:40 +0100 Message-Id: <20171205144647.17594-3-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171205144647.17594-1-quentin.schulz@free-electrons.com> References: <20171205144647.17594-1-quentin.schulz@free-electrons.com> Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org To prepare the driver for the upcoming pinctrl features, move the GPIO driver AXP209 from GPIO to pinctrl subsystem. Signed-off-by: Quentin Schulz Acked-by: Maxime Ripard Acked-by: Chen-Yu Tsai --- drivers/gpio/Kconfig | 6 ------ drivers/gpio/Makefile | 1 - drivers/pinctrl/Kconfig | 10 ++++++++++ drivers/pinctrl/Makefile | 1 + drivers/{gpio/gpio-axp209.c => pinctrl/pinctrl-axp209.c} | 0 5 files changed, 11 insertions(+), 7 deletions(-) rename drivers/{gpio/gpio-axp209.c => pinctrl/pinctrl-axp209.c} (100%) -- 2.14.1 -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index d6a8e851ad13..395669bfcc26 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -122,12 +122,6 @@ config GPIO_ATH79 Select this option to enable GPIO driver for Atheros AR71XX/AR724X/AR913X SoC devices. -config GPIO_AXP209 - tristate "X-Powers AXP209 PMIC GPIO Support" - depends on MFD_AXP20X - help - Say yes to enable GPIO support for the AXP209 PMIC - config GPIO_BCM_KONA bool "Broadcom Kona GPIO" depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST) diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 4bc24febb889..bc5dd673fa11 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -32,7 +32,6 @@ obj-$(CONFIG_GPIO_AMDPT) += gpio-amdpt.o obj-$(CONFIG_GPIO_ARIZONA) += gpio-arizona.o obj-$(CONFIG_GPIO_ATH79) += gpio-ath79.o obj-$(CONFIG_GPIO_ASPEED) += gpio-aspeed.o -obj-$(CONFIG_GPIO_AXP209) += gpio-axp209.o obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o obj-$(CONFIG_GPIO_BD9571MWV) += gpio-bd9571mwv.o obj-$(CONFIG_GPIO_BRCMSTB) += gpio-brcmstb.o diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 4571cc098b76..ce126955212c 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -63,6 +63,16 @@ config PINCTRL_AS3722 open drain configuration for the GPIO pins of AS3722 devices. It also supports the GPIO functionality through gpiolib. +config PINCTRL_AXP209 + tristate "X-Powers AXP209 PMIC pinctrl and GPIO Support" + depends on MFD_AXP20X + help + AXP PMICs provides multiple GPIOs that can be muxed for different + functions. This driver bundles a pinctrl driver to select the function + muxing and a GPIO driver to handle the GPIO when the GPIO function is + selected. + Say yes to enable pinctrl and GPIO support for the AXP209 PMIC + config PINCTRL_BF54x def_bool y if BF54x select PINCTRL_ADI2 diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index d0d4844f8022..4777f1595ce2 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o obj-$(CONFIG_PINCTRL_ARTPEC6) += pinctrl-artpec6.o obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o +obj-$(CONFIG_PINCTRL_AXP209) += pinctrl-axp209.o obj-$(CONFIG_PINCTRL_BF54x) += pinctrl-adi2-bf54x.o obj-$(CONFIG_PINCTRL_BF60x) += pinctrl-adi2-bf60x.o obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o diff --git a/drivers/gpio/gpio-axp209.c b/drivers/pinctrl/pinctrl-axp209.c similarity index 100% rename from drivers/gpio/gpio-axp209.c rename to drivers/pinctrl/pinctrl-axp209.c