* [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI
@ 2016-01-23 15:32 Masahiro Yamada
2016-01-25 9:27 ` Maxime Ripard
2016-01-28 10:31 ` Linus Walleij
0 siblings, 2 replies; 5+ messages in thread
From: Masahiro Yamada @ 2016-01-23 15:32 UTC (permalink / raw)
To: linux-gpio
Cc: Masahiro Yamada, Linus Walleij, linux-kernel, Chen-Yu Tsai,
Maxime Ripard, linux-arm-kernel
CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
to guard the drivers/pinctrl/sunxi/ directory.
(I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/pinctrl/Makefile | 2 +-
drivers/pinctrl/sunxi/Kconfig | 30 +++++++++++++++---------------
drivers/pinctrl/sunxi/Makefile | 2 +-
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile
index 04b633f..63a6f0b 100644
--- a/drivers/pinctrl/Makefile
+++ b/drivers/pinctrl/Makefile
@@ -45,7 +45,7 @@ obj-$(CONFIG_ARCH_QCOM) += qcom/
obj-$(CONFIG_PINCTRL_SAMSUNG) += samsung/
obj-$(CONFIG_PINCTRL_SH_PFC) += sh-pfc/
obj-$(CONFIG_PINCTRL_SPEAR) += spear/
-obj-$(CONFIG_ARCH_SUNXI) += sunxi/
+obj-$(CONFIG_PINCTRL_SUNXI) += sunxi/
obj-$(CONFIG_PINCTRL_UNIPHIER) += uniphier/
obj-$(CONFIG_ARCH_VT8500) += vt8500/
obj-$(CONFIG_ARCH_MEDIATEK) += mediatek/
diff --git a/drivers/pinctrl/sunxi/Kconfig b/drivers/pinctrl/sunxi/Kconfig
index f8dbc8b..ac8388e 100644
--- a/drivers/pinctrl/sunxi/Kconfig
+++ b/drivers/pinctrl/sunxi/Kconfig
@@ -1,67 +1,67 @@
if ARCH_SUNXI
-config PINCTRL_SUNXI_COMMON
+config PINCTRL_SUNXI
bool
select PINMUX
select GENERIC_PINCONF
config PINCTRL_SUN4I_A10
def_bool MACH_SUN4I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN5I_A10S
def_bool MACH_SUN5I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN5I_A13
def_bool MACH_SUN5I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN6I_A31
def_bool MACH_SUN6I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN6I_A31S
def_bool MACH_SUN6I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN6I_A31_R
def_bool MACH_SUN6I
depends on RESET_CONTROLLER
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN7I_A20
def_bool MACH_SUN7I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN8I_A23
def_bool MACH_SUN8I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN8I_A33
def_bool MACH_SUN8I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN8I_A83T
def_bool MACH_SUN8I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN8I_A23_R
def_bool MACH_SUN8I
depends on RESET_CONTROLLER
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN8I_H3
def_bool MACH_SUN8I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN9I_A80
def_bool MACH_SUN9I
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
config PINCTRL_SUN9I_A80_R
def_bool MACH_SUN9I
depends on RESET_CONTROLLER
- select PINCTRL_SUNXI_COMMON
+ select PINCTRL_SUNXI
endif
diff --git a/drivers/pinctrl/sunxi/Makefile b/drivers/pinctrl/sunxi/Makefile
index ef82f22..dac1bd0 100644
--- a/drivers/pinctrl/sunxi/Makefile
+++ b/drivers/pinctrl/sunxi/Makefile
@@ -1,5 +1,5 @@
# Core
-obj-$(CONFIG_PINCTRL_SUNXI_COMMON) += pinctrl-sunxi.o
+obj-y += pinctrl-sunxi.o
# SoC Drivers
obj-$(CONFIG_PINCTRL_SUN4I_A10) += pinctrl-sun4i-a10.o
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI
2016-01-23 15:32 [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI Masahiro Yamada
@ 2016-01-25 9:27 ` Maxime Ripard
2016-01-28 10:31 ` Linus Walleij
1 sibling, 0 replies; 5+ messages in thread
From: Maxime Ripard @ 2016-01-25 9:27 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-gpio, Linus Walleij, linux-kernel, Chen-Yu Tsai,
linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 512 bytes --]
On Sun, Jan 24, 2016 at 12:32:09AM +0900, Masahiro Yamada wrote:
> CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
> to guard the drivers/pinctrl/sunxi/ directory.
> (I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI
2016-01-23 15:32 [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI Masahiro Yamada
2016-01-25 9:27 ` Maxime Ripard
@ 2016-01-28 10:31 ` Linus Walleij
2016-01-28 10:45 ` Masahiro Yamada
1 sibling, 1 reply; 5+ messages in thread
From: Linus Walleij @ 2016-01-28 10:31 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Chen-Yu Tsai, Maxime Ripard, linux-arm-kernel@lists.infradead.org
On Sat, Jan 23, 2016 at 4:32 PM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
> to guard the drivers/pinctrl/sunxi/ directory.
> (I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This patch does not apply on linux v4.5-rc1, please rebase, add
Maxime's ACK and resend.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI
2016-01-28 10:31 ` Linus Walleij
@ 2016-01-28 10:45 ` Masahiro Yamada
2016-01-28 13:27 ` Linus Walleij
0 siblings, 1 reply; 5+ messages in thread
From: Masahiro Yamada @ 2016-01-28 10:45 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Chen-Yu Tsai, Maxime Ripard, linux-arm-kernel@lists.infradead.org
Hi Linus
2016-01-28 19:31 GMT+09:00 Linus Walleij <linus.walleij@linaro.org>:
> On Sat, Jan 23, 2016 at 4:32 PM, Masahiro Yamada
> <yamada.masahiro@socionext.com> wrote:
>
>> CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
>> to guard the drivers/pinctrl/sunxi/ directory.
>> (I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> This patch does not apply on linux v4.5-rc1, please rebase, add
> Maxime's ACK and resend.
I think this patch applies on v4.5-rc1.
I tried again and it succeeded.
This is my log.
yamada@beagle:~/workspace/linux$ git checkout -b foo v4.5-rc1
Switched to a new branch 'foo'
yamada@beagle:~/workspace/linux$ git am
pinctrl-sunxi-guard-sub-directory-with-CONFIG_PINCTRL_SUNXI.patch
Applying: pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI
yamada@beagle:~/workspace/linux$ git log -n 2
commit 74945160ad985cbd71ce325271113c5a975ca1da
Author: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Sun Jan 24 00:32:09 2016 +0900
pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI
CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
to guard the drivers/pinctrl/sunxi/ directory.
(I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
commit 92e963f50fc74041b5e9e744c330dca48e04f08d
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun Jan 24 13:06:47 2016 -0800
Linux 4.5-rc1
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI
2016-01-28 10:45 ` Masahiro Yamada
@ 2016-01-28 13:27 ` Linus Walleij
0 siblings, 0 replies; 5+ messages in thread
From: Linus Walleij @ 2016-01-28 13:27 UTC (permalink / raw)
To: Masahiro Yamada
Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
Chen-Yu Tsai, Maxime Ripard, linux-arm-kernel@lists.infradead.org
On Thu, Jan 28, 2016 at 11:45 AM, Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
> 2016-01-28 19:31 GMT+09:00 Linus Walleij <linus.walleij@linaro.org>:
>> On Sat, Jan 23, 2016 at 4:32 PM, Masahiro Yamada
>> <yamada.masahiro@socionext.com> wrote:
>>
>>> CONFIG_PINCTRL_SUNXI is more suitable than CONFIG_ARCH_SUNXI
>>> to guard the drivers/pinctrl/sunxi/ directory.
>>> (I renamed CONFIG_PINCTRL_SUNXI_COMMON to CONFIG_PINCTRL_SUNXI.)
>>>
>>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>>
>> This patch does not apply on linux v4.5-rc1, please rebase, add
>> Maxime's ACK and resend.
>
>
> I think this patch applies on v4.5-rc1.
>
> I tried again and it succeeded.
Bah, my own fault of course.
I had other patches to Makefile etc in my tree, it was easy to fix up
so applied it now, sorry for the fuzz.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-01-28 13:27 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:32 [PATCH] pinctrl: sunxi: guard sub-directory with CONFIG_PINCTRL_SUNXI Masahiro Yamada
2016-01-25 9:27 ` Maxime Ripard
2016-01-28 10:31 ` Linus Walleij
2016-01-28 10:45 ` Masahiro Yamada
2016-01-28 13:27 ` Linus Walleij
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).