From patchwork Wed Jul 9 11:57:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 33284 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EF78F203F4 for ; Wed, 9 Jul 2014 11:58:23 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id lj1sf50173973pab.9 for ; Wed, 09 Jul 2014 04:58:22 -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=jOyD+jZYFeaJYV/Xcc2eNlntNBoPvslfxFIDuV5gU4s=; b=iAvGFXB9psaP/1fSNKL1gYx5i5/Co3rGzziGIprD8F3N2EGyAILQhiOZLvDMSibaJQ 87Ue/DqBH883A0yW8pnB6LJvBHDY2Go28bmQiK9tKcBQ49SrKBxvzF6JKA+iOa8OjIJ9 xEGDE1C/33iGJcliDGNIH4XYr8L9id1nlghMdlBirEVUINzYv1/tqUJM5Hy38GTjAUOa tyjz+R810ypH721uLV0xyWihHyh8PWOtegGc+54qdFqm67f22b3FcOREae9KOZx9naKv PNpnn4zZ+Btgdq3N6eoKedx5mp8ZqPKzO24e9f13fMOVvX7k3bRFIVEUD/7FZAQ6ScCb vobQ== X-Gm-Message-State: ALoCoQkSYyyAlpDrfBkkKpdkzw1hD4MKoFXl03M37ugQQnCcE/POnsq0cS7JEvSQ+DgM6YJx0EYl X-Received: by 10.68.209.130 with SMTP id mm2mr20002677pbc.3.1404907102342; Wed, 09 Jul 2014 04:58:22 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.34 with SMTP id i31ls2433345qgf.51.gmail; Wed, 09 Jul 2014 04:58:22 -0700 (PDT) X-Received: by 10.52.30.9 with SMTP id o9mr32814618vdh.15.1404907102228; Wed, 09 Jul 2014 04:58:22 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id ty10si21336125vdc.73.2014.07.09.04.58.22 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 04:58:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.181 as permitted sender) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id db11so6980645veb.40 for ; Wed, 09 Jul 2014 04:58:22 -0700 (PDT) X-Received: by 10.52.23.71 with SMTP id k7mr32768872vdf.27.1404907102079; Wed, 09 Jul 2014 04:58:22 -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 tc5csp41072vcb; Wed, 9 Jul 2014 04:58:21 -0700 (PDT) X-Received: by 10.70.34.6 with SMTP id v6mr10753538pdi.29.1404907101236; Wed, 09 Jul 2014 04:58:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u2si45815587pbz.202.2014.07.09.04.58.20; Wed, 09 Jul 2014 04:58:20 -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 S1751574AbaGIL6U (ORCPT + 1 other); Wed, 9 Jul 2014 07:58:20 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:41704 "EHLO mail-we0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751325AbaGIL6T (ORCPT ); Wed, 9 Jul 2014 07:58:19 -0400 Received: by mail-we0-f173.google.com with SMTP id t60so7379861wes.32 for ; Wed, 09 Jul 2014 04:58:18 -0700 (PDT) X-Received: by 10.194.83.39 with SMTP id n7mr48338296wjy.58.1404907098126; Wed, 09 Jul 2014 04:58:18 -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 ja9sm18644324wic.8.2014.07.09.04.58.16 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jul 2014 04:58:17 -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 , Bjorn Andersson , "Ivan T. Ivanov" Subject: [PATCH] pinctrl: msm: move all qualcomm drivers to subdir Date: Wed, 9 Jul 2014 13:57:32 +0200 Message-Id: <1404907052-14454-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.128.181 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 four Qualcomm-related pin control drivers, and now there are drivers coming in for the PMICs on these systems, so let's create a qcom subdirectory to hold all the Qualcomm stuff. Cc: Bjorn Andersson Cc: Ivan T. Ivanov Signed-off-by: Linus Walleij --- drivers/pinctrl/Kconfig | 40 +--------------------------- drivers/pinctrl/Makefile | 5 ---- drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c | 0 drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c | 0 drivers/pinctrl/{ => qcom}/pinctrl-msm.c | 0 drivers/pinctrl/{ => qcom}/pinctrl-msm8960.c | 0 drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c | 0 7 files changed, 1 insertion(+), 44 deletions(-) rename drivers/pinctrl/{ => qcom}/pinctrl-apq8064.c (100%) rename drivers/pinctrl/{ => qcom}/pinctrl-ipq8064.c (100%) rename drivers/pinctrl/{ => qcom}/pinctrl-msm.c (100%) rename drivers/pinctrl/{ => qcom}/pinctrl-msm8960.c (100%) rename drivers/pinctrl/{ => qcom}/pinctrl-msm8x74.c (100%) diff --git a/drivers/pinctrl/pinctrl-apq8064.c b/drivers/pinctrl/qcom/pinctrl-apq8064.c similarity index 100% rename from drivers/pinctrl/pinctrl-apq8064.c rename to drivers/pinctrl/qcom/pinctrl-apq8064.c diff --git a/drivers/pinctrl/pinctrl-ipq8064.c b/drivers/pinctrl/qcom/pinctrl-ipq8064.c similarity index 100% rename from drivers/pinctrl/pinctrl-ipq8064.c rename to drivers/pinctrl/qcom/pinctrl-ipq8064.c diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c similarity index 100% rename from drivers/pinctrl/pinctrl-msm.c rename to drivers/pinctrl/qcom/pinctrl-msm.c diff --git a/drivers/pinctrl/pinctrl-msm8960.c b/drivers/pinctrl/qcom/pinctrl-msm8960.c similarity index 100% rename from drivers/pinctrl/pinctrl-msm8960.c rename to drivers/pinctrl/qcom/pinctrl-msm8960.c diff --git a/drivers/pinctrl/pinctrl-msm8x74.c b/drivers/pinctrl/qcom/pinctrl-msm8x74.c similarity index 100% rename from drivers/pinctrl/pinctrl-msm8x74.c rename to drivers/pinctrl/qcom/pinctrl-msm8x74.c diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index c0f49fb3276c..e2c7e09783fa 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -233,45 +233,6 @@ config PINCTRL_IMX28 bool select PINCTRL_MXS -config PINCTRL_MSM - bool - select PINMUX - select PINCONF - select GENERIC_PINCONF - select GPIOLIB_IRQCHIP - -config PINCTRL_APQ8064 - tristate "Qualcomm APQ8064 pin controller driver" - depends on GPIOLIB && OF - select PINCTRL_MSM - help - This is the pinctrl, pinmux, pinconf and gpiolib driver for the - Qualcomm TLMM block found in the Qualcomm APQ8064 platform. - -config PINCTRL_IPQ8064 - tristate "Qualcomm IPQ8064 pin controller driver" - depends on GPIOLIB && OF - select PINCTRL_MSM - help - This is the pinctrl, pinmux, pinconf and gpiolib driver for the - Qualcomm TLMM block found in the Qualcomm IPQ8064 platform. - -config PINCTRL_MSM8960 - tristate "Qualcomm 8960 pin controller driver" - depends on GPIOLIB && OF - select PINCTRL_MSM - help - This is the pinctrl, pinmux, pinconf and gpiolib driver for the - Qualcomm TLMM block found in the Qualcomm 8960 platform. - -config PINCTRL_MSM8X74 - tristate "Qualcomm 8x74 pin controller driver" - depends on GPIOLIB && OF && (ARCH_QCOM || COMPILE_TEST) - select PINCTRL_MSM - help - This is the pinctrl, pinmux, pinconf and gpiolib driver for the - Qualcomm TLMM block found in the Qualcomm 8974 platform. - config PINCTRL_NOMADIK bool "Nomadik pin controller driver" depends on ARCH_U8500 || ARCH_NOMADIK @@ -410,6 +371,7 @@ config PINCTRL_S3C64XX source "drivers/pinctrl/berlin/Kconfig" source "drivers/pinctrl/mvebu/Kconfig" +source "drivers/pinctrl/qcom/Kconfig" source "drivers/pinctrl/sh-pfc/Kconfig" source "drivers/pinctrl/spear/Kconfig" source "drivers/pinctrl/sunxi/Kconfig" diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index 80bced77446a..a7b8a9e62a14 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -39,11 +39,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_MSM) += pinctrl-msm.o -obj-$(CONFIG_PINCTRL_APQ8064) += pinctrl-apq8064.o -obj-$(CONFIG_PINCTRL_IPQ8064) += pinctrl-ipq8064.o -obj-$(CONFIG_PINCTRL_MSM8960) += pinctrl-msm8960.o -obj-$(CONFIG_PINCTRL_MSM8X74) += pinctrl-msm8x74.o obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o obj-$(CONFIG_PINCTRL_DB8500) += pinctrl-nomadik-db8500.o