From patchwork Wed Aug 10 12:18:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3363 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 A226723F46 for ; Wed, 10 Aug 2011 12:18:56 +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 70A7CA1838C for ; Wed, 10 Aug 2011 12:18:56 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so746446qwb.11 for ; Wed, 10 Aug 2011 05:18:56 -0700 (PDT) Received: by 10.229.159.194 with SMTP id k2mr2929548qcx.83.1312978736205; Wed, 10 Aug 2011 05:18:56 -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 dh7cs78530qcb; Wed, 10 Aug 2011 05:18:56 -0700 (PDT) Received: from mr.google.com ([10.14.100.70]) by 10.14.100.70 with SMTP id y46mr3245743eef.67.1312978735871 (num_hops = 1); Wed, 10 Aug 2011 05:18:55 -0700 (PDT) Received: by 10.14.100.70 with SMTP id y46mr2360677eef.67.1312978735313; Wed, 10 Aug 2011 05:18:55 -0700 (PDT) Received: from eu1sys200aog109.obsmtp.com (eu1sys200aog109.obsmtp.com [207.126.144.127]) by mx.google.com with SMTP id g45si601002eea.163.2011.08.10.05.18.49 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Aug 2011 05:18:55 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.127 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.127; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.127 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-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob109.postini.com ([207.126.147.11]) with SMTP ID DSNKTkJ3J4KMajm+KeqbGdx3N08rlOnz0knZ@postini.com; Wed, 10 Aug 2011 12:18:54 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 C1BCDFD; Wed, 10 Aug 2011 12:18:44 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 6D5F8E13; Wed, 10 Aug 2011 12:18:44 +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 96DD2A807B; Wed, 10 Aug 2011 14:18:38 +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:43 +0200 From: Linus Walleij To: Grant Likely , , Cc: Lee Jones , Linus Walleij , Russell King Subject: [PATCH 18/19] mach-sa1100: move SA1100 GPIO driver to GPIO subsystem Date: Wed, 10 Aug 2011 14:18:41 +0200 Message-ID: <1312978721-18671-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 SA100 GPIO driver down to the GPIO subsystem so it can be consolidated. Cc: Russell King Signed-off-by: Linus Walleij --- arch/arm/mach-sa1100/Makefile | 2 +- drivers/gpio/Makefile | 2 +- .../gpio.c => drivers/gpio/gpio-sa1100.c | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) rename arch/arm/mach-sa1100/gpio.c => drivers/gpio/gpio-sa1100.c (98%) diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile index 41252d2..73a5c64 100644 --- a/arch/arm/mach-sa1100/Makefile +++ b/arch/arm/mach-sa1100/Makefile @@ -3,7 +3,7 @@ # # Common support -obj-y := clock.o generic.o gpio.o irq.o dma.o time.o #nmi-oopser.o +obj-y := clock.o generic.o irq.o dma.o time.o #nmi-oopser.o obj-m := obj-n := obj- := diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 7f846bf..6b77473 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -47,7 +47,7 @@ obj-$(CONFIG_GPIO_RDC321X) += gpio-rdc321x.o obj-$(CONFIG_GPIO_PLAT_SAMSUNG) += gpio-plat-samsung.o obj-$(CONFIG_GPIO_S5PC100) += gpio-s5pc100.o obj-$(CONFIG_GPIO_S5PV210) += gpio-s5pv210.o - +obj-$(CONFIG_ARCH_SA1100) += gpio-sa1100.o obj-$(CONFIG_GPIO_SCH) += gpio-sch.o obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o diff --git a/arch/arm/mach-sa1100/gpio.c b/drivers/gpio/gpio-sa1100.c similarity index 98% rename from arch/arm/mach-sa1100/gpio.c rename to drivers/gpio/gpio-sa1100.c index e547ed4..b6c1f6d 100644 --- a/arch/arm/mach-sa1100/gpio.c +++ b/drivers/gpio/gpio-sa1100.c @@ -12,7 +12,6 @@ #include #include -#include "generic.h" static int sa1100_gpio_get(struct gpio_chip *chip, unsigned offset) {