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

Commit ec68e45b authored by eric miao's avatar eric miao Committed by Russell King
Browse files

[ARM] pxa: move pxa27x_device_ohci out of pxa27x.c for use with pxa3xx 



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

arch/arm/mach-pxa/devices.c

+31 −0
Original line number Diff line number Diff line
@@ -395,6 +395,37 @@ struct platform_device pxa25x_device_assp = { 


#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)



static u64 pxa27x_ohci_dma_mask = DMA_BIT_MASK(32);



static struct resource pxa27x_resource_ohci[] = {

	[0] = {

		.start  = 0x4C000000,

		.end    = 0x4C00ff6f,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = IRQ_USBH1,

		.end    = IRQ_USBH1,

		.flags  = IORESOURCE_IRQ,

	},

};



struct platform_device pxa27x_device_ohci = {

	.name		= "pxa27x-ohci",

	.id		= -1,

	.dev		= {

		.dma_mask = &pxa27x_ohci_dma_mask,

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.num_resources  = ARRAY_SIZE(pxa27x_resource_ohci),

	.resource       = pxa27x_resource_ohci,

};



void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)

{

	pxa_register_device(&pxa27x_device_ohci, info);

}



static u64 pxa27x_ssp1_dma_mask = DMA_BIT_MASK(32);



static struct resource pxa27x_resource_ssp1[] = {

arch/arm/mach-pxa/pxa27x.c

+0 −31
Original line number Diff line number Diff line
@@ -374,37 +374,6 @@ void __init pxa27x_init_irq(void) 
 * device registration specific to PXA27x.

 */



static u64 pxa27x_dmamask = 0xffffffffUL;



static struct resource pxa27x_ohci_resources[] = {

	[0] = {

		.start  = 0x4C000000,

		.end    = 0x4C00ff6f,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

		.start  = IRQ_USBH1,

		.end    = IRQ_USBH1,

		.flags  = IORESOURCE_IRQ,

	},

};



struct platform_device pxa27x_device_ohci = {

	.name		= "pxa27x-ohci",

	.id		= -1,

	.dev		= {

		.dma_mask = &pxa27x_dmamask,

		.coherent_dma_mask = 0xffffffff,

	},

	.num_resources  = ARRAY_SIZE(pxa27x_ohci_resources),

	.resource       = pxa27x_ohci_resources,

};



void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)

{

	pxa_register_device(&pxa27x_device_ohci, info);

}



static struct resource i2c_power_resources[] = {

	{

		.start	= 0x40f00180,