From patchwork Sun Dec 18 22:47:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 5847 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CD51323E21 for ; Sun, 18 Dec 2011 22:47:48 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id AC454A18301 for ; Sun, 18 Dec 2011 22:47:48 +0000 (UTC) Received: by eaac11 with SMTP id c11so1333257eaa.11 for ; Sun, 18 Dec 2011 14:47:48 -0800 (PST) Received: by 10.204.156.219 with SMTP id y27mr4285736bkw.125.1324248468403; Sun, 18 Dec 2011 14:47:48 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.204.40.4 with SMTP id i4cs110413bke; Sun, 18 Dec 2011 14:47:47 -0800 (PST) Received: by 10.213.113.209 with SMTP id b17mr4447612ebq.141.1324248466232; Sun, 18 Dec 2011 14:47:46 -0800 (PST) Received: from eu1sys200aog107.obsmtp.com (eu1sys200aog107.obsmtp.com. [207.126.144.123]) by mx.google.com with SMTP id h61si4156965eeh.140.2011.12.18.14.47.21 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 18 Dec 2011 14:47:45 -0800 (PST) Received-SPF: neutral (google.com: 207.126.144.123 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.123; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.123 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob107.postini.com ([207.126.147.11]) with SMTP ID DSNKTu5tdY1ItVO19DZqfZAJsnFDzZ/7A/Xg@postini.com; Sun, 18 Dec 2011 22:47:45 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 47A15A3; Sun, 18 Dec 2011 22:38:45 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id E0D12910; Sun, 18 Dec 2011 22:47:10 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 076B324C07C; Sun, 18 Dec 2011 23:46:59 +0100 (CET) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Sun, 18 Dec 2011 23:47:09 +0100 From: Linus Walleij To: Cc: Stephen Warren , Grant Likely , Barry Song <21cnbao@gmail.com>, Shawn Guo , Thomas Abraham , Dong Aisheng , Rajendra Nayak , Haojian Zhuang , Linus Walleij , Rongjun Ying , Jean-Christophe PLAGNIOL-VILLARD Subject: [PATCH] pinctrl: rename U300 ans SIRF pin controllers Date: Sun, 18 Dec 2011 23:47:05 +0100 Message-ID: <1324248425-26552-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.8 MIME-Version: 1.0 From: Linus Walleij For stringen order, rename the pinmux-* pin controllers to pinctrl-* and also rename the Kconfig symbols and in-kernel users. Cc: Rongjun Ying Cc: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Linus Walleij --- arch/arm/mach-u300/Kconfig | 2 +- drivers/pinctrl/Kconfig | 8 ++++---- drivers/pinctrl/Makefile | 4 ++-- drivers/pinctrl/{pinmux-sirf.c => pinctrl-sirf.c} | 0 drivers/pinctrl/{pinmux-u300.c => pinctrl-u300.c} | 0 5 files changed, 7 insertions(+), 7 deletions(-) rename drivers/pinctrl/{pinmux-sirf.c => pinctrl-sirf.c} (100%) rename drivers/pinctrl/{pinmux-u300.c => pinctrl-u300.c} (100%) diff --git a/drivers/pinctrl/pinmux-sirf.c b/drivers/pinctrl/pinctrl-sirf.c similarity index 100% rename from drivers/pinctrl/pinmux-sirf.c rename to drivers/pinctrl/pinctrl-sirf.c diff --git a/drivers/pinctrl/pinmux-u300.c b/drivers/pinctrl/pinctrl-u300.c similarity index 100% rename from drivers/pinctrl/pinmux-u300.c rename to drivers/pinctrl/pinctrl-u300.c diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index c2d5c6c..54d8f34 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig @@ -7,7 +7,7 @@ comment "ST-Ericsson Mobile Platform Products" config MACH_U300 bool "U300" select PINCTRL - select PINMUX_U300 + select PINCTRL_U300 select PINCTRL_COH901 comment "ST-Ericsson U300/U330/U335/U365 Feature Selections" diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig index c63c721..afaf885 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -23,13 +23,13 @@ config DEBUG_PINCTRL help Say Y here to add some extra checks and diagnostics to PINCTRL calls. -config PINMUX_SIRF - bool "CSR SiRFprimaII pinmux driver" +config PINCTRL_SIRF + bool "CSR SiRFprimaII pin controller driver" depends on ARCH_PRIMA2 select PINMUX -config PINMUX_U300 - bool "U300 pinmux driver" +config PINCTRL_U300 + bool "U300 pin controller driver" depends on ARCH_U300 select PINMUX diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index c046f78..827601c 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -5,6 +5,6 @@ ccflags-$(CONFIG_DEBUG_PINCTRL) += -DDEBUG obj-$(CONFIG_PINCTRL) += core.o obj-$(CONFIG_PINMUX) += pinmux.o obj-$(CONFIG_PINCONF) += pinconf.o -obj-$(CONFIG_PINMUX_SIRF) += pinmux-sirf.o -obj-$(CONFIG_PINMUX_U300) += pinmux-u300.o +obj-$(CONFIG_PINCTRL_SIRF) += pinctrl-sirf.o +obj-$(CONFIG_PINCTRL_U300) += pinctrl-u300.o obj-$(CONFIG_PINCTRL_COH901) += pinctrl-coh901.o