From patchwork Wed Aug 10 12:17:51 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3357 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 568BB23F46 for ; Wed, 10 Aug 2011 12:18:12 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 259CDA187FE for ; Wed, 10 Aug 2011 12:18:12 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so746446qwb.11 for ; Wed, 10 Aug 2011 05:18:12 -0700 (PDT) Received: by 10.229.183.84 with SMTP id cf20mr6218419qcb.121.1312978691896; Wed, 10 Aug 2011 05:18:11 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.190.71 with SMTP id dh7cs78473qcb; Wed, 10 Aug 2011 05:18:11 -0700 (PDT) Received: from mr.google.com ([10.14.101.9]) by 10.14.101.9 with SMTP id a9mr1488241eeg.223.1312978691584 (num_hops = 1); Wed, 10 Aug 2011 05:18:11 -0700 (PDT) Received: by 10.14.101.9 with SMTP id a9mr1052088eeg.223.1312978691064; Wed, 10 Aug 2011 05:18:11 -0700 (PDT) Received: from eu1sys200aog114.obsmtp.com (eu1sys200aog114.obsmtp.com [207.126.144.137]) by mx.google.com with SMTP id f7si608522eec.111.2011.08.10.05.18.06 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 05:18:11 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.137 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.137; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.137 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-eu.st.com ([164.129.1.35]) (using TLSv1) by eu1sys200aob114.postini.com ([207.126.147.11]) with SMTP ID DSNKTkJ2+ldKM6D9KPDPFQLWokFl9wRCL7MJ@postini.com; Wed, 10 Aug 2011 12:18:10 UTC Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id A6FDE124; Wed, 10 Aug 2011 12:17:54 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 59D361DB6; Wed, 10 Aug 2011 12:17:54 +0000 (GMT) Received: from exdcvycastm004.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm004", Issuer "exdcvycastm004" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 067D7A8081; Wed, 10 Aug 2011 14:17:49 +0200 (CEST) Received: from localhost.localdomain (10.230.100.153) by smtp.stericsson.com (10.230.100.2) with Microsoft SMTP Server (TLS) id 8.3.83.0; Wed, 10 Aug 2011 14:17:53 +0200 From: Linus Walleij To: Grant Likely , , Cc: Lee Jones , Linus Walleij , Wolfram Sang , Barry Song Subject: [PATCH 12/19] mach-lpc32xx: move LPC32XX GPIO driver to GPIO subsystem Date: Wed, 10 Aug 2011 14:17:51 +0200 Message-ID: <1312978671-18473-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.3.2 MIME-Version: 1.0 From: Linus Walleij As per example from the other ARM boards, push the LPC32XX GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: Wolfram Sang Cc: Barry Song Signed-off-by: Linus Walleij --- arch/arm/mach-lpc32xx/Makefile | 2 +- drivers/gpio/Makefile | 1 + .../gpiolib.c => drivers/gpio/gpio-lpc32xx.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename arch/arm/mach-lpc32xx/gpiolib.c => drivers/gpio/gpio-lpc32xx.c (99%) diff --git a/arch/arm/mach-lpc32xx/Makefile b/arch/arm/mach-lpc32xx/Makefile index a5fc5d0..f5db805 100644 --- a/arch/arm/mach-lpc32xx/Makefile +++ b/arch/arm/mach-lpc32xx/Makefile @@ -3,6 +3,6 @@ # obj-y := timer.o irq.o common.o serial.o clock.o -obj-y += gpiolib.o pm.o suspend.o +obj-y += pm.o suspend.o obj-y += phy3250.o diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 2269822..33e095bd 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_MACH_KS8695) += gpio-ks8695.o obj-$(CONFIG_GPIO_LANGWELL) += gpio-langwell.o +obj-$(CONFIG_ARCH_LPC32XX) += gpio-lpc32xx.o obj-$(CONFIG_GPIO_MAX730X) += gpio-max730x.o obj-$(CONFIG_GPIO_MAX7300) += gpio-max7300.o obj-$(CONFIG_GPIO_MAX7301) += gpio-max7301.o diff --git a/arch/arm/mach-lpc32xx/gpiolib.c b/drivers/gpio/gpio-lpc32xx.c similarity index 99% rename from arch/arm/mach-lpc32xx/gpiolib.c rename to drivers/gpio/gpio-lpc32xx.c index 69061ea..b4e9d35 100644 --- a/arch/arm/mach-lpc32xx/gpiolib.c +++ b/drivers/gpio/gpio-lpc32xx.c @@ -24,7 +24,6 @@ #include #include -#include "common.h" #define LPC32XX_GPIO_P3_INP_STATE _GPREG(0x000) #define LPC32XX_GPIO_P3_OUTP_SET _GPREG(0x004)