2014-04-15 18:48:31

by Sebastian Hesselbarth

[permalink] [raw]
Subject: [PATCH] ARM: berlin: add CPU_V7 to Marvell Armada 1500-mini (BG2CD)

This selects missing CPU_V7 for ARM Cortex-A9 based Marvell Armada
1500-mini (BG2CD).

Signed-off-by: Sebastian Hesselbarth <[email protected]>
---
Cc: Russell King <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
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
--
1.9.1


2014-04-22 18:11:22

by Sebastian Hesselbarth

[permalink] [raw]
Subject: Re: [PATCH] ARM: berlin: add CPU_V7 to Marvell Armada 1500-mini (BG2CD)

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 <[email protected]>
> ---

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
>

2014-04-22 18:29:15

by Rob Herring

[permalink] [raw]
Subject: Re: [PATCH] ARM: berlin: add CPU_V7 to Marvell Armada 1500-mini (BG2CD)

On Tue, Apr 22, 2014 at 1:11 PM, Sebastian Hesselbarth
<[email protected]> 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 <[email protected]>
>> ---
>
> 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

2014-04-22 18:35:09

by Sebastian Hesselbarth

[permalink] [raw]
Subject: Re: [PATCH] ARM: berlin: add CPU_V7 to Marvell Armada 1500-mini (BG2CD)

On 04/22/2014 08:29 PM, Rob Herring wrote:
> On Tue, Apr 22, 2014 at 1:11 PM, Sebastian Hesselbarth
> <[email protected]> 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 <[email protected]>
>>> ---
>>
>> 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

2014-04-22 21:23:01

by Sebastian Hesselbarth

[permalink] [raw]
Subject: Re: [PATCH] ARM: berlin: add CPU_V7 to Marvell Armada 1500-mini (BG2CD)

On 04/22/2014 08:29 PM, Rob Herring wrote:
> On Tue, Apr 22, 2014 at 1:11 PM, Sebastian Hesselbarth
> <[email protected]> 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 <[email protected]>
>>> ---
>>
>> 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