From patchwork Wed Jun 15 19:37:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 883342 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5FJc6Wr024030 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 15 Jun 2011 19:38:27 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1QWvue-0000h9-Rh; Wed, 15 Jun 2011 19:38:04 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1QWvud-0000gt-Bk for spi-devel-general@lists.sourceforge.net; Wed, 15 Jun 2011 19:38:03 +0000 X-ACL-Warn: Received: from mail-pz0-f47.google.com ([209.85.210.47]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1QWvuc-0004Yc-KB for spi-devel-general@lists.sourceforge.net; Wed, 15 Jun 2011 19:38:03 +0000 Received: by pzk36 with SMTP id 36so757730pzk.34 for ; Wed, 15 Jun 2011 12:37:56 -0700 (PDT) Received: by 10.68.9.5 with SMTP id v5mr58001pba.140.1308166676730; Wed, 15 Jun 2011 12:37:56 -0700 (PDT) Received: from localhost (S01060002b3d79728.cg.shawcable.net [70.72.87.49]) by mx.google.com with ESMTPS id p5sm410271pbd.44.2011.06.15.12.37.55 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 15 Jun 2011 12:37:56 -0700 (PDT) Received: from [127.0.1.1] (localhost [127.0.0.1]) by localhost (Postfix) with ESMTP id B0367180C37; Wed, 15 Jun 2011 13:37:54 -0600 (MDT) Subject: [PATCH 1/2] gpio/tegra: Move Tegra gpio driver to drivers/gpio To: Erik Gilling , linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, Colin Cross , Olof Johansson , spi-devel-general@lists.sourceforge.net, linux-arm-kernel@lists.infradead.org From: Grant Likely Date: Wed, 15 Jun 2011 13:37:54 -0600 Message-ID: <20110615193734.23641.8004.stgit@ponder> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 AWL AWL: From: address is in the auto white-list X-Headers-End: 1QWvuc-0004Yc-KB Cc: Stephen Warren X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: spi-devel-general-bounces@lists.sourceforge.net X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Jun 2011 19:38:27 +0000 (UTC) As part of the gpio driver consolidation, this patch moves the Tegra driver into drivers/gpio Signed-off-by: Grant Likely Acked-by: Olof Johansson Acked-by: Colin Cross --- If there are no objections, I'll merge this via gpio/next g. arch/arm/mach-tegra/Makefile | 1 - drivers/gpio/Makefile | 1 + drivers/gpio/gpio-tegra.c | 0 3 files changed, 1 insertions(+), 1 deletions(-) rename arch/arm/mach-tegra/gpio.c => drivers/gpio/gpio-tegra.c (100%) diff --git a/arch/arm/mach-tegra/gpio.c b/drivers/gpio/gpio-tegra.c similarity index 100% rename from arch/arm/mach-tegra/gpio.c rename to drivers/gpio/gpio-tegra.c ------------------------------------------------------------------------------ EditLive Enterprise is the world's most technically advanced content authoring tool. Experience the power of Track Changes, Inline Image Editing and ensure content is compliant with Accessibility Checking. http://p.sf.net/sfu/ephox-dev2dev diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile index 823c703..ed58ef9 100644 --- a/arch/arm/mach-tegra/Makefile +++ b/arch/arm/mach-tegra/Makefile @@ -4,7 +4,6 @@ obj-y += io.o obj-y += irq.o obj-y += clock.o obj-y += timer.o -obj-y += gpio.o obj-y += pinmux.o obj-y += powergate.o obj-y += fuse.o diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 68e3bfd..0fbdd75 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -43,6 +43,7 @@ obj-$(CONFIG_GPIO_SCH) += gpio-sch.o obj-$(CONFIG_GPIO_STMPE) += gpio-stmpe.o obj-$(CONFIG_GPIO_SX150X) += gpio-sx150x.o obj-$(CONFIG_GPIO_TC3589X) += gpio-tc3589x.o +obj-$(CONFIG_ARCH_TEGRA) += gpio-tegra.o obj-$(CONFIG_GPIO_TIMBERDALE) += gpio-timberdale.o obj-$(CONFIG_GPIO_TPS65910) += gpio-tps65910.o obj-$(CONFIG_GPIO_TWL4030) += gpio-twl4030.o