From patchwork Wed Aug 10 12:18:09 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1053432 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7ACUUBF030622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 10 Aug 2011 12:31:01 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7sq-0005wv-Sc; Wed, 10 Aug 2011 12:27:42 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7nW-0000Cz-6P; Wed, 10 Aug 2011 12:22:10 +0000 Received: from eu1sys200aog109.obsmtp.com ([207.126.144.127]) by canuck.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qr7k6-0007ez-47 for linux-arm-kernel@lists.infradead.org; Wed, 10 Aug 2011 12:18:40 +0000 Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob109.postini.com ([207.126.147.11]) with SMTP ID DSNKTkJ3EWXR2RLjppmZ7TT04frljNcd1m7H@postini.com; Wed, 10 Aug 2011 12:18:37 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id DAAB1FD; Wed, 10 Aug 2011 12:18:13 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id CC1ADE1B; Wed, 10 Aug 2011 12:18:12 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 01FCBA807B; Wed, 10 Aug 2011 14:18:07 +0200 (CEST) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 10 Aug 2011 14:18:11 +0200 From: Linus Walleij To: Grant Likely , , Subject: [PATCH 14/19] plat-pxa: move PXA GPIO driver to GPIO subsystem Date: Wed, 10 Aug 2011 14:18:09 +0200 Message-ID: <1312978689-18539-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110810_081838_726264_7D319385 X-CRM114-Status: GOOD ( 18.22 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [207.126.144.127 listed in list.dnswl.org] Cc: Eric Miao , Linus Walleij , Lee Jones , Russell King X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 10 Aug 2011 12:31:01 +0000 (UTC) From: Linus Walleij As per example from the other ARM boards, push the PXA GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: Eric Miao Cc: Russell King Signed-off-by: Linus Walleij --- arch/arm/plat-pxa/Makefile | 1 - drivers/gpio/Makefile | 1 + .../arm/plat-pxa/gpio.c => drivers/gpio/gpio-pxa.c | 0 3 files changed, 1 insertions(+), 1 deletions(-) rename arch/arm/plat-pxa/gpio.c => drivers/gpio/gpio-pxa.c (100%) diff --git a/arch/arm/plat-pxa/gpio.c b/drivers/gpio/gpio-pxa.c similarity index 100% rename from arch/arm/plat-pxa/gpio.c rename to drivers/gpio/gpio-pxa.c diff --git a/arch/arm/plat-pxa/Makefile b/arch/arm/plat-pxa/Makefile index 3aca5ba..f302d04 100644 --- a/arch/arm/plat-pxa/Makefile +++ b/arch/arm/plat-pxa/Makefile @@ -4,7 +4,6 @@ obj-y := dma.o -obj-$(CONFIG_GENERIC_GPIO) += gpio.o obj-$(CONFIG_PXA3xx) += mfp.o obj-$(CONFIG_PXA95x) += mfp.o obj-$(CONFIG_ARCH_MMP) += mfp.o diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 33e095bd..6640e1d 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -40,6 +40,7 @@ obj-$(CONFIG_GPIO_PCA953X) += gpio-pca953x.o obj-$(CONFIG_GPIO_PCF857X) += gpio-pcf857x.o obj-$(CONFIG_GPIO_PCH) += gpio-pch.o obj-$(CONFIG_GPIO_PL061) += gpio-pl061.o +obj-$(CONFIG_PLAT_PXA) += gpio-pxa.o obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o