From patchwork Fri Jul 11 13:00:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 33489 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f198.google.com (mail-pd0-f198.google.com [209.85.192.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6FF1E203C0 for ; Fri, 11 Jul 2014 13:01:14 +0000 (UTC) Received: by mail-pd0-f198.google.com with SMTP id y10sf6051228pdj.9 for ; Fri, 11 Jul 2014 06:01:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=rKBqvjCd6mHfJVz8EiZdewSQfWg5bOMQ5GNEklIeamo=; b=GSOWyikqN27q91LIcKJh93SnUdh60BXnM7JE1h0KczrmwmBCOD8PdQNswWrf4AEmnk +objD5lTLnv+XWj8AjBYx1CzC2jpwTHN6pM9uxBSeF00+ozG/9Lrwxx2f2PQJqv3zhrr SzCFwSJ3SC8rOijhJO5/tB1zuTGSn/SanomgucQCMd4aWftQn9eJxW5UW3F3g12hD7xN smp5MuaiySdWFl71YOZkkfPLN9KhDG8TW3PIpP9JSYa1eUVQcnRWVV5HPM0Gz4/f+eoY 9m1wA0MJnaCzf66ywvM5JMe68tI6qHygNtMJ3ua8JBUrZfnRFOdLjGPSZQ+i7k+VliBf Qh0w== X-Gm-Message-State: ALoCoQnftm6GQ0GEWHYpQX/Eb4cIM6JPlxfr4iy6FrwyTj7c3abGJJRQSe7KmENldeHmURbqTDqA X-Received: by 10.66.182.130 with SMTP id ee2mr12318700pac.37.1405083673729; Fri, 11 Jul 2014 06:01:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.26.241 with SMTP id 104ls374582qgv.21.gmail; Fri, 11 Jul 2014 06:01:13 -0700 (PDT) X-Received: by 10.221.59.194 with SMTP id wp2mr488672vcb.59.1405083673610; Fri, 11 Jul 2014 06:01:13 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id d9si1455745vek.22.2014.07.11.06.01.13 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 11 Jul 2014 06:01:13 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id ij19so1920564vcb.37 for ; Fri, 11 Jul 2014 06:01:13 -0700 (PDT) X-Received: by 10.58.155.129 with SMTP id vw1mr448154veb.54.1405083673438; Fri, 11 Jul 2014 06:01:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp33292vcb; Fri, 11 Jul 2014 06:01:12 -0700 (PDT) X-Received: by 10.68.113.133 with SMTP id iy5mr10004857pbb.135.1405083672597; Fri, 11 Jul 2014 06:01:12 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qp5si1186320pdb.454.2014.07.11.06.01.12; Fri, 11 Jul 2014 06:01:12 -0700 (PDT) Received-SPF: none (google.com: linux-gpio-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753191AbaGKNBL (ORCPT + 1 other); Fri, 11 Jul 2014 09:01:11 -0400 Received: from mail-we0-f170.google.com ([74.125.82.170]:48586 "EHLO mail-we0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752000AbaGKNBK (ORCPT ); Fri, 11 Jul 2014 09:01:10 -0400 Received: by mail-we0-f170.google.com with SMTP id w62so745870wes.1 for ; Fri, 11 Jul 2014 06:01:09 -0700 (PDT) X-Received: by 10.180.14.33 with SMTP id m1mr5021441wic.50.1405083669177; Fri, 11 Jul 2014 06:01:09 -0700 (PDT) Received: from localhost.localdomain (LPuteaux-656-01-48-212.w82-127.abo.wanadoo.fr. [82.127.83.212]) by mx.google.com with ESMTPSA id nf11sm7257871wic.9.2014.07.11.06.01.07 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Jul 2014 06:01:08 -0700 (PDT) From: Linus Walleij To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-gpio@vger.kernel.org, Linus Walleij Subject: [PATCH] pinctrl: nomadik: move all Nomadik drivers to subdir Date: Fri, 11 Jul 2014 15:00:37 +0200 Message-Id: <1405083637-1912-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-gpio@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , We have a bunch of Nomadik family pin control drivers, so let's move them into their own subdirectory. Signed-off-by: Linus Walleij --- drivers/pinctrl/Kconfig | 45 +------------------ drivers/pinctrl/Makefile | 10 +---- drivers/pinctrl/nomadik/Kconfig | 51 ++++++++++++++++++++++ drivers/pinctrl/nomadik/Makefile | 10 +++++ drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c | 4 +- drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h | 0 .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c | 0 .../pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c | 0 .../{ => nomadik}/pinctrl-nomadik-stn8815.c | 0 drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c | 2 +- drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h | 0 15 files changed, 66 insertions(+), 56 deletions(-) create mode 100644 drivers/pinctrl/nomadik/Kconfig create mode 100644 drivers/pinctrl/nomadik/Makefile rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8500.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8505.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-ab8540.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-ab9540.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.c (99%) rename drivers/pinctrl/{ => nomadik}/pinctrl-abx500.h (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8500.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-db8540.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik-stn8815.c (100%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.c (99%) rename drivers/pinctrl/{ => nomadik}/pinctrl-nomadik.h (100%) diff --git a/drivers/pinctrl/pinctrl-nomadik.h b/drivers/pinctrl/nomadik/pinctrl-nomadik.h similarity index 100% rename from drivers/pinctrl/pinctrl-nomadik.h rename to drivers/pinctrl/nomadik/pinctrl-nomadik.h diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index 53e07c70951f..3d94e47546ec 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -26,29 +26,6 @@ config DEBUG_PINCTRL help Say Y here to add some extra checks and diagnostics to PINCTRL calls. -config PINCTRL_ABX500 - bool "ST-Ericsson ABx500 family Mixed Signal Circuit gpio functions" - depends on AB8500_CORE - select GENERIC_PINCONF - help - Select this to enable the ABx500 family IC GPIO driver - -config PINCTRL_AB8500 - bool "AB8500 pin controller driver" - depends on PINCTRL_ABX500 && ARCH_U8500 - -config PINCTRL_AB8540 - bool "AB8540 pin controller driver" - depends on PINCTRL_ABX500 && ARCH_U8500 - -config PINCTRL_AB9540 - bool "AB9540 pin controller driver" - depends on PINCTRL_ABX500 && ARCH_U8500 - -config PINCTRL_AB8505 - bool "AB8505 pin controller driver" - depends on PINCTRL_ABX500 && ARCH_U8500 - config PINCTRL_ADI2 bool "ADI pin controller driver" depends on BLACKFIN @@ -233,27 +210,6 @@ config PINCTRL_IMX28 bool select PINCTRL_MXS -config PINCTRL_NOMADIK - bool "Nomadik pin controller driver" - depends on ARCH_U8500 || ARCH_NOMADIK - select PINMUX - select PINCONF - select GPIOLIB - select OF_GPIO - select GPIOLIB_IRQCHIP - -config PINCTRL_STN8815 - bool "STN8815 pin controller driver" - depends on PINCTRL_NOMADIK && ARCH_NOMADIK - -config PINCTRL_DB8500 - bool "DB8500 pin controller driver" - depends on PINCTRL_NOMADIK && ARCH_U8500 - -config PINCTRL_DB8540 - bool "DB8540 pin controller driver" - depends on PINCTRL_NOMADIK && ARCH_U8500 - config PINCTRL_ROCKCHIP bool select PINMUX @@ -345,6 +301,7 @@ config PINCTRL_PALMAS source "drivers/pinctrl/berlin/Kconfig" source "drivers/pinctrl/mvebu/Kconfig" +source "drivers/pinctrl/nomadik/Kconfig" source "drivers/pinctrl/qcom/Kconfig" source "drivers/pinctrl/samsung/Kconfig" source "drivers/pinctrl/sh-pfc/Kconfig" diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index df6099df7aad..e90817c1f584 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -9,11 +9,6 @@ ifeq ($(CONFIG_OF),y) obj-$(CONFIG_PINCTRL) += devicetree.o endif obj-$(CONFIG_GENERIC_PINCONF) += pinconf-generic.o -obj-$(CONFIG_PINCTRL_ABX500) += pinctrl-abx500.o -obj-$(CONFIG_PINCTRL_AB8500) += pinctrl-ab8500.o -obj-$(CONFIG_PINCTRL_AB8540) += pinctrl-ab8540.o -obj-$(CONFIG_PINCTRL_AB9540) += pinctrl-ab9540.o -obj-$(CONFIG_PINCTRL_AB8505) += pinctrl-ab8505.o obj-$(CONFIG_PINCTRL_ADI2) += pinctrl-adi2.o obj-$(CONFIG_PINCTRL_AS3722) += pinctrl-as3722.o obj-$(CONFIG_PINCTRL_BF54x) += pinctrl-adi2-bf54x.o @@ -39,10 +34,6 @@ obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o obj-$(CONFIG_PINCTRL_IMX25) += pinctrl-imx25.o obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o -obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o -obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o -obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o -obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o obj-$(CONFIG_PINCTRL_PALMAS) += pinctrl-palmas.o obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o @@ -64,6 +55,7 @@ obj-$(CONFIG_PINCTRL_VF610) += pinctrl-vf610.o obj-$(CONFIG_ARCH_BERLIN) += berlin/ obj-$(CONFIG_PLAT_ORION) += mvebu/ +obj-y += nomadik/ obj-$(CONFIG_ARCH_QCOM) += qcom/ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ obj-$(CONFIG_ARCH_SHMOBILE) += sh-pfc/ diff --git a/drivers/pinctrl/nomadik/Kconfig b/drivers/pinctrl/nomadik/Kconfig new file mode 100644 index 000000000000..d48a5aa24a29 --- /dev/null +++ b/drivers/pinctrl/nomadik/Kconfig @@ -0,0 +1,51 @@ +if ARCH_U8500 + +config PINCTRL_ABX500 + bool "ST-Ericsson ABx500 family Mixed Signal Circuit gpio functions" + depends on AB8500_CORE + select GENERIC_PINCONF + help + Select this to enable the ABx500 family IC GPIO driver + +config PINCTRL_AB8500 + bool "AB8500 pin controller driver" + depends on PINCTRL_ABX500 && ARCH_U8500 + +config PINCTRL_AB8540 + bool "AB8540 pin controller driver" + depends on PINCTRL_ABX500 && ARCH_U8500 + +config PINCTRL_AB9540 + bool "AB9540 pin controller driver" + depends on PINCTRL_ABX500 && ARCH_U8500 + +config PINCTRL_AB8505 + bool "AB8505 pin controller driver" + depends on PINCTRL_ABX500 && ARCH_U8500 + +endif + +if (ARCH_U8500 || ARCH_NOMADIK) + +config PINCTRL_NOMADIK + bool "Nomadik pin controller driver" + depends on ARCH_U8500 || ARCH_NOMADIK + select PINMUX + select PINCONF + select GPIOLIB + select OF_GPIO + select GPIOLIB_IRQCHIP + +config PINCTRL_STN8815 + bool "STN8815 pin controller driver" + depends on PINCTRL_NOMADIK && ARCH_NOMADIK + +config PINCTRL_DB8500 + bool "DB8500 pin controller driver" + depends on PINCTRL_NOMADIK && ARCH_U8500 + +config PINCTRL_DB8540 + bool "DB8540 pin controller driver" + depends on PINCTRL_NOMADIK && ARCH_U8500 + +endif diff --git a/drivers/pinctrl/nomadik/Makefile b/drivers/pinctrl/nomadik/Makefile new file mode 100644 index 000000000000..30b27f18cd52 --- /dev/null +++ b/drivers/pinctrl/nomadik/Makefile @@ -0,0 +1,10 @@ +# Nomadik family pin control drivers +obj-$(CONFIG_PINCTRL_ABX500) += pinctrl-abx500.o +obj-$(CONFIG_PINCTRL_AB8500) += pinctrl-ab8500.o +obj-$(CONFIG_PINCTRL_AB8540) += pinctrl-ab8540.o +obj-$(CONFIG_PINCTRL_AB9540) += pinctrl-ab9540.o +obj-$(CONFIG_PINCTRL_AB8505) += pinctrl-ab8505.o +obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o +obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o +obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o +obj-$(CONFIG_PINCTRL_DB8540) += pinctrl-nomadik-db8540.o diff --git a/drivers/pinctrl/pinctrl-ab8500.c b/drivers/pinctrl/nomadik/pinctrl-ab8500.c similarity index 100% rename from drivers/pinctrl/pinctrl-ab8500.c rename to drivers/pinctrl/nomadik/pinctrl-ab8500.c diff --git a/drivers/pinctrl/pinctrl-ab8505.c b/drivers/pinctrl/nomadik/pinctrl-ab8505.c similarity index 100% rename from drivers/pinctrl/pinctrl-ab8505.c rename to drivers/pinctrl/nomadik/pinctrl-ab8505.c diff --git a/drivers/pinctrl/pinctrl-ab8540.c b/drivers/pinctrl/nomadik/pinctrl-ab8540.c similarity index 100% rename from drivers/pinctrl/pinctrl-ab8540.c rename to drivers/pinctrl/nomadik/pinctrl-ab8540.c diff --git a/drivers/pinctrl/pinctrl-ab9540.c b/drivers/pinctrl/nomadik/pinctrl-ab9540.c similarity index 100% rename from drivers/pinctrl/pinctrl-ab9540.c rename to drivers/pinctrl/nomadik/pinctrl-ab9540.c diff --git a/drivers/pinctrl/pinctrl-abx500.c b/drivers/pinctrl/nomadik/pinctrl-abx500.c similarity index 99% rename from drivers/pinctrl/pinctrl-abx500.c rename to drivers/pinctrl/nomadik/pinctrl-abx500.c index f3f8b24efe54..a53a689a2bfa 100644 --- a/drivers/pinctrl/pinctrl-abx500.c +++ b/drivers/pinctrl/nomadik/pinctrl-abx500.c @@ -32,8 +32,8 @@ #include #include "pinctrl-abx500.h" -#include "core.h" -#include "pinconf.h" +#include "../core.h" +#include "../pinconf.h" /* * The AB9540 and AB8540 GPIO support are extended versions diff --git a/drivers/pinctrl/pinctrl-abx500.h b/drivers/pinctrl/nomadik/pinctrl-abx500.h similarity index 100% rename from drivers/pinctrl/pinctrl-abx500.h rename to drivers/pinctrl/nomadik/pinctrl-abx500.h diff --git a/drivers/pinctrl/pinctrl-nomadik-db8500.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c similarity index 100% rename from drivers/pinctrl/pinctrl-nomadik-db8500.c rename to drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c diff --git a/drivers/pinctrl/pinctrl-nomadik-db8540.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c similarity index 100% rename from drivers/pinctrl/pinctrl-nomadik-db8540.c rename to drivers/pinctrl/nomadik/pinctrl-nomadik-db8540.c diff --git a/drivers/pinctrl/pinctrl-nomadik-stn8815.c b/drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c similarity index 100% rename from drivers/pinctrl/pinctrl-nomadik-stn8815.c rename to drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c similarity index 99% rename from drivers/pinctrl/pinctrl-nomadik.c rename to drivers/pinctrl/nomadik/pinctrl-nomadik.c index a564251fe093..e7cab07eef47 100644 --- a/drivers/pinctrl/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c @@ -31,7 +31,7 @@ /* Since we request GPIOs from ourself */ #include #include "pinctrl-nomadik.h" -#include "core.h" +#include "../core.h" /* * The GPIO module in the Nomadik family of Systems-on-Chip is an