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

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

[ARM] 2993/1: Replace map_desc.physical with map_desc.pfn: CLPS711x 



Patch from Deepak Saxena

CLSP711x 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 92519d82

arch/arm/mach-clps711x/autcpu12.c

+8 −4
Original line number Diff line number Diff line
@@ -46,10 +46,14 @@ 
*/



static struct map_desc autcpu12_io_desc[] __initdata = {

 /* virtual, physical, length, type */

	/* memory-mapped extra io and CS8900A Ethernet chip */

 	/* ethernet chip */

 	{ AUTCPU12_VIRT_CS8900A, AUTCPU12_PHYS_CS8900A, SZ_1M, MT_DEVICE }

 	{

		.virtual	= AUTCPU12_VIRT_CS8900A,

		.pfn		= __phys_to_pfn(AUTCPU12_PHYS_CS8900A),

		.length		= SZ_1M,

		.type		= MT_DEVICE

	}

};



void __init autcpu12_map_io(void)

arch/arm/mach-clps711x/cdb89712.c

+6 −1
Original line number Diff line number Diff line
@@ -39,7 +39,12 @@ 
 * ethernet driver, perhaps.

 */

static struct map_desc cdb89712_io_desc[] __initdata = {

	{ ETHER_BASE, ETHER_START, ETHER_SIZE, MT_DEVICE }

	{

		.virtual	= ETHER_BASE,

		.pfn		=__phys_to_pfn(ETHER_START),

		.length		= ETHER_SIZE,

		.type		= MT_DEVICE

	}

};



static void __init cdb89712_map_io(void)

arch/arm/mach-clps711x/ceiva.c

+7 −5
Original line number Diff line number Diff line
@@ -37,11 +37,13 @@ 
#include "common.h"



static struct map_desc ceiva_io_desc[] __initdata = {

 /* virtual, physical, length, type */



 	/* SED1355 controlled video RAM & registers */

 { CEIVA_VIRT_SED1355, CEIVA_PHYS_SED1355, SZ_2M, MT_DEVICE }



 	{

		.virtual	= CEIVA_VIRT_SED1355,

		.pfn		= __phys_to_pfn(CEIVA_PHYS_SED1355),

		.length		= SZ_2M,

		.type		= MT_DEVICE

	}

};

arch/arm/mach-clps711x/edb7211-mm.c

+21 −9
Original line number Diff line number Diff line
@@ -51,15 +51,27 @@ extern void clps711x_map_io(void); 
 *     happens).

 */

static struct map_desc edb7211_io_desc[] __initdata = {

 /* virtual, physical, length, type */



 /* memory-mapped extra keyboard row and CS8900A Ethernet chip */

 { EP7211_VIRT_EXTKBD,  EP7211_PHYS_EXTKBD,  SZ_1M, MT_DEVICE }, 

 { EP7211_VIRT_CS8900A, EP7211_PHYS_CS8900A, SZ_1M, MT_DEVICE },



 /* flash banks */

 { EP7211_VIRT_FLASH1,  EP7211_PHYS_FLASH1,  SZ_8M, MT_DEVICE },

 { EP7211_VIRT_FLASH2,  EP7211_PHYS_FLASH2,  SZ_8M, MT_DEVICE }

 	{	/* memory-mapped extra keyboard row */

	 	.virtual 	= EP7211_VIRT_EXTKBD,

		.pfn		= __phys_to_pfn(EP7211_PHYS_EXTKBD),

		.length		= SZ_1M,

		.type		- MT_DEVICE

	}, {	/* and CS8900A Ethernet chip */

		.virtual	= EP7211_VIRT_CS8900A,

		.pfn		= __phys_to_pfn(EP7211_PHYS_CS8900A),

		.length		= SZ_1M,

		.type		= MT_DEVICE

	}, { 	/* flash banks */

		.virtual	= EP7211_VIRT_FLASH1,

		.pfn		= __phys_to_pfn(EP7211_PHYS_FLASH1),

		.length		= SZ_8M,

		.type		= MT_DEVICE

	}, {

		.virtual	= EP7211_VIRT_FLASH2,

		.pfn		= __phys_to_pfn(EP7211_PHYS_FLASH2),

		.length		= SZ_8M,

		.type		= MT_DEVICE

	}

};



void __init edb7211_map_io(void)

arch/arm/mach-clps711x/mm.c

+7 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/init.h>

#include <linux/bootmem.h>



#include <asm/sizes.h>

#include <asm/hardware.h>

#include <asm/pgtable.h>

#include <asm/page.h>
@@ -34,7 +35,12 @@ 
 * This maps the generic CLPS711x registers

 */

static struct map_desc clps711x_io_desc[] __initdata = {

 { CLPS7111_VIRT_BASE,	CLPS7111_PHYS_BASE,	1048576, MT_DEVICE }

	{

		.virtual	= CLPS7111_VIRT_BASE,

		.pfn		= __phys_to_pfn(CLPS7111_PHYS_BASE),

		.length		= SZ_1M,

		.type		= MT_DEVICE

	}

};



void __init clps711x_map_io(void)