From patchwork Fri Sep 16 11:52:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 76375 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp454180qgf; Fri, 16 Sep 2016 04:53:21 -0700 (PDT) X-Received: by 10.98.103.8 with SMTP id b8mr22295501pfc.122.1474026801397; Fri, 16 Sep 2016 04:53:21 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v82si45082781pfd.159.2016.09.16.04.53.21; Fri, 16 Sep 2016 04:53:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934495AbcIPLxQ (ORCPT + 27 others); Fri, 16 Sep 2016 07:53:16 -0400 Received: from mail-lf0-f48.google.com ([209.85.215.48]:34376 "EHLO mail-lf0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755186AbcIPLxI (ORCPT ); Fri, 16 Sep 2016 07:53:08 -0400 Received: by mail-lf0-f48.google.com with SMTP id u14so63979728lfd.1 for ; Fri, 16 Sep 2016 04:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=GLd8crfy9eUK3TSMbU1km5znjHyyn0DcdjE7dy+wrU4=; b=JY66nJA0sGyV0mF6yPEk1mcXNy8W0w7z9djTNEmSe4YEzCbRA3GUbiOF6kHOwCmJIw BWHNGw/9AZVU9xTfai57xTvotFcgihMGYH2qfF/tdhKyukx6Fub4BG+IP5OCDLdgapfr nmMIGzXeOO14YHxNcNLWn4/Aj67JKmOIs6+mc= 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=GLd8crfy9eUK3TSMbU1km5znjHyyn0DcdjE7dy+wrU4=; b=i6KPdKYChyxVV8ZKo+CbPDt7w/eQz5unvZkcFRGkLCXJwcFe35jlEOmgVq65/RV/i/ PhmbEI0CiySPO73HXfSh+bfzOSxheut47aYqXpxAiKudo0sdrLDIXDCIUFvOeTcEiIqV UeGxwGuI2CmPG/XZcDMKumlysMzDPC9nZPuZAzCcZM+2V13doGK7wLfl1p3kdCnl3I/w qGtNhLHSiPxS5tAu+B5NQErJ4Y5/fANyk62SPx7PKMGTzm9yNlCo36Tb9SmoIHfgNwrm khjpGa7CZ/bgmIfkzAINwoFNk/9XWuctG0IgSE7jOMEeKJHrBeWK7JGG1J1UgQPTTFjA Buww== X-Gm-Message-State: AE9vXwN3y+A3ptRmz3Y/oERc0XRX4aS61Q6Z6Jm1k6K+sXvCnReWZO9MH9aasnfqs+IqAScH X-Received: by 10.25.201.81 with SMTP id z78mr5570584lff.113.1474026786243; Fri, 16 Sep 2016 04:53:06 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id k63sm2254906lfe.48.2016.09.16.04.53.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Sep 2016 04:53:04 -0700 (PDT) From: Linus Walleij To: lee.jones@linaro.org, linux-kernel@vger.kernel.org Cc: Linus Walleij , arm@kernel.org, Russell King Subject: [PATCH] mfd/gpio: move HTC GPIO driver to GPIO subsystem Date: Fri, 16 Sep 2016 13:52:50 +0200 Message-Id: <1474026770-22595-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The HTC GPIO driver is a pure GPIO driver and I just can not see what it is doing inside MFD. Let's just move it to GPIO and take this opportunity to move the platform data to Cc: arm@kernel.org Cc: Russell King Cc: Lee Jones Signed-off-by: Linus Walleij --- Lee if you're OK with this I will provide an immutable branch for you to pull this into MFD as well (or if you prefer to prep it, be my guest...) Russell/ARM SoC: heads-up and ACK request. --- arch/arm/mach-pxa/hx4700.c | 2 +- arch/arm/mach-pxa/magician.c | 2 +- arch/arm/mach-sa1100/h3xxx.c | 2 +- drivers/gpio/Kconfig | 8 ++++++++ drivers/gpio/Makefile | 1 + drivers/{mfd/htc-egpio.c => gpio/gpio-htc-egpio.c} | 2 +- drivers/mfd/Kconfig | 8 -------- drivers/mfd/Makefile | 1 - include/linux/{mfd/htc-egpio.h => platform_data/gpio-htc-egpio.h} | 0 9 files changed, 13 insertions(+), 13 deletions(-) rename drivers/{mfd/htc-egpio.c => gpio/gpio-htc-egpio.c} (99%) rename include/linux/{mfd/htc-egpio.h => platform_data/gpio-htc-egpio.h} (100%) -- 2.7.4 Acked-by: Arnd Bergmann Acked-by: Lee Jones diff --git a/arch/arm/mach-pxa/hx4700.c b/arch/arm/mach-pxa/hx4700.c index 4a2f9aba93ea..d3ac2363a34b 100644 --- a/arch/arm/mach-pxa/hx4700.c +++ b/arch/arm/mach-pxa/hx4700.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c index abc918169367..d656bb2c3b66 100644 --- a/arch/arm/mach-pxa/magician.c +++ b/arch/arm/mach-pxa/magician.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/arch/arm/mach-sa1100/h3xxx.c b/arch/arm/mach-sa1100/h3xxx.c index b1d4faa12f9a..75ab3b086e6f 100644 --- a/arch/arm/mach-sa1100/h3xxx.c +++ b/arch/arm/mach-sa1100/h3xxx.c @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 98dd47a30fc7..03be200619a4 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -848,6 +848,14 @@ config GPIO_DLN2 This driver can also be built as a module. If so, the module will be called gpio-dln2. +config HTC_EGPIO + bool "HTC EGPIO support" + depends on GPIOLIB && ARM + help + This driver supports the CPLD egpio chip present on + several HTC phones. It provides basic support for input + pins, output pins, and irqs. + config GPIO_JANZ_TTL tristate "Janz VMOD-TTL Digital IO Module" depends on MFD_JANZ_CMODIO diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index 2a035ed8f168..32ebc07074ed 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -45,6 +45,7 @@ obj-$(CONFIG_GPIO_ETRAXFS) += gpio-etraxfs.o obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o obj-$(CONFIG_GPIO_GRGPIO) += gpio-grgpio.o +obj-$(CONFIG_HTC_EGPIO) += gpio-htc-egpio.o obj-$(CONFIG_GPIO_ICH) += gpio-ich.o obj-$(CONFIG_GPIO_IOP) += gpio-iop.o obj-$(CONFIG_GPIO_IT87) += gpio-it87.o diff --git a/drivers/mfd/htc-egpio.c b/drivers/gpio/gpio-htc-egpio.c similarity index 99% rename from drivers/mfd/htc-egpio.c rename to drivers/gpio/gpio-htc-egpio.c index 513cfc5c8fb6..7edb980d5188 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/gpio/gpio-htc-egpio.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include struct egpio_chip { int reg_start; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 2d1fb6420592..8634d60837fc 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -340,14 +340,6 @@ config MFD_HI655X_PMIC help Select this option to enable Hisilicon hi655x series pmic driver. -config HTC_EGPIO - bool "HTC EGPIO support" - depends on GPIOLIB && ARM - help - This driver supports the CPLD egpio chip present on - several HTC phones. It provides basic support for input - pins, output pins, and irqs. - config HTC_PASIC3 tristate "HTC PASIC3 LED/DS1WM chip support" select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index 2ba3ba35f745..a5f1bf153b64 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -18,7 +18,6 @@ rtsx_pci-objs := rtsx_pcr.o rts5209.o rts5229.o rtl8411.o rts5227.o rts5249.o obj-$(CONFIG_MFD_RTSX_PCI) += rtsx_pci.o obj-$(CONFIG_MFD_RTSX_USB) += rtsx_usb.o -obj-$(CONFIG_HTC_EGPIO) += htc-egpio.o obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o diff --git a/include/linux/mfd/htc-egpio.h b/include/linux/platform_data/gpio-htc-egpio.h similarity index 100% rename from include/linux/mfd/htc-egpio.h rename to include/linux/platform_data/gpio-htc-egpio.h