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: 19837 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 465C125A57 for ; Mon, 9 Sep 2013 15:40:21 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 6sf7781532qea.11 for ; Mon, 09 Sep 2013 08:40:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=6hIwT4maT/F4NhQGn3nhIykVRkRLD0+MhkBAbTuLmMI=; b=P1GUGaVN3V6wt51XP6tnWl1HZDVza8b7dQT0D7kKJbuZW6xKiTLsrsCKD11nOdNp3a B+21uoe7Tgw4mcId7fHfoC0TfiPGhF/3YuyJl7l3ScFiKWOXxSpAd0tecNdNeGEhVxz2 R90ouYqsdsIjbHd1Fk0s1ExbAhdF/0L9THxSTdovahcCAtoN+zNLPgRVIYjYqXnLi+jU tdTpKDJSwoA1/s6B3TwI7eR5+utNs+L19VuKfVPvT4rOAKjaLJq79cDrS0aq42sAWdj1 o+HaPlXjk64qbMK+T/wmtFxG+oXylJCOE5AWSYzYXsfryn/SqJWhxMGlsRkEmtqvRx8i Zefw== X-Received: by 10.236.222.228 with SMTP id t94mr6568255yhp.18.1378741220939; Mon, 09 Sep 2013 08:40:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.14.106 with SMTP id o10ls1746884qec.36.gmail; Mon, 09 Sep 2013 08:40:20 -0700 (PDT) X-Received: by 10.58.146.71 with SMTP id ta7mr1980531veb.23.1378741220853; Mon, 09 Sep 2013 08:40:20 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id j6si3289343vet.93.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 08:40:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so3662075veb.3 for ; Mon, 09 Sep 2013 08:40:20 -0700 (PDT) X-Gm-Message-State: ALoCoQlytrz8bsLumnoA45me87aPOKlSaNfW8O8Z437F2MBCjZsMcsoiJpAyAN8sy3hcAYHr0VWm X-Received: by 10.58.28.147 with SMTP id b19mr809090veh.27.1378741220750; Mon, 09 Sep 2013 08:40:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp94116vcz; Mon, 9 Sep 2013 08:40:20 -0700 (PDT) X-Received: by 10.152.7.8 with SMTP id f8mr2199875laa.31.1378741219538; Mon, 09 Sep 2013 08:40:19 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id r4si5722514lah.68.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 09 Sep 2013 08:40:19 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.217.177 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id p5so5077654lbi.36 for ; Mon, 09 Sep 2013 08:40:18 -0700 (PDT) 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 Cc: Alexandre Courbot , linux-arm-kernel@lists.infradead.org, Linus Walleij 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.172 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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