Commit e09d02e1 authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[ARM] 4480/1: pxa: change the pxa device naming scheme 



1. for common devices across all the pxa variants, the names
   are changed to be:
     "pxa_device_xxx"

2. for pxa25x or pxa27x specific devices, the names are
   changed to be:
     "pxa25x_device_xxx", or
     "pxa27x_device_xxx"

Signed-off-by: default avatareric miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9a79b227

arch/arm/mach-pxa/devices.h

+11 −11
Original line number Diff line number Diff line 
extern struct platform_device pxamci_device;

extern struct platform_device pxaudc_device;

extern struct platform_device pxafb_device;

extern struct platform_device ffuart_device;

extern struct platform_device btuart_device;

extern struct platform_device stuart_device;

extern struct platform_device hwuart_device;

extern struct platform_device pxai2c_device;

extern struct platform_device pxai2s_device;

extern struct platform_device pxaficp_device;

extern struct platform_device pxartc_device;
 
extern struct platform_device pxa_device_mci;

extern struct platform_device pxa_device_udc;

extern struct platform_device pxa_device_fb;

extern struct platform_device pxa_device_ffuart;

extern struct platform_device pxa_device_btuart;

extern struct platform_device pxa_device_stuart;

extern struct platform_device pxa_device_hwuart;

extern struct platform_device pxa_device_i2c;

extern struct platform_device pxa_device_i2s;

extern struct platform_device pxa_device_ficp;

extern struct platform_device pxa_device_rtc;

arch/arm/mach-pxa/generic.c

+16 −16
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static struct resource pxamci_resources[] = { 


static u64 pxamci_dmamask = 0xffffffffUL;



struct platform_device pxamci_device = {

struct platform_device pxa_device_mci = {

	.name		= "pxa2xx-mci",

	.id		= -1,

	.dev		= {
@@ -256,7 +256,7 @@ struct platform_device pxamci_device = { 


void __init pxa_set_mci_info(struct pxamci_platform_data *info)

{

	pxamci_device.dev.platform_data = info;

	pxa_device_mci.dev.platform_data = info;

}
@@ -282,7 +282,7 @@ static struct resource pxa2xx_udc_resources[] = { 


static u64 udc_dma_mask = ~(u32)0;



struct platform_device pxaudc_device = {

struct platform_device pxa_device_udc = {

	.name		= "pxa2xx-udc",

	.id		= -1,

	.resource	= pxa2xx_udc_resources,
@@ -308,7 +308,7 @@ static struct resource pxafb_resources[] = { 


static u64 fb_dma_mask = ~(u64)0;



struct platform_device pxafb_device = {

struct platform_device pxa_device_fb = {

	.name		= "pxa2xx-fb",

	.id		= -1,

	.dev		= {
@@ -321,27 +321,27 @@ struct platform_device pxafb_device = { 


void __init set_pxa_fb_info(struct pxafb_mach_info *info)

{

	pxafb_device.dev.platform_data = info;

	pxa_device_fb.dev.platform_data = info;

}



void __init set_pxa_fb_parent(struct device *parent_dev)

{

	pxafb_device.dev.parent = parent_dev;

	pxa_device_fb.dev.parent = parent_dev;

}



struct platform_device ffuart_device = {

struct platform_device pxa_device_ffuart= {

	.name		= "pxa2xx-uart",

	.id		= 0,

};

struct platform_device btuart_device = {

struct platform_device pxa_device_btuart = {

	.name		= "pxa2xx-uart",

	.id		= 1,

};

struct platform_device stuart_device = {

struct platform_device pxa_device_stuart = {

	.name		= "pxa2xx-uart",

	.id		= 2,

};

struct platform_device hwuart_device = {

struct platform_device pxa_device_hwuart = {

	.name		= "pxa2xx-uart",

	.id		= 3,

};
@@ -358,7 +358,7 @@ static struct resource pxai2c_resources[] = { 
	},

};



struct platform_device pxai2c_device = {

struct platform_device pxa_device_i2c = {

	.name		= "pxa2xx-i2c",

	.id		= 0,

	.resource	= pxai2c_resources,
@@ -367,7 +367,7 @@ struct platform_device pxai2c_device = { 


void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)

{

	pxai2c_device.dev.platform_data = info;

	pxa_device_i2c.dev.platform_data = info;

}



static struct resource pxai2s_resources[] = {
@@ -382,7 +382,7 @@ static struct resource pxai2s_resources[] = { 
	},

};



struct platform_device pxai2s_device = {

struct platform_device pxa_device_i2s = {

	.name		= "pxa2xx-i2s",

	.id		= -1,

	.resource	= pxai2s_resources,
@@ -391,7 +391,7 @@ struct platform_device pxai2s_device = { 


static u64 pxaficp_dmamask = ~(u32)0;



struct platform_device pxaficp_device = {

struct platform_device pxa_device_ficp = {

	.name		= "pxa2xx-ir",

	.id		= -1,

	.dev		= {
@@ -402,10 +402,10 @@ struct platform_device pxaficp_device = { 


void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)

{

	pxaficp_device.dev.platform_data = info;

	pxa_device_ficp.dev.platform_data = info;

}



struct platform_device pxartc_device = {

struct platform_device pxa_device_rtc = {

	.name		= "sa1100-rtc",

	.id		= -1,

};

arch/arm/mach-pxa/pxa25x.c

+11 −11
Original line number Diff line number Diff line
@@ -139,16 +139,16 @@ void __init pxa25x_init_irq(void) 
}



static struct platform_device *pxa25x_devices[] __initdata = {

	&pxamci_device,

	&pxaudc_device,

	&pxafb_device,

	&ffuart_device,

	&btuart_device,

	&stuart_device,

	&pxai2c_device,

	&pxai2s_device,

	&pxaficp_device,

	&pxartc_device,

	&pxa_device_mci,

	&pxa_device_udc,

	&pxa_device_fb,

	&pxa_device_ffuart,

	&pxa_device_btuart,

	&pxa_device_stuart,

	&pxa_device_i2c,

	&pxa_device_i2s,

	&pxa_device_ficp,

	&pxa_device_rtc,

};



static int __init pxa25x_init(void)
@@ -166,7 +166,7 @@ static int __init pxa25x_init(void) 
	}

	/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */

	if (cpu_is_pxa25x())

		ret = platform_device_register(&hwuart_device);

		ret = platform_device_register(&pxa_device_hwuart);



	return ret;

}

arch/arm/mach-pxa/pxa27x.c

+15 −15
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static struct resource pxa27x_ohci_resources[] = { 
	},

};



static struct platform_device pxaohci_device = {

static struct platform_device pxa27x_device_ohci = {

	.name		= "pxa27x-ohci",

	.id		= -1,

	.dev		= {
@@ -198,7 +198,7 @@ static struct platform_device pxaohci_device = { 


void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)

{

	pxaohci_device.dev.platform_data = info;

	pxa27x_device_ohci.dev.platform_data = info;

}



static struct resource i2c_power_resources[] = {
@@ -213,7 +213,7 @@ static struct resource i2c_power_resources[] = { 
	},

};



static struct platform_device pxai2c_power_device = {

static struct platform_device pxa27x_device_i2c_power = {

	.name		= "pxa2xx-i2c",

	.id		= 1,

	.resource	= i2c_power_resources,
@@ -221,18 +221,18 @@ static struct platform_device pxai2c_power_device = { 
};



static struct platform_device *devices[] __initdata = {

	&pxamci_device,

	&pxaudc_device,

	&pxafb_device,

	&ffuart_device,

	&btuart_device,

	&stuart_device,

	&pxai2c_device,

	&pxai2c_power_device,

	&pxai2s_device,

	&pxaficp_device,

	&pxartc_device,

	&pxaohci_device,

	&pxa_device_mci,

	&pxa_device_udc,

	&pxa_device_fb,

	&pxa_device_ffuart,

	&pxa_device_btuart,

	&pxa_device_stuart,

	&pxa_device_i2c,

	&pxa_device_i2s,

	&pxa_device_ficp,

	&pxa_device_rtc,

	&pxa27x_device_i2c_power,

	&pxa27x_device_ohci,

};



void __init pxa27x_init_irq(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE