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

Commit 7a857620 authored by Philipp Zabel's avatar Philipp Zabel Committed by Russell King
Browse files

[ARM] 5120/1: pxa: correct platform driver names for PXA25x and PXA27x UDC drivers 



The pxa2xx_udc.c driver is renamed to pxa25x_udc.c (the platform
driver name changes from pxa2xx-udc to pxa25x-udc) and the
platform driver name of pxa27x_udc.c is fixed to pxa27x-udc.
pxa_device_udc in devices.c is split into pxa25x and pxa27x flavors
and the pxa27x_device_udc is enabled in pxa27x.c.

Signed-off-by: default avatarPhilipp Zabel <philipp.zabel@gmail.com>
Acked-by: default avatarNicolas Pitre <nico@cam.org>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>

Including from Ian Molton:

Fixes for mistakes left over from the PXA2{5,7}X UDC split.

Signed-off-by: default avatarIan Molton <spyro@f2s.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 73d1a2c4

arch/arm/mach-ixp4xx/common.c

+2 −2
Original line number Diff line number Diff line
@@ -326,11 +326,11 @@ static struct resource ixp4xx_udc_resources[] = { 
};



/*

 * USB device controller. The IXP4xx uses the same controller as PXA2XX,

 * USB device controller. The IXP4xx uses the same controller as PXA25X,

 * so we just use the same device.

 */

static struct platform_device ixp4xx_udc_device = {

	.name           = "pxa2xx-udc",

	.name           = "pxa25x-udc",

	.id             = -1,

	.num_resources  = 2,

	.resource       = ixp4xx_udc_resources,

arch/arm/mach-pxa/devices.c

+13 −2
Original line number Diff line number Diff line
@@ -93,8 +93,19 @@ static struct resource pxa2xx_udc_resources[] = { 


static u64 udc_dma_mask = ~(u32)0;



struct platform_device pxa_device_udc = {

	.name		= "pxa2xx-udc",

struct platform_device pxa25x_device_udc = {

	.name		= "pxa25x-udc",

	.id		= -1,

	.resource	= pxa2xx_udc_resources,

	.num_resources	= ARRAY_SIZE(pxa2xx_udc_resources),

	.dev		=  {

		.platform_data	= &pxa_udc_info,

		.dma_mask	= &udc_dma_mask,

	}

};



struct platform_device pxa27x_device_udc = {

	.name		= "pxa27x-udc",

	.id		= -1,

	.resource	= pxa2xx_udc_resources,

	.num_resources	= ARRAY_SIZE(pxa2xx_udc_resources),

arch/arm/mach-pxa/devices.h

+2 −1
Original line number Diff line number Diff line 
extern struct platform_device pxa_device_mci;

extern struct platform_device pxa3xx_device_mci2;

extern struct platform_device pxa3xx_device_mci3;

extern struct platform_device pxa_device_udc;

extern struct platform_device pxa25x_device_udc;

extern struct platform_device pxa27x_device_udc;

extern struct platform_device pxa_device_fb;

extern struct platform_device pxa_device_ffuart;

extern struct platform_device pxa_device_btuart;

arch/arm/mach-pxa/pxa25x.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static struct clk pxa25x_clks[] = { 
	INIT_CKEN("UARTCLK", FFUART, 14745600, 1, &pxa_device_ffuart.dev),

	INIT_CKEN("UARTCLK", BTUART, 14745600, 1, &pxa_device_btuart.dev),

	INIT_CKEN("UARTCLK", STUART, 14745600, 1, NULL),

	INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa_device_udc.dev),

	INIT_CKEN("UDCCLK", USB, 47923000, 5, &pxa25x_device_udc.dev),

	INIT_CKEN("MMCCLK", MMC, 19169000, 0, &pxa_device_mci.dev),

	INIT_CKEN("I2CCLK", I2C, 31949000, 0, &pxa_device_i2c.dev),
@@ -267,7 +267,7 @@ void __init pxa25x_init_irq(void) 
}



static struct platform_device *pxa25x_devices[] __initdata = {

	&pxa_device_udc,

	&pxa25x_device_udc,

	&pxa_device_ffuart,

	&pxa_device_btuart,

	&pxa_device_stuart,

arch/arm/mach-pxa/pxa27x.c

+2 −2
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ static struct clk pxa27x_clks[] = { 


	INIT_CKEN("I2SCLK",  I2S,  14682000, 0, &pxa_device_i2s.dev),

	INIT_CKEN("I2CCLK",  I2C,  32842000, 0, &pxa_device_i2c.dev),

	INIT_CKEN("UDCCLK",  USB,  48000000, 5, &pxa_device_udc.dev),

	INIT_CKEN("UDCCLK",  USB,  48000000, 5, &pxa27x_device_udc.dev),

	INIT_CKEN("MMCCLK",  MMC,  19500000, 0, &pxa_device_mci.dev),

	INIT_CKEN("FICPCLK", FICP, 48000000, 0, &pxa_device_ficp.dev),
@@ -357,7 +357,7 @@ void __init pxa_set_i2c_power_info(struct i2c_pxa_platform_data *info) 
}



static struct platform_device *devices[] __initdata = {

/*	&pxa_device_udc,	The UDC driver is PXA25x only */

	&pxa27x_device_udc,

	&pxa_device_ffuart,

	&pxa_device_btuart,

	&pxa_device_stuart,