From patchwork Wed Sep 3 11:42:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 385509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 142B314008F for ; Wed, 3 Sep 2014 21:42:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756009AbaICLm0 (ORCPT ); Wed, 3 Sep 2014 07:42:26 -0400 Received: from mail-we0-f172.google.com ([74.125.82.172]:40707 "EHLO mail-we0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756008AbaICLmZ (ORCPT ); Wed, 3 Sep 2014 07:42:25 -0400 Received: by mail-we0-f172.google.com with SMTP id q59so8492743wes.3 for ; Wed, 03 Sep 2014 04:42:23 -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=bWaG2ZBL/qqtAu/oLfd7SOPHGMJq+g9926uFqJJUza4=; b=h+5xy/JfnENf5rdlBgFEPyEFEQWiyMjzJrOEU1Tv7U1Hw9dGCNcMj8hWBxSRvkU0l+ pExsBtOQT2Tr0rtGGZWnr4NVsPHLMffSBYTl4m0vPZ/5ddBJsVFrHlHW8Ae7fUA/dicT 2xF4jgpK0sVkz+cONrswdeEHdiF3ctZb1lKghc5IW4UIvI5PAFSnF3gS6ypc7w2uNINe Kg4KSzhsloyXBHt+Dw0lZmIf49cIU8VPH7a1KJxhpiGC5reWQWG8x1O4l0sGBmWdrfD9 2fnqls3kbjz3ltF/GDlpv0Nzb2EvW4ro9q/I1/hZO6EjXKgDQfZMMCx6VZt+JXKWNdOk p/Bg== X-Gm-Message-State: ALoCoQm4rrHlZr0tr0zo6bxys2qmu8zFN2DmL0t5zPWIqPq8JVPGG2GTsYp5QynFDxzd8oXqzsDU X-Received: by 10.180.21.199 with SMTP id x7mr35212156wie.73.1409744543580; Wed, 03 Sep 2014 04:42:23 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id kw2sm15345424wjb.30.2014.09.03.04.42.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Sep 2014 04:42:22 -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 , Alexander Shiyan , Shawn Guo , Anson Huang , Fabio Estevam , Denis Carikli , Markus Pargmann , Greg Ungerer , Sascha Hauer Subject: [PATCH] pinctrl: imx/mxs: move freescale drivers to subdir Date: Wed, 3 Sep 2014 13:42:18 +0200 Message-Id: <1409744538-21827-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org This moves all the Freescale-related drivers (i.MX and MXS) to its own subdirectory to clear the view. Cc: Alexander Shiyan Cc: Shawn Guo Cc: Anson Huang Cc: Fabio Estevam Cc: Denis Carikli Cc: Markus Pargmann Cc: Greg Ungerer Cc: Sascha Hauer Signed-off-by: Linus Walleij --- drivers/pinctrl/Kconfig | 110 +-------------------- drivers/pinctrl/Makefile | 19 +--- drivers/pinctrl/{ => freescale}/pinctrl-imx.c | 2 +- drivers/pinctrl/{ => freescale}/pinctrl-imx.h | 0 .../pinctrl/{ => freescale}/pinctrl-imx1-core.c | 2 +- drivers/pinctrl/{ => freescale}/pinctrl-imx1.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx1.h | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx21.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx23.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx25.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx27.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx28.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx35.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx50.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx51.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx53.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx6dl.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx6q.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx6sl.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-imx6sx.c | 0 drivers/pinctrl/{ => freescale}/pinctrl-mxs.c | 2 +- drivers/pinctrl/{ => freescale}/pinctrl-mxs.h | 0 drivers/pinctrl/{ => freescale}/pinctrl-vf610.c | 0 23 files changed, 5 insertions(+), 130 deletions(-) rename drivers/pinctrl/{ => freescale}/pinctrl-imx.c (99%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx.h (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx1-core.c (99%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx1.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx1.h (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx21.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx23.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx25.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx27.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx28.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx35.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx50.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx51.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx53.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx6dl.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx6q.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx6sl.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-imx6sx.c (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-mxs.c (99%) rename drivers/pinctrl/{ => freescale}/pinctrl-mxs.h (100%) rename drivers/pinctrl/{ => freescale}/pinctrl-vf610.c (100%) diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index e1c5a87c80cd..64d06b52f98a 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -97,102 +97,6 @@ config PINCTRL_BCM281XX BCM28145, and BCM28155 SoCs. This driver requires the pinctrl framework. GPIO is provided by a separate GPIO driver. -config PINCTRL_IMX - bool - select PINMUX - select PINCONF - -config PINCTRL_IMX1_CORE - bool - select PINMUX - select PINCONF - -config PINCTRL_IMX1 - bool "IMX1 pinctrl driver" - depends on SOC_IMX1 - select PINCTRL_IMX1_CORE - help - Say Y here to enable the imx1 pinctrl driver - -config PINCTRL_IMX21 - bool "i.MX21 pinctrl driver" - depends on SOC_IMX21 - select PINCTRL_IMX1_CORE - help - Say Y here to enable the i.MX21 pinctrl driver - -config PINCTRL_IMX27 - bool "IMX27 pinctrl driver" - depends on SOC_IMX27 - select PINCTRL_IMX1_CORE - help - Say Y here to enable the imx27 pinctrl driver - - -config PINCTRL_IMX25 - bool "IMX25 pinctrl driver" - depends on OF - depends on SOC_IMX25 - select PINCTRL_IMX - help - Say Y here to enable the imx25 pinctrl driver - -config PINCTRL_IMX35 - bool "IMX35 pinctrl driver" - depends on SOC_IMX35 - select PINCTRL_IMX - help - Say Y here to enable the imx35 pinctrl driver - -config PINCTRL_IMX50 - bool "IMX50 pinctrl driver" - depends on SOC_IMX50 - select PINCTRL_IMX - help - Say Y here to enable the imx50 pinctrl driver - -config PINCTRL_IMX51 - bool "IMX51 pinctrl driver" - depends on SOC_IMX51 - select PINCTRL_IMX - help - Say Y here to enable the imx51 pinctrl driver - -config PINCTRL_IMX53 - bool "IMX53 pinctrl driver" - depends on SOC_IMX53 - select PINCTRL_IMX - help - Say Y here to enable the imx53 pinctrl driver - -config PINCTRL_IMX6Q - bool "IMX6Q/DL pinctrl driver" - depends on SOC_IMX6Q - select PINCTRL_IMX - help - Say Y here to enable the imx6q/dl pinctrl driver - -config PINCTRL_IMX6SL - bool "IMX6SL pinctrl driver" - depends on SOC_IMX6SL - select PINCTRL_IMX - help - Say Y here to enable the imx6sl pinctrl driver - -config PINCTRL_IMX6SX - bool "IMX6SX pinctrl driver" - depends on SOC_IMX6SX - select PINCTRL_IMX - help - Say Y here to enable the imx6sx pinctrl driver - -config PINCTRL_VF610 - bool "Freescale Vybrid VF610 pinctrl driver" - depends on SOC_VF610 - select PINCTRL_IMX - help - Say Y here to enable the Freescale Vybrid VF610 pinctrl driver - config PINCTRL_LANTIQ bool depends on LANTIQ @@ -204,19 +108,6 @@ config PINCTRL_FALCON depends on SOC_FALCON depends on PINCTRL_LANTIQ -config PINCTRL_MXS - bool - select PINMUX - select PINCONF - -config PINCTRL_IMX23 - bool - select PINCTRL_MXS - -config PINCTRL_IMX28 - bool - select PINCTRL_MXS - config PINCTRL_ROCKCHIP bool select PINMUX @@ -313,6 +204,7 @@ config PINCTRL_PALMAS TPS65913, TPS80036 etc. source "drivers/pinctrl/berlin/Kconfig" +source "drivers/pinctrl/freescale/Kconfig" source "drivers/pinctrl/mvebu/Kconfig" source "drivers/pinctrl/nomadik/Kconfig" source "drivers/pinctrl/qcom/Kconfig" diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 0ffe1f608c67..51f52d32859e 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -17,24 +17,7 @@ obj-$(CONFIG_PINCTRL_AT91) += pinctrl-at91.o obj-$(CONFIG_PINCTRL_BCM2835) += pinctrl-bcm2835.o obj-$(CONFIG_PINCTRL_BAYTRAIL) += pinctrl-baytrail.o obj-$(CONFIG_PINCTRL_BCM281XX) += pinctrl-bcm281xx.o -obj-$(CONFIG_PINCTRL_IMX) += pinctrl-imx.o -obj-$(CONFIG_PINCTRL_IMX1_CORE) += pinctrl-imx1-core.o -obj-$(CONFIG_PINCTRL_IMX1) += pinctrl-imx1.o -obj-$(CONFIG_PINCTRL_IMX21) += pinctrl-imx21.o -obj-$(CONFIG_PINCTRL_IMX27) += pinctrl-imx27.o -obj-$(CONFIG_PINCTRL_IMX35) += pinctrl-imx35.o -obj-$(CONFIG_PINCTRL_IMX50) += pinctrl-imx50.o -obj-$(CONFIG_PINCTRL_IMX51) += pinctrl-imx51.o -obj-$(CONFIG_PINCTRL_IMX53) += pinctrl-imx53.o -obj-$(CONFIG_PINCTRL_IMX6Q) += pinctrl-imx6q.o -obj-$(CONFIG_PINCTRL_IMX6Q) += pinctrl-imx6dl.o -obj-$(CONFIG_PINCTRL_IMX6SL) += pinctrl-imx6sl.o -obj-$(CONFIG_PINCTRL_IMX6SX) += pinctrl-imx6sx.o obj-$(CONFIG_PINCTRL_FALCON) += pinctrl-falcon.o -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_PALMAS) += pinctrl-palmas.o obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o @@ -53,9 +36,9 @@ obj-$(CONFIG_PINCTRL_XWAY) += pinctrl-xway.o obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl-lantiq.o obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o -obj-$(CONFIG_PINCTRL_VF610) += pinctrl-vf610.o obj-$(CONFIG_ARCH_BERLIN) += berlin/ +obj-y += freescale/ obj-$(CONFIG_PLAT_ORION) += mvebu/ obj-y += nomadik/ obj-$(CONFIG_ARCH_QCOM) += qcom/ diff --git a/drivers/pinctrl/pinctrl-imx.c b/drivers/pinctrl/freescale/pinctrl-imx.c similarity index 99% rename from drivers/pinctrl/pinctrl-imx.c rename to drivers/pinctrl/freescale/pinctrl-imx.c index 570e5acb4a6a..e89268c09e4c 100644 --- a/drivers/pinctrl/pinctrl-imx.c +++ b/drivers/pinctrl/freescale/pinctrl-imx.c @@ -24,7 +24,7 @@ #include #include -#include "core.h" +#include "../core.h" #include "pinctrl-imx.h" /* The bits in CONFIG cell defined in binding doc*/ diff --git a/drivers/pinctrl/pinctrl-imx.h b/drivers/pinctrl/freescale/pinctrl-imx.h similarity index 100% rename from drivers/pinctrl/pinctrl-imx.h rename to drivers/pinctrl/freescale/pinctrl-imx.h diff --git a/drivers/pinctrl/pinctrl-imx1-core.c b/drivers/pinctrl/freescale/pinctrl-imx1-core.c similarity index 99% rename from drivers/pinctrl/pinctrl-imx1-core.c rename to drivers/pinctrl/freescale/pinctrl-imx1-core.c index 176a3e62f1cf..5ac59fbb2440 100644 --- a/drivers/pinctrl/pinctrl-imx1-core.c +++ b/drivers/pinctrl/freescale/pinctrl-imx1-core.c @@ -28,7 +28,7 @@ #include #include -#include "core.h" +#include "../core.h" #include "pinctrl-imx1.h" struct imx1_pinctrl { diff --git a/drivers/pinctrl/pinctrl-imx1.c b/drivers/pinctrl/freescale/pinctrl-imx1.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx1.c rename to drivers/pinctrl/freescale/pinctrl-imx1.c diff --git a/drivers/pinctrl/pinctrl-imx1.h b/drivers/pinctrl/freescale/pinctrl-imx1.h similarity index 100% rename from drivers/pinctrl/pinctrl-imx1.h rename to drivers/pinctrl/freescale/pinctrl-imx1.h diff --git a/drivers/pinctrl/pinctrl-imx21.c b/drivers/pinctrl/freescale/pinctrl-imx21.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx21.c rename to drivers/pinctrl/freescale/pinctrl-imx21.c diff --git a/drivers/pinctrl/pinctrl-imx23.c b/drivers/pinctrl/freescale/pinctrl-imx23.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx23.c rename to drivers/pinctrl/freescale/pinctrl-imx23.c diff --git a/drivers/pinctrl/pinctrl-imx25.c b/drivers/pinctrl/freescale/pinctrl-imx25.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx25.c rename to drivers/pinctrl/freescale/pinctrl-imx25.c diff --git a/drivers/pinctrl/pinctrl-imx27.c b/drivers/pinctrl/freescale/pinctrl-imx27.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx27.c rename to drivers/pinctrl/freescale/pinctrl-imx27.c diff --git a/drivers/pinctrl/pinctrl-imx28.c b/drivers/pinctrl/freescale/pinctrl-imx28.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx28.c rename to drivers/pinctrl/freescale/pinctrl-imx28.c diff --git a/drivers/pinctrl/pinctrl-imx35.c b/drivers/pinctrl/freescale/pinctrl-imx35.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx35.c rename to drivers/pinctrl/freescale/pinctrl-imx35.c diff --git a/drivers/pinctrl/pinctrl-imx50.c b/drivers/pinctrl/freescale/pinctrl-imx50.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx50.c rename to drivers/pinctrl/freescale/pinctrl-imx50.c diff --git a/drivers/pinctrl/pinctrl-imx51.c b/drivers/pinctrl/freescale/pinctrl-imx51.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx51.c rename to drivers/pinctrl/freescale/pinctrl-imx51.c diff --git a/drivers/pinctrl/pinctrl-imx53.c b/drivers/pinctrl/freescale/pinctrl-imx53.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx53.c rename to drivers/pinctrl/freescale/pinctrl-imx53.c diff --git a/drivers/pinctrl/pinctrl-imx6dl.c b/drivers/pinctrl/freescale/pinctrl-imx6dl.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx6dl.c rename to drivers/pinctrl/freescale/pinctrl-imx6dl.c diff --git a/drivers/pinctrl/pinctrl-imx6q.c b/drivers/pinctrl/freescale/pinctrl-imx6q.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx6q.c rename to drivers/pinctrl/freescale/pinctrl-imx6q.c diff --git a/drivers/pinctrl/pinctrl-imx6sl.c b/drivers/pinctrl/freescale/pinctrl-imx6sl.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx6sl.c rename to drivers/pinctrl/freescale/pinctrl-imx6sl.c diff --git a/drivers/pinctrl/pinctrl-imx6sx.c b/drivers/pinctrl/freescale/pinctrl-imx6sx.c similarity index 100% rename from drivers/pinctrl/pinctrl-imx6sx.c rename to drivers/pinctrl/freescale/pinctrl-imx6sx.c diff --git a/drivers/pinctrl/pinctrl-mxs.c b/drivers/pinctrl/freescale/pinctrl-mxs.c similarity index 99% rename from drivers/pinctrl/pinctrl-mxs.c rename to drivers/pinctrl/freescale/pinctrl-mxs.c index 67035091f8fd..f98c6bb0f769 100644 --- a/drivers/pinctrl/pinctrl-mxs.c +++ b/drivers/pinctrl/freescale/pinctrl-mxs.c @@ -21,7 +21,7 @@ #include #include #include -#include "core.h" +#include "../core.h" #include "pinctrl-mxs.h" #define SUFFIX_LEN 4 diff --git a/drivers/pinctrl/pinctrl-mxs.h b/drivers/pinctrl/freescale/pinctrl-mxs.h similarity index 100% rename from drivers/pinctrl/pinctrl-mxs.h rename to drivers/pinctrl/freescale/pinctrl-mxs.h diff --git a/drivers/pinctrl/pinctrl-vf610.c b/drivers/pinctrl/freescale/pinctrl-vf610.c similarity index 100% rename from drivers/pinctrl/pinctrl-vf610.c rename to drivers/pinctrl/freescale/pinctrl-vf610.c