[PATCH] ARM: MX3: make CPU revision number detection work on all boards

[Sascha Hauer]

Hi Wolfgang,

On Tue, Dec 15, 2009 at 12:27:42AM +0100, Wolfgang Denk wrote:
> Commit 52939c03 (ARM: MX3: fix CPU revision number detection) started
> using the CPU's SREV register for revision number detection. This
> makes it mandatory to have a valid SPBA0 mapping. Add this to the
> global map_io code instead of adding multiple copies for each board.
> 
> Signed-off-by: Wolfgang Denk <wd at denx.de>
> Cc: Daniel Mack <daniel at caiaq.de>
> Cc: Sascha Hauer <s.hauer at pengutronix.de>

ok for -rc.

Sascha

> 
> Tested on Qong (EVB-Lite)
> Tested-by: Wolfgang Denk <wd at denx.de>
> ---
>  arch/arm/mach-mx3/mm.c       |    5 +++++
>  arch/arm/mach-mx3/mx31ads.c  |    5 -----
>  arch/arm/mach-mx3/mx31lite.c |    5 -----
>  arch/arm/mach-mx3/mx31pdk.c  |    5 -----
>  4 files changed, 5 insertions(+), 15 deletions(-)
> 
> diff --git a/arch/arm/mach-mx3/mm.c b/arch/arm/mach-mx3/mm.c
> index bedf5b8..6858a4f 100644
> --- a/arch/arm/mach-mx3/mm.c
> +++ b/arch/arm/mach-mx3/mm.c
> @@ -65,6 +65,11 @@ static struct map_desc mxc_io_desc[] __initdata = {
>  		.pfn		= __phys_to_pfn(AIPS2_BASE_ADDR),
>  		.length		= AIPS2_SIZE,
>  		.type		= MT_DEVICE_NONSHARED
> +	}, {
> +		.virtual = SPBA0_BASE_ADDR_VIRT,
> +		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),
> +		.length = SPBA0_SIZE,
> +		.type = MT_DEVICE_NONSHARED
>  	},
>  };
>  
> diff --git a/arch/arm/mach-mx3/mx31ads.c b/arch/arm/mach-mx3/mx31ads.c
> index 0497c15..3e7bafa 100644
> --- a/arch/arm/mach-mx3/mx31ads.c
> +++ b/arch/arm/mach-mx3/mx31ads.c
> @@ -494,11 +494,6 @@ static void mxc_init_i2c(void)
>   */
>  static struct map_desc mx31ads_io_desc[] __initdata = {
>  	{
> -		.virtual	= SPBA0_BASE_ADDR_VIRT,
> -		.pfn		= __phys_to_pfn(SPBA0_BASE_ADDR),
> -		.length		= SPBA0_SIZE,
> -		.type		= MT_DEVICE_NONSHARED
> -	}, {
>  		.virtual	= CS4_BASE_ADDR_VIRT,
>  		.pfn		= __phys_to_pfn(CS4_BASE_ADDR),
>  		.length		= CS4_SIZE / 2,
> diff --git a/arch/arm/mach-mx3/mx31lite.c b/arch/arm/mach-mx3/mx31lite.c
> index def6b67..4697164 100644
> --- a/arch/arm/mach-mx3/mx31lite.c
> +++ b/arch/arm/mach-mx3/mx31lite.c
> @@ -212,11 +212,6 @@ static struct platform_device physmap_flash_device = {
>   */
>  static struct map_desc mx31lite_io_desc[] __initdata = {
>  	{
> -		.virtual = SPBA0_BASE_ADDR_VIRT,
> -		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),
> -		.length = SPBA0_SIZE,
> -		.type = MT_DEVICE_NONSHARED
> -	}, {
>  		.virtual = CS4_BASE_ADDR_VIRT,
>  		.pfn = __phys_to_pfn(CS4_BASE_ADDR),
>  		.length = CS4_SIZE,
> diff --git a/arch/arm/mach-mx3/mx31pdk.c b/arch/arm/mach-mx3/mx31pdk.c
> index 0f7a2f0..18715f1 100644
> --- a/arch/arm/mach-mx3/mx31pdk.c
> +++ b/arch/arm/mach-mx3/mx31pdk.c
> @@ -211,11 +211,6 @@ static int __init mx31pdk_init_expio(void)
>   */
>  static struct map_desc mx31pdk_io_desc[] __initdata = {
>  	{
> -		.virtual = SPBA0_BASE_ADDR_VIRT,
> -		.pfn = __phys_to_pfn(SPBA0_BASE_ADDR),
> -		.length = SPBA0_SIZE,
> -		.type = MT_DEVICE_NONSHARED,
> -	}, {
>  		.virtual = CS5_BASE_ADDR_VIRT,
>  		.pfn = __phys_to_pfn(CS5_BASE_ADDR),
>  		.length = CS5_SIZE,
> -- 
> 1.6.2.5
> 
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |