diff mbox

[2/5] ARM: berlin: remove the pinctrl selection from the mach-berlin Kconfig

Message ID 1444771901-24460-3-git-send-email-antoine.tenart@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Antoine Tenart Oct. 13, 2015, 9:31 p.m. UTC 
This patch removes the pinctrl driver selection from the mach-berlin
Kconfig file. This is now done in the Berlin pinctrl driver Kconfig.

Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
---
 arch/arm/mach-berlin/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

Comments

Linus Walleij Oct. 16, 2015, 2:19 p.m. UTC | #1 
On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
<antoine.tenart@free-electrons.com> wrote:

> This patch removes the pinctrl driver selection from the mach-berlin
> Kconfig file. This is now done in the Berlin pinctrl driver Kconfig.
>
> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

I can't merge this patch, take it through ARM SoC with other
Marvell stuff.

Yours,
Linus Walleij
Sebastian Hesselbarth Oct. 16, 2015, 8:08 p.m. UTC | #2 
On 16.10.2015 16:19, Linus Walleij wrote:
> On Tue, Oct 13, 2015 at 11:31 PM, Antoine Tenart
> <antoine.tenart@free-electrons.com> wrote:
>
>> This patch removes the pinctrl driver selection from the mach-berlin
>> Kconfig file. This is now done in the Berlin pinctrl driver Kconfig.
>>
>> Signed-off-by: Antoine Tenart <antoine.tenart@free-electrons.com>
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
>
> I can't merge this patch, take it through ARM SoC with other
> Marvell stuff.

Applied to berlin/soc with Linus' Ack.

Thanks,
   Sebastian
diff mbox

Patch

diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index 742d53a5f7f9..344434ca366c 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -18,19 +18,16 @@  config MACH_BERLIN_BG2
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
 	select HAVE_SMP
-	select PINCTRL_BERLIN_BG2
 
 config MACH_BERLIN_BG2CD
 	bool "Marvell Armada 1500-mini (BG2CD)"
 	select CACHE_L2X0
 	select HAVE_ARM_TWD if SMP
-	select PINCTRL_BERLIN_BG2CD
 
 config MACH_BERLIN_BG2Q
 	bool "Marvell Armada 1500 Pro (BG2-Q)"
 	select CACHE_L2X0
 	select HAVE_ARM_SCU if SMP
 	select HAVE_ARM_TWD if SMP
-	select PINCTRL_BERLIN_BG2Q
 
 endif