diff mbox

ARM: berlin: add CPU_V7 to Marvell Armada 1500-mini (BG2CD)

Message ID 1397587699-11023-1-git-send-email-sebastian.hesselbarth@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Sebastian Hesselbarth April 15, 2014, 6:48 p.m. UTC
This selects missing CPU_V7 for ARM Cortex-A9 based Marvell Armada
1500-mini (BG2CD).

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
Cc: Russell King <linux@arm.linux.org.uk>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
---
 arch/arm/mach-berlin/Kconfig | 1 +
 1 file changed, 1 insertion(+)

Comments

Sebastian Hesselbarth April 22, 2014, 6:11 p.m. UTC | #1
On 04/15/2014 08:48 PM, Sebastian Hesselbarth wrote:
> This selects missing CPU_V7 for ARM Cortex-A9 based Marvell Armada
> 1500-mini (BG2CD).
> 
> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---

Applied to berlin/soc.

> ---
>  arch/arm/mach-berlin/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
> index d3c5f14dc142..0add8350faf4 100644
> --- a/arch/arm/mach-berlin/Kconfig
> +++ b/arch/arm/mach-berlin/Kconfig
> @@ -18,6 +18,7 @@ config MACH_BERLIN_BG2
>  config MACH_BERLIN_BG2CD
>  	bool "Marvell Armada 1500-mini (BG2CD)"
>  	select CACHE_L2X0
> +	select CPU_V7
>  	select HAVE_ARM_TWD if SMP
>  
>  config MACH_BERLIN_BG2Q
>
Rob Herring April 22, 2014, 6:29 p.m. UTC | #2
On Tue, Apr 22, 2014 at 1:11 PM, Sebastian Hesselbarth
<sebastian.hesselbarth@gmail.com> wrote:
> On 04/15/2014 08:48 PM, Sebastian Hesselbarth wrote:
>> This selects missing CPU_V7 for ARM Cortex-A9 based Marvell Armada
>> 1500-mini (BG2CD).
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>> ---
>
> Applied to berlin/soc.
>
>> ---
>>  arch/arm/mach-berlin/Kconfig | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
>> index d3c5f14dc142..0add8350faf4 100644
>> --- a/arch/arm/mach-berlin/Kconfig
>> +++ b/arch/arm/mach-berlin/Kconfig
>> @@ -18,6 +18,7 @@ config MACH_BERLIN_BG2
>>  config MACH_BERLIN_BG2CD
>>       bool "Marvell Armada 1500-mini (BG2CD)"
>>       select CACHE_L2X0
>> +     select CPU_V7

This should not be needed. This gets selected by multi-platform with
ARCH_MULTI_V7.

Rob
Sebastian Hesselbarth April 22, 2014, 6:35 p.m. UTC | #3
On 04/22/2014 08:29 PM, Rob Herring wrote:
> On Tue, Apr 22, 2014 at 1:11 PM, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> On 04/15/2014 08:48 PM, Sebastian Hesselbarth wrote:
>>> This selects missing CPU_V7 for ARM Cortex-A9 based Marvell Armada
>>> 1500-mini (BG2CD).
>>>
>>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>> ---
>>
>> Applied to berlin/soc.
>>
>>> ---
>>>  arch/arm/mach-berlin/Kconfig | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
>>> index d3c5f14dc142..0add8350faf4 100644
>>> --- a/arch/arm/mach-berlin/Kconfig
>>> +++ b/arch/arm/mach-berlin/Kconfig
>>> @@ -18,6 +18,7 @@ config MACH_BERLIN_BG2
>>>  config MACH_BERLIN_BG2CD
>>>       bool "Marvell Armada 1500-mini (BG2CD)"
>>>       select CACHE_L2X0
>>> +     select CPU_V7
> 
> This should not be needed. This gets selected by multi-platform with
> ARCH_MULTI_V7.

Ok, you are right.

Currently, I have three different SoCs for MACH_BERLIN. One selects
CPU_PJ4B, one also selects CPU_V7. This would add CPU_V7 to BG2CD
just to make it symmetrical.

I can also remove it from BG2Q and only select CPU_PJ4B for the one
that is different.

Sebastian
Sebastian Hesselbarth April 22, 2014, 9:22 p.m. UTC | #4
On 04/22/2014 08:29 PM, Rob Herring wrote:
> On Tue, Apr 22, 2014 at 1:11 PM, Sebastian Hesselbarth
> <sebastian.hesselbarth@gmail.com> wrote:
>> On 04/15/2014 08:48 PM, Sebastian Hesselbarth wrote:
>>> This selects missing CPU_V7 for ARM Cortex-A9 based Marvell Armada
>>> 1500-mini (BG2CD).
>>>
>>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
>>> ---
>>
>> Applied to berlin/soc.
>>
>>> ---
>>>  arch/arm/mach-berlin/Kconfig | 1 +
>>>  1 file changed, 1 insertion(+)
>>>
>>> diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
>>> index d3c5f14dc142..0add8350faf4 100644
>>> --- a/arch/arm/mach-berlin/Kconfig
>>> +++ b/arch/arm/mach-berlin/Kconfig
>>> @@ -18,6 +18,7 @@ config MACH_BERLIN_BG2
>>>  config MACH_BERLIN_BG2CD
>>>       bool "Marvell Armada 1500-mini (BG2CD)"
>>>       select CACHE_L2X0
>>> +     select CPU_V7
> 
> This should not be needed. This gets selected by multi-platform with
> ARCH_MULTI_V7.

Dropped again, thanks for sending the cleanup :)

Sebastian
diff mbox

Patch

diff --git a/arch/arm/mach-berlin/Kconfig b/arch/arm/mach-berlin/Kconfig
index d3c5f14dc142..0add8350faf4 100644
--- a/arch/arm/mach-berlin/Kconfig
+++ b/arch/arm/mach-berlin/Kconfig
@@ -18,6 +18,7 @@  config MACH_BERLIN_BG2
 config MACH_BERLIN_BG2CD
 	bool "Marvell Armada 1500-mini (BG2CD)"
 	select CACHE_L2X0
+	select CPU_V7
 	select HAVE_ARM_TWD if SMP
 
 config MACH_BERLIN_BG2Q