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

Commit 92519d82 authored by Deepak Saxena's avatar Deepak Saxena Committed by Russell King
Browse files

[ARM] 2992/1: Replace map_desc.physical with map_desc.pfn: SA1100 



Patch from Deepak Saxena

SA1100 map_desc.pfn conversion

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent cd5fc8bf

arch/arm/mach-sa1100/assabet.c

+11 −3
Original line number Diff line number Diff line
@@ -388,9 +388,17 @@ static struct sa1100_port_fns assabet_port_fns __initdata = { 
};



static struct map_desc assabet_io_desc[] __initdata = {

 /* virtual     physical    length      type */

  { 0xf1000000, 0x12000000, 0x00100000, MT_DEVICE }, /* Board Control Register */

  { 0xf2800000, 0x4b800000, 0x00800000, MT_DEVICE }  /* MQ200 */

  	{	/* Board Control Register */

		.virtual	=  0xf1000000,

		.pfn		= __phys_to_pfn(0x12000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* MQ200 */

		.virtual	=  0xf2800000,

		.pfn		= __phys_to_pfn(0x4b800000),

		.length		= 0x00800000,

		.type		= MT_DEVICE

	}

};



static void __init assabet_map_io(void)

arch/arm/mach-sa1100/badge4.c

+16 −4
Original line number Diff line number Diff line
@@ -254,10 +254,22 @@ EXPORT_SYMBOL(badge4_set_5V); 




static struct map_desc badge4_io_desc[] __initdata = {

  /*  virtual    physical    length    type */

  {0xf1000000, 0x08000000, 0x00100000, MT_DEVICE },/* SRAM  bank 1 */

  {0xf2000000, 0x10000000, 0x00100000, MT_DEVICE },/* SRAM  bank 2 */

  {0xf4000000, 0x48000000, 0x00100000, MT_DEVICE } /* SA-1111      */

  	{	/* SRAM  bank 1 */

		.virtual	= 0xf1000000,

		.pfn		= __phys_to_pfn(0x08000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* SRAM  bank 2 */

		.virtual	= 0xf2000000,

		.pfn		= __phys_to_pfn(0x10000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* SA-1111      */

		.virtual	= 0xf4000000,

		.pfn		= __phys_to_pfn(0x48000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}

};



static void

arch/arm/mach-sa1100/cerf.c

+6 −2
Original line number Diff line number Diff line
@@ -100,8 +100,12 @@ static void __init cerf_init_irq(void) 
}



static struct map_desc cerf_io_desc[] __initdata = {

  /* virtual	 physical    length	 type */

  { 0xf0000000, 0x08000000, 0x00100000, MT_DEVICE }  /* Crystal Ethernet Chip */

  	{	/* Crystal Ethernet Chip */

		.virtual	=  0xf0000000,

		.pfn		= __phys_to_pfn(0x08000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}

};



static void __init cerf_map_io(void)

arch/arm/mach-sa1100/collie.c

+11 −3
Original line number Diff line number Diff line
@@ -171,9 +171,17 @@ static void __init collie_init(void) 
}



static struct map_desc collie_io_desc[] __initdata = {

	/* virtual     physical    length      type */

	{0xe8000000, 0x00000000, 0x02000000, MT_DEVICE},	/* 32M main flash (cs0) */

	{0xea000000, 0x08000000, 0x02000000, MT_DEVICE},	/* 32M boot flash (cs1) */

	{	/* 32M main flash (cs0) */

		.virtual	= 0xe8000000,

		.pfn		= __phys_to_pfn(0x00000000),

		.length		= 0x02000000,

		.type		= MT_DEVICE

	}, {	/* 32M boot flash (cs1) */

		.virtual	= 0xea000000,

		.pfn		= __phys_to_pfn(0x08000000),

		.length		= 0x02000000,

		.type		= MT_DEVICE

	}

};



static void __init collie_map_io(void)

arch/arm/mach-sa1100/generic.c

+21 −5
Original line number Diff line number Diff line
@@ -369,11 +369,27 @@ EXPORT_SYMBOL(sa1100fb_lcd_power); 
 */



static struct map_desc standard_io_desc[] __initdata = {

 /* virtual     physical    length      type */

  { 0xf8000000, 0x80000000, 0x00100000, MT_DEVICE }, /* PCM */

  { 0xfa000000, 0x90000000, 0x00100000, MT_DEVICE }, /* SCM */

  { 0xfc000000, 0xa0000000, 0x00100000, MT_DEVICE }, /* MER */

  { 0xfe000000, 0xb0000000, 0x00200000, MT_DEVICE }  /* LCD + DMA */

  	{	/* PCM */

		.virtual	=  0xf8000000,

		.pfn		= __phys_to_pfn(0x80000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* SCM */

		.virtual	=  0xfa000000,

		.pfn		= __phys_to_pfn(0x90000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* MER */

		.virtual	=  0xfc000000,

		.pfn		= __phys_to_pfn(0xa0000000),

		.length		= 0x00100000,

		.type		= MT_DEVICE

	}, {	/* LCD + DMA */

		.virtual	=  0xfe000000,

		.pfn		= __phys_to_pfn(0xb0000000),

		.length		= 0x00200000,

		.type		= MT_DEVICE

	},

};



void __init sa1100_map_io(void)