* [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK
@ 2016-01-23 15:33 Masahiro Yamada
2016-01-27 14:11 ` Linus Walleij
0 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2016-01-23 15:33 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK
2016-01-23 15:33 [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK Masahiro Yamada
@ 2016-01-27 14:11 ` Linus Walleij
2016-01-28 4:22 ` Masahiro Yamada
0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2016-01-27 14:11 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK
2016-01-27 14:11 ` Linus Walleij
@ 2016-01-28 4:22 ` Masahiro Yamada
2016-02-10 9:29 ` Linus Walleij
0 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2016-01-28 4:22 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK
2016-01-28 4:22 ` Masahiro Yamada
@ 2016-02-10 9:29 ` Linus Walleij
2016-02-10 9:56 ` Masahiro Yamada
0 siblings, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2016-02-10 9:29 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jan 28, 2016 at 5:22 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 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.)
No order works for me and I have merged quite a lot of other stuff
that had higher priority.
But please rebase both patches on my "devel" branch and resend
and I will apply them.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK
2016-02-10 9:29 ` Linus Walleij
@ 2016-02-10 9:56 ` Masahiro Yamada
0 siblings, 0 replies; 5+ messages in thread
From: Masahiro Yamada @ 2016-02-10 9:56 UTC (permalink / raw)
To: linux-arm-kernel
Hi Linus,
2016-02-10 18:29 GMT+09:00 Linus Walleij <linus.walleij@linaro.org>:
> On Thu, Jan 28, 2016 at 5:22 AM, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>> 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.)
>
> No order works for me and I have merged quite a lot of other stuff
> that had higher priority.
>
> But please rebase both patches on my "devel" branch and resend
> and I will apply them.
>
Sure.
The first one is already in your devel branch.
I've rebased and posted the second one.
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-02-10 9:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-23 15:33 [PATCH] pinctrl: mediatek: guard sub-directory with CONFIG_PINCTRL_MTK Masahiro Yamada
2016-01-27 14:11 ` Linus Walleij
2016-01-28 4:22 ` Masahiro Yamada
2016-02-10 9:29 ` Linus Walleij
2016-02-10 9:56 ` Masahiro Yamada
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).