2013-03-04 23:19:22

by Stephen Boyd

[permalink] [raw]
Subject: [PATCH] ARM: Scorpion is a v7 architecture, not v6

Scorpion processors have always been v7 CPUs. Fix the Kconfig
text to reflect this.

Reported-by: Stepan Moskovchenko <[email protected]>
Signed-off-by: Stephen Boyd <[email protected]>
---
arch/arm/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dedf02b..dc3bbbc 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1006,12 +1006,12 @@ config ARCH_MULTI_V4_V5
bool

config ARCH_MULTI_V6
- bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
+ bool "ARMv6 based platforms (ARM11)"
select ARCH_MULTI_V6_V7
select CPU_V6

config ARCH_MULTI_V7
- bool "ARMv7 based platforms (Cortex-A, PJ4, Krait)"
+ bool "ARMv7 based platforms (Cortex-A, PJ4, Scorpion, Krait)"
default y
select ARCH_MULTI_V6_V7
select ARCH_VEXPRESS
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation


2013-03-05 08:31:44

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [PATCH] ARM: Scorpion is a v7 architecture, not v6

On Monday 04 March 2013, Stephen Boyd wrote:
> Scorpion processors have always been v7 CPUs. Fix the Kconfig
> text to reflect this.
>
> Reported-by: Stepan Moskovchenko <[email protected]>
> Signed-off-by: Stephen Boyd <[email protected]>
> ---
> arch/arm/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index dedf02b..dc3bbbc 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -1006,12 +1006,12 @@ config ARCH_MULTI_V4_V5
> bool
>
> config ARCH_MULTI_V6
> - bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
> + bool "ARMv6 based platforms (ARM11)"
> select ARCH_MULTI_V6_V7
> select CPU_V6

Sorry about that, my fault.

Was there also an ARMv6 core from Qualcomm, or did you only use ARM11 at
the time?

Arnd

2013-03-05 17:33:23

by David Brown

[permalink] [raw]
Subject: Re: [PATCH] ARM: Scorpion is a v7 architecture, not v6

Arnd Bergmann <[email protected]> writes:

> On Monday 04 March 2013, Stephen Boyd wrote:
>> config ARCH_MULTI_V6
>> - bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
>> + bool "ARMv6 based platforms (ARM11)"
>> select ARCH_MULTI_V6_V7
>> select CPU_V6
>
> Sorry about that, my fault.
>
> Was there also an ARMv6 core from Qualcomm, or did you only use ARM11 at
> the time?

I believe the v6 core in the Qualcomm chips was an ARM11.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

2013-03-15 01:43:56

by Stephen Boyd

[permalink] [raw]
Subject: Re: [PATCH] ARM: Scorpion is a v7 architecture, not v6

On 03/05/13 00:31, Arnd Bergmann wrote:
> On Monday 04 March 2013, Stephen Boyd wrote:
>> Scorpion processors have always been v7 CPUs. Fix the Kconfig
>> text to reflect this.
>>
>> Reported-by: Stepan Moskovchenko <[email protected]>
>> Signed-off-by: Stephen Boyd <[email protected]>
>> ---
>> arch/arm/Kconfig | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
>> index dedf02b..dc3bbbc 100644
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@ -1006,12 +1006,12 @@ config ARCH_MULTI_V4_V5
>> bool
>>
>> config ARCH_MULTI_V6
>> - bool "ARMv6 based platforms (ARM11, Scorpion, ...)"
>> + bool "ARMv6 based platforms (ARM11)"
>> select ARCH_MULTI_V6_V7
>> select CPU_V6
> Sorry about that, my fault.

Can you pick this patch up from the mailing list? Otherwise I can try to
route it through David's msm tree.

--
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation

2013-03-15 10:38:12

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [PATCH] ARM: Scorpion is a v7 architecture, not v6

On Friday 15 March 2013, Stephen Boyd wrote:
> Can you pick this patch up from the mailing list? Otherwise I can try to
> route it through David's msm tree.

Ok, applied to the fixes branch now.

Arnd