Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1315670 > unrolled thread

[PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK

Started byMasahiro Yamada <yamada.masahiro@socionext.com>
First post2016-01-23 16:40 +0100
Last post2016-01-28 05:30 +0100
Articles 3 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-01-23 16:40 +0100
    Re: [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK Linus Walleij <linus.walleij@linaro.org> - 2016-01-27 15:20 +0100
      Re: [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK Masahiro Yamada <yamada.masahiro@socionext.com> - 2016-01-28 05:30 +0100

#1315670 — [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-01-23 16:40 +0100
Subject[PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK
Message-ID<qU8sa-4Hl-15@gated-at.bofh.it>
CONFIG_PINCTRL_MTK is more suitable than CONFIG_ARCH_MEDIATEK
to guard the drivers/pinctrl/mediatek/ directory.
(I renamed CONFIG_PINCTRL_MTK_COMMON to CONFIG_PINCTRL_MTK.)

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 drivers/pinctrl/Makefile          |  2 +-
 drivers/pinctrl/mediatek/Kconfig  | 10 +++++-----
 drivers/pinctrl/mediatek/Makefile | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 63a6f0b..ab512c4 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -48,4 +48,4 @@ obj-$(CONFIG_PINCTRL_SPEAR)	+= spear/
 obj-$(CONFIG_PINCTRL_SUNXI)	+= sunxi/
 obj-$(CONFIG_PINCTRL_UNIPHIER)	+= uniphier/
 obj-$(CONFIG_ARCH_VT8500)	+= vt8500/
-obj-$(CONFIG_ARCH_MEDIATEK)	+= mediatek/
+obj-$(CONFIG_PINCTRL_MTK)	+= mediatek/
diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
index 02f6f92..3cfa705 100644
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@ -1,6 +1,6 @@
 if ARCH_MEDIATEK || COMPILE_TEST
 
-config PINCTRL_MTK_COMMON
+config PINCTRL_MTK
 	bool
 	depends on OF
 	select PINMUX
@@ -13,13 +13,13 @@ config PINCTRL_MT8135
 	bool "Mediatek MT8135 pin control" if COMPILE_TEST && !MACH_MT8135
 	depends on OF
 	default MACH_MT8135
-	select PINCTRL_MTK_COMMON
+	select PINCTRL_MTK
 
 config PINCTRL_MT8127
 	bool "Mediatek MT8127 pin control" if COMPILE_TEST && !MACH_MT8127
 	depends on OF
 	default MACH_MT8127
-	select PINCTRL_MTK_COMMON
+	select PINCTRL_MTK
 
 # For ARMv8 SoCs
 config PINCTRL_MT8173
@@ -27,13 +27,13 @@ config PINCTRL_MT8173
 	depends on OF
 	depends on ARM64 || COMPILE_TEST
 	default ARM64 && ARCH_MEDIATEK
-	select PINCTRL_MTK_COMMON
+	select PINCTRL_MTK
 
 # For PMIC
 config PINCTRL_MT6397
 	bool "Mediatek MT6397 pin control" if COMPILE_TEST && !MFD_MT6397
 	depends on OF
 	default MFD_MT6397
-	select PINCTRL_MTK_COMMON
+	select PINCTRL_MTK
 
 endif
diff --git a/drivers/pinctrl/mediatek/Makefile b/drivers/pinctrl/mediatek/Makefile
index eb923d6..2419ce5 100644
--- a/drivers/pinctrl/mediatek/Makefile
+++ b/drivers/pinctrl/mediatek/Makefile
@@ -1,8 +1,8 @@
 # Core
-obj-$(CONFIG_PINCTRL_MTK_COMMON)	+= pinctrl-mtk-common.o
+obj-y				+= pinctrl-mtk-common.o
 
 # SoC Drivers
-obj-$(CONFIG_PINCTRL_MT8135)		+= pinctrl-mt8135.o
-obj-$(CONFIG_PINCTRL_MT8127)		+= pinctrl-mt8127.o
-obj-$(CONFIG_PINCTRL_MT8173)		+= pinctrl-mt8173.o
-obj-$(CONFIG_PINCTRL_MT6397)		+= pinctrl-mt6397.o
+obj-$(CONFIG_PINCTRL_MT8135)	+= pinctrl-mt8135.o
+obj-$(CONFIG_PINCTRL_MT8127)	+= pinctrl-mt8127.o
+obj-$(CONFIG_PINCTRL_MT8173)	+= pinctrl-mt8173.o
+obj-$(CONFIG_PINCTRL_MT6397)	+= pinctrl-mt6397.o
-- 
1.9.1

[toc] | [next] | [standalone]


#1319007

FromLinus Walleij <linus.walleij@linaro.org>
Date2016-01-27 15:20 +0100
Message-ID<qVz6X-4J4-33@gated-at.bofh.it>
In reply to#1315670
On Sat, Jan 23, 2016 at 4:33 PM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:

> CONFIG_PINCTRL_MTK is more suitable than CONFIG_ARCH_MEDIATEK
> to guard the drivers/pinctrl/mediatek/ directory.
> (I renamed CONFIG_PINCTRL_MTK_COMMON to CONFIG_PINCTRL_MTK.)
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

This patch does not apply to linux v4.5-rc1, please rebase the
patch and resend.

Yours,
Linus Walleij

[toc] | [prev] | [next] | [standalone]


#1320283

FromMasahiro Yamada <yamada.masahiro@socionext.com>
Date2016-01-28 05:30 +0100
Message-ID<qVMnx-6eG-13@gated-at.bofh.it>
In reply to#1319007
Hi Linus

2016-01-27 23:11 GMT+09:00 Linus Walleij <linus.walleij@linaro.org>:
> On Sat, Jan 23, 2016 at 4:33 PM, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>
>> CONFIG_PINCTRL_MTK is more suitable than CONFIG_ARCH_MEDIATEK
>> to guard the drivers/pinctrl/mediatek/ directory.
>> (I renamed CONFIG_PINCTRL_MTK_COMMON to CONFIG_PINCTRL_MTK.)
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> This patch does not apply to linux v4.5-rc1, please rebase the
> patch and resend.


These two patches can be applied in this order:
https://patchwork.kernel.org/patch/8097541/
https://patchwork.kernel.org/patch/8097551/

(Sorry, I should have sent them as a series.)


If you want to apply only the latter onto v4.5-rc1,
"git am -C2" can apply it.


-- 
Best Regards
Masahiro Yamada

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web