From patchwork Mon Sep 9 15:40:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2862041 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 42AD6BF43F for ; Mon, 9 Sep 2013 15:41:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0AD0F203DA for ; Mon, 9 Sep 2013 15:41:12 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5791B202EB for ; Mon, 9 Sep 2013 15:41:10 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ3a7-0001yI-5Q; Mon, 09 Sep 2013 15:40:51 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ3a0-0001dq-7i; Mon, 09 Sep 2013 15:40:44 +0000 Received: from mail-la0-f47.google.com ([209.85.215.47]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VJ3Zw-0001cP-S4 for linux-arm-kernel@lists.infradead.org; Mon, 09 Sep 2013 15:40:42 +0000 Received: by mail-la0-f47.google.com with SMTP id eo20so4970747lab.6 for ; Mon, 09 Sep 2013 08:40:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=6hIwT4maT/F4NhQGn3nhIykVRkRLD0+MhkBAbTuLmMI=; b=gzuWmjkCxnx4BJN8WWfOZ/bBGvam3s43ltyKnMR9TXyVogbdfDx1RkWJeNPxly+FHA zOOl5DvRENqUs68In3tN1gESjZxhIP1cNKmkDh8kcfiBN7qNgGLZpIg4uTkvMrIm2tJg 7XnXaGFxZ0olYBpc5JmUJq+bGMAe04SMZ6QqWx25XvEsBTXuUv2mIg20kbLsdDCqERB4 hRsHh/AXR8xJoEDPVs83imghD9hg2JUwLohCIppWmMiFBaQHBmY/zl6k0L5lB5sz4Us/ /5Y3DBIb042emPdXt2NFGP3fKD/trTRcfZUxA1zGkMtevMISVGAJG2zhjfgVK8sd9se7 Ks9A== X-Gm-Message-State: ALoCoQlaQcesKZgEzHm/T7EzoJWKk4ls5MNh9ReF4mOVLZjdrkrMfDt+eGryEp347XZh75hjJwHM X-Received: by 10.152.22.35 with SMTP id a3mr760796laf.45.1378741218786; Mon, 09 Sep 2013 08:40:18 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id rd5sm6233496lbb.16.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 09 Sep 2013 08:40:18 -0700 (PDT) From: Linus Walleij To: linux-gpio@vger.kernel.org, Lennert Buytenhek , Dan Williams , Mikael Pettersson Subject: [PATCH 1/8] ARM: plat-iop: move the GPIO driver to drivers/gpio Date: Mon, 9 Sep 2013 17:40:11 +0200 Message-Id: <1378741211-12884-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130909_114041_074627_3820AD96 X-CRM114-Status: UNSURE ( 9.78 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Linus Walleij , Alexandre Courbot , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Move the IOP GPIO driver to live with its siblings in the GPIO subsystem. Cc: Lennert Buytenhek Cc: Dan Williams Cc: Mikael Pettersson Signed-off-by: Linus Walleij --- arch/arm/Kconfig | 2 ++ arch/arm/plat-iop/Makefile | 2 -- drivers/gpio/Kconfig | 9 +++++++++ drivers/gpio/Makefile | 1 + arch/arm/plat-iop/gpio.c => drivers/gpio/gpio-iop.c | 0 5 files changed, 12 insertions(+), 2 deletions(-) rename arch/arm/plat-iop/gpio.c => drivers/gpio/gpio-iop.c (100%) diff --git a/arch/arm/plat-iop/gpio.c b/drivers/gpio/gpio-iop.c similarity index 100% rename from arch/arm/plat-iop/gpio.c rename to drivers/gpio/gpio-iop.c diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a00f4c1..4ef9fc8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -456,6 +456,7 @@ config ARCH_IOP32X depends on MMU select ARCH_REQUIRE_GPIOLIB select CPU_XSCALE + select GPIO_IOP select NEED_MACH_GPIO_H select NEED_RET_TO_USER select PCI @@ -469,6 +470,7 @@ config ARCH_IOP33X depends on MMU select ARCH_REQUIRE_GPIOLIB select CPU_XSCALE + select GPIO_IOP select NEED_MACH_GPIO_H select NEED_RET_TO_USER select PCI diff --git a/arch/arm/plat-iop/Makefile b/arch/arm/plat-iop/Makefile index a99dc15..224e56c 100644 --- a/arch/arm/plat-iop/Makefile +++ b/arch/arm/plat-iop/Makefile @@ -5,7 +5,6 @@ obj-y := # IOP32X -obj-$(CONFIG_ARCH_IOP32X) += gpio.o obj-$(CONFIG_ARCH_IOP32X) += i2c.o obj-$(CONFIG_ARCH_IOP32X) += pci.o obj-$(CONFIG_ARCH_IOP32X) += setup.o @@ -16,7 +15,6 @@ obj-$(CONFIG_ARCH_IOP32X) += pmu.o obj-$(CONFIG_ARCH_IOP32X) += restart.o # IOP33X -obj-$(CONFIG_ARCH_IOP33X) += gpio.o obj-$(CONFIG_ARCH_IOP33X) += i2c.o obj-$(CONFIG_ARCH_IOP33X) += pci.o obj-$(CONFIG_ARCH_IOP33X) += setup.o diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 349b161..35e8223 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -312,6 +312,15 @@ config GPIO_ICH If unsure, say N. +config GPIO_IOP + tristate "Intel ICH GPIO" + depends on ARM && (ARCH_IOP32X || ARCH_IOP33X) + help + Say yes here to support the GPIO functionality of a number of Intel + IOP32X or IOP33X. + + If unsure, say N. + config GPIO_VX855 tristate "VIA VX855/VX875 GPIO" depends on PCI && GENERIC_HARDIRQS diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 97438bf..66fb17e 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -28,6 +28,7 @@ obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o obj-$(CONFIG_GPIO_ICH) += gpio-ich.o +obj-$(CONFIG_GPIO_IOP) += gpio-iop.o obj-$(CONFIG_GPIO_IT8761E) += gpio-it8761e.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o