Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a6a38a66 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King
Browse files

[ARM] 3736/1: xscale: don't mis-report 80219 as an iop32x 



Patch from Lennert Buytenhek

The IOP 80219 xscale CPU is a stripped down version of the IOP32x.
But the fact that the 80219 and IOP32x are very similar doesn't mean
that they need to share a cpu table entry.  It's also somewhat confusing
for the end user to see the 80219 reported as an IOP32x, so this patch
splits the IOP32x cpu table entry to make a separate entry for the
80219.

Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dffb0605

arch/arm/mm/proc-xscale.S

+29 −1
Original line number Diff line number Diff line
@@ -536,6 +536,11 @@ cpu_80200_name: 
	.asciz	"XScale-80200"

	.size	cpu_80200_name, . - cpu_80200_name



	.type	cpu_80219_name, #object

cpu_80219_name:

	.asciz	"XScale-80219"

	.size	cpu_80219_name, . - cpu_80219_name



	.type	cpu_8032x_name, #object

cpu_8032x_name:

	.asciz	"XScale-IOP8032x Family"
@@ -613,10 +618,33 @@ __80200_proc_info: 
	.long	xscale_cache_fns

	.size	__80200_proc_info, . - __80200_proc_info



	.type	__80219_proc_info,#object

__80219_proc_info:

	.long	0x69052e20

	.long	0xffffffe0

	.long   PMD_TYPE_SECT | \

		PMD_SECT_BUFFERABLE | \

		PMD_SECT_CACHEABLE | \

		PMD_SECT_AP_WRITE | \

		PMD_SECT_AP_READ

	.long   PMD_TYPE_SECT | \

		PMD_SECT_AP_WRITE | \

		PMD_SECT_AP_READ

	b	__xscale_setup

	.long	cpu_arch_name

	.long	cpu_elf_name

	.long	HWCAP_SWP|HWCAP_HALF|HWCAP_THUMB|HWCAP_FAST_MULT|HWCAP_EDSP

	.long	cpu_80219_name

	.long	xscale_processor_functions

	.long	v4wbi_tlb_fns

	.long	xscale_mc_user_fns

	.long	xscale_cache_fns

	.size	__80219_proc_info, . - __80219_proc_info



	.type	__8032x_proc_info,#object

__8032x_proc_info:

	.long	0x69052420

	.long	0xfffff5e0      @ mask should accomodate IOP80219 also

	.long	0xffffffe0

	.long   PMD_TYPE_SECT | \

		PMD_SECT_BUFFERABLE | \

		PMD_SECT_CACHEABLE | \