aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
diff options
context:
space:
mode:
authoreric miao <eric.miao@marvell.com>2007-12-11 20:29:33 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 10:07:54 -0500
commitec68e45b75adab3a78dea4ecf0e645127deee8ae (patch)
treeff9990df6c524265b018b9aa86919b690f22f9d1 /arch/arm/mach-pxa
parente77ec1898f9693a3572bdd03eb5d2256166d5464 (diff)
[ARM] pxa: move pxa27x_device_ohci out of pxa27x.c for use with pxa3xx
Signed-off-by: eric miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r--arch/arm/mach-pxa/devices.c31
-rw-r--r--arch/arm/mach-pxa/pxa27x.c31
2 files changed, 31 insertions, 31 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c
index 061ec92eb1e2..50ff453ad370 100644
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -395,6 +395,37 @@ struct platform_device pxa25x_device_assp = {
395 395
396#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx) 396#if defined(CONFIG_PXA27x) || defined(CONFIG_PXA3xx)
397 397
398static u64 pxa27x_ohci_dma_mask = DMA_BIT_MASK(32);
399
400static struct resource pxa27x_resource_ohci[] = {
401 [0] = {
402 .start = 0x4C000000,
403 .end = 0x4C00ff6f,
404 .flags = IORESOURCE_MEM,
405 },
406 [1] = {
407 .start = IRQ_USBH1,
408 .end = IRQ_USBH1,
409 .flags = IORESOURCE_IRQ,
410 },
411};
412
413struct platform_device pxa27x_device_ohci = {
414 .name = "pxa27x-ohci",
415 .id = -1,
416 .dev = {
417 .dma_mask = &pxa27x_ohci_dma_mask,
418 .coherent_dma_mask = DMA_BIT_MASK(32),
419 },
420 .num_resources = ARRAY_SIZE(pxa27x_resource_ohci),
421 .resource = pxa27x_resource_ohci,
422};
423
424void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)
425{
426 pxa_register_device(&pxa27x_device_ohci, info);
427}
428
398static u64 pxa27x_ssp1_dma_mask = DMA_BIT_MASK(32); 429static u64 pxa27x_ssp1_dma_mask = DMA_BIT_MASK(32);
399 430
400static struct resource pxa27x_resource_ssp1[] = { 431static struct resource pxa27x_resource_ssp1[] = {
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index 12dd2b0629bf..ec7597b1cb54 100644
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -374,37 +374,6 @@ void __init pxa27x_init_irq(void)
374 * device registration specific to PXA27x. 374 * device registration specific to PXA27x.
375 */ 375 */
376 376
377static u64 pxa27x_dmamask = 0xffffffffUL;
378
379static struct resource pxa27x_ohci_resources[] = {
380 [0] = {
381 .start = 0x4C000000,
382 .end = 0x4C00ff6f,
383 .flags = IORESOURCE_MEM,
384 },
385 [1] = {
386 .start = IRQ_USBH1,
387 .end = IRQ_USBH1,
388 .flags = IORESOURCE_IRQ,
389 },
390};
391
392struct platform_device pxa27x_device_ohci = {
393 .name = "pxa27x-ohci",
394 .id = -1,
395 .dev = {
396 .dma_mask = &pxa27x_dmamask,
397 .coherent_dma_mask = 0xffffffff,
398 },
399 .num_resources = ARRAY_SIZE(pxa27x_ohci_resources),
400 .resource = pxa27x_ohci_resources,
401};
402
403void __init pxa_set_ohci_info(struct pxaohci_platform_data *info)
404{
405 pxa_register_device(&pxa27x_device_ohci, info);
406}
407
408static struct resource i2c_power_resources[] = { 377static struct resource i2c_power_resources[] = {
409 { 378 {
410 .start = 0x40f00180, 379 .start = 0x40f00180,