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

Commit e09d02e1 authored Jul 17, 2007 by Eric Miao Committed by Russell King Jul 20, 2007

[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: eric miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 9a79b227

arch/arm/mach-pxa/devices.h

+11 −11

Original line number	Original line	Diff line number	Diff line
	extern struct platform_device pxamci_device;		extern struct platform_device pxa_device_mci;
	extern struct platform_device pxaudc_device;		extern struct platform_device pxa_device_udc;
	extern struct platform_device pxafb_device;		extern struct platform_device pxa_device_fb;
	extern struct platform_device ffuart_device;		extern struct platform_device pxa_device_ffuart;
	extern struct platform_device btuart_device;		extern struct platform_device pxa_device_btuart;
	extern struct platform_device stuart_device;		extern struct platform_device pxa_device_stuart;
	extern struct platform_device hwuart_device;		extern struct platform_device pxa_device_hwuart;
	extern struct platform_device pxai2c_device;		extern struct platform_device pxa_device_i2c;
	extern struct platform_device pxai2s_device;		extern struct platform_device pxa_device_i2s;
	extern struct platform_device pxaficp_device;		extern struct platform_device pxa_device_ficp;
	extern struct platform_device pxartc_device;		extern struct platform_device pxa_device_rtc;

arch/arm/mach-pxa/generic.c

+16 −16

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

	static u64 pxamci_dmamask = 0xffffffffUL;		static u64 pxamci_dmamask = 0xffffffffUL;

	struct platform_device pxamci_device = {		struct platform_device pxa_device_mci = {
	.name = "pxa2xx-mci",		.name = "pxa2xx-mci",
	.id = -1,		.id = -1,
	.dev = {		.dev = {
	@@ -256,7 +256,7 @@ struct platform_device pxamci_device = {

	void __init pxa_set_mci_info(struct pxamci_platform_data *info)		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;		static u64 udc_dma_mask = ~(u32)0;

	struct platform_device pxaudc_device = {		struct platform_device pxa_device_udc = {
	.name = "pxa2xx-udc",		.name = "pxa2xx-udc",
	.id = -1,		.id = -1,
	.resource = pxa2xx_udc_resources,		.resource = pxa2xx_udc_resources,
	@@ -308,7 +308,7 @@ static struct resource pxafb_resources[] = {

	static u64 fb_dma_mask = ~(u64)0;		static u64 fb_dma_mask = ~(u64)0;

	struct platform_device pxafb_device = {		struct platform_device pxa_device_fb = {
	.name = "pxa2xx-fb",		.name = "pxa2xx-fb",
	.id = -1,		.id = -1,
	.dev = {		.dev = {
	@@ -321,27 +321,27 @@ struct platform_device pxafb_device = {

	void __init set_pxa_fb_info(struct pxafb_mach_info *info)		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)		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",		.name = "pxa2xx-uart",
	.id = 0,		.id = 0,
	};		};
	struct platform_device btuart_device = {		struct platform_device pxa_device_btuart = {
	.name = "pxa2xx-uart",		.name = "pxa2xx-uart",
	.id = 1,		.id = 1,
	};		};
	struct platform_device stuart_device = {		struct platform_device pxa_device_stuart = {
	.name = "pxa2xx-uart",		.name = "pxa2xx-uart",
	.id = 2,		.id = 2,
	};		};
	struct platform_device hwuart_device = {		struct platform_device pxa_device_hwuart = {
	.name = "pxa2xx-uart",		.name = "pxa2xx-uart",
	.id = 3,		.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",		.name = "pxa2xx-i2c",
	.id = 0,		.id = 0,
	.resource = pxai2c_resources,		.resource = pxai2c_resources,
	@@ -367,7 +367,7 @@ struct platform_device pxai2c_device = {

	void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)		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[] = {		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",		.name = "pxa2xx-i2s",
	.id = -1,		.id = -1,
	.resource = pxai2s_resources,		.resource = pxai2s_resources,
	@@ -391,7 +391,7 @@ struct platform_device pxai2s_device = {

	static u64 pxaficp_dmamask = ~(u32)0;		static u64 pxaficp_dmamask = ~(u32)0;

	struct platform_device pxaficp_device = {		struct platform_device pxa_device_ficp = {
	.name = "pxa2xx-ir",		.name = "pxa2xx-ir",
	.id = -1,		.id = -1,
	.dev = {		.dev = {
	@@ -402,10 +402,10 @@ struct platform_device pxaficp_device = {

	void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)		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",		.name = "sa1100-rtc",
	.id = -1,		.id = -1,
	};		};

arch/arm/mach-pxa/pxa25x.c

+11 −11

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

	static struct platform_device *pxa25x_devices[] __initdata = {		static struct platform_device *pxa25x_devices[] __initdata = {
	&pxamci_device,		&pxa_device_mci,
	&pxaudc_device,		&pxa_device_udc,
	&pxafb_device,		&pxa_device_fb,
	&ffuart_device,		&pxa_device_ffuart,
	&btuart_device,		&pxa_device_btuart,
	&stuart_device,		&pxa_device_stuart,
	&pxai2c_device,		&pxa_device_i2c,
	&pxai2s_device,		&pxa_device_i2s,
	&pxaficp_device,		&pxa_device_ficp,
	&pxartc_device,		&pxa_device_rtc,
	};		};

	static int __init pxa25x_init(void)		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. */		/* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */
	if (cpu_is_pxa25x())		if (cpu_is_pxa25x())
	ret = platform_device_register(&hwuart_device);		ret = platform_device_register(&pxa_device_hwuart);

	return ret;		return ret;
	}		}

arch/arm/mach-pxa/pxa27x.c

+15 −15

Original line number	Original line	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",		.name = "pxa27x-ohci",
	.id = -1,		.id = -1,
	.dev = {		.dev = {
	@@ -198,7 +198,7 @@ static struct platform_device pxaohci_device = {

	void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)		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[] = {		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",		.name = "pxa2xx-i2c",
	.id = 1,		.id = 1,
	.resource = i2c_power_resources,		.resource = i2c_power_resources,
	@@ -221,18 +221,18 @@ static struct platform_device pxai2c_power_device = {
	};		};

	static struct platform_device *devices[] __initdata = {		static struct platform_device *devices[] __initdata = {
	&pxamci_device,		&pxa_device_mci,
	&pxaudc_device,		&pxa_device_udc,
	&pxafb_device,		&pxa_device_fb,
	&ffuart_device,		&pxa_device_ffuart,
	&btuart_device,		&pxa_device_btuart,
	&stuart_device,		&pxa_device_stuart,
	&pxai2c_device,		&pxa_device_i2c,
	&pxai2c_power_device,		&pxa_device_i2s,
	&pxai2s_device,		&pxa_device_ficp,
	&pxaficp_device,		&pxa_device_rtc,
	&pxartc_device,		&pxa27x_device_i2c_power,
	&pxaohci_device,		&pxa27x_device_ohci,
	};		};

	void __init pxa27x_init_irq(void)		void __init pxa27x_init_irq(void)