diff options
author | Martin Fuzzey <mfuzzey@gmail.com> | 2009-11-21 06:14:54 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-02 17:52:56 -0500 |
commit | 3eb352c73c99602fd379782284ea2de1476c4f9d (patch) | |
tree | 8ab68d63eaaf37f22de4891aa0824c96b47ffaa2 | |
parent | 23d3e7a6598066ed39771cf2030c6bbb581c7812 (diff) |
USB: MXC: use DMA_BIT_MASK macro rather than hardcoded constants.
Also fixes tab/space issue causing checkpatch to complain.
Signed-off-by: Martin Fuzzey <mfuzzey@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/arm/mach-mx2/devices.c | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/arch/arm/mach-mx2/devices.c b/arch/arm/mach-mx2/devices.c index 3d398ce09b31..4acab18bf1f3 100644 --- a/arch/arm/mach-mx2/devices.c +++ b/arch/arm/mach-mx2/devices.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
33 | #include <linux/gpio.h> | 33 | #include <linux/gpio.h> |
34 | #include <linux/dma-mapping.h> | ||
34 | 35 | ||
35 | #include <mach/irqs.h> | 36 | #include <mach/irqs.h> |
36 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
@@ -292,7 +293,7 @@ struct platform_device mxc_fb_device = { | |||
292 | .num_resources = ARRAY_SIZE(mxc_fb), | 293 | .num_resources = ARRAY_SIZE(mxc_fb), |
293 | .resource = mxc_fb, | 294 | .resource = mxc_fb, |
294 | .dev = { | 295 | .dev = { |
295 | .coherent_dma_mask = 0xFFFFFFFF, | 296 | .coherent_dma_mask = DMA_BIT_MASK(32), |
296 | }, | 297 | }, |
297 | }; | 298 | }; |
298 | 299 | ||
@@ -395,17 +396,17 @@ static struct resource mxc_sdhc1_resources[] = { | |||
395 | }, | 396 | }, |
396 | }; | 397 | }; |
397 | 398 | ||
398 | static u64 mxc_sdhc1_dmamask = 0xffffffffUL; | 399 | static u64 mxc_sdhc1_dmamask = DMA_BIT_MASK(32); |
399 | 400 | ||
400 | struct platform_device mxc_sdhc_device0 = { | 401 | struct platform_device mxc_sdhc_device0 = { |
401 | .name = "mxc-mmc", | 402 | .name = "mxc-mmc", |
402 | .id = 0, | 403 | .id = 0, |
403 | .dev = { | 404 | .dev = { |
404 | .dma_mask = &mxc_sdhc1_dmamask, | 405 | .dma_mask = &mxc_sdhc1_dmamask, |
405 | .coherent_dma_mask = 0xffffffff, | 406 | .coherent_dma_mask = DMA_BIT_MASK(32), |
406 | }, | 407 | }, |
407 | .num_resources = ARRAY_SIZE(mxc_sdhc1_resources), | 408 | .num_resources = ARRAY_SIZE(mxc_sdhc1_resources), |
408 | .resource = mxc_sdhc1_resources, | 409 | .resource = mxc_sdhc1_resources, |
409 | }; | 410 | }; |
410 | 411 | ||
411 | static struct resource mxc_sdhc2_resources[] = { | 412 | static struct resource mxc_sdhc2_resources[] = { |
@@ -424,17 +425,17 @@ static struct resource mxc_sdhc2_resources[] = { | |||
424 | }, | 425 | }, |
425 | }; | 426 | }; |
426 | 427 | ||
427 | static u64 mxc_sdhc2_dmamask = 0xffffffffUL; | 428 | static u64 mxc_sdhc2_dmamask = DMA_BIT_MASK(32); |
428 | 429 | ||
429 | struct platform_device mxc_sdhc_device1 = { | 430 | struct platform_device mxc_sdhc_device1 = { |
430 | .name = "mxc-mmc", | 431 | .name = "mxc-mmc", |
431 | .id = 1, | 432 | .id = 1, |
432 | .dev = { | 433 | .dev = { |
433 | .dma_mask = &mxc_sdhc2_dmamask, | 434 | .dma_mask = &mxc_sdhc2_dmamask, |
434 | .coherent_dma_mask = 0xffffffff, | 435 | .coherent_dma_mask = DMA_BIT_MASK(32), |
435 | }, | 436 | }, |
436 | .num_resources = ARRAY_SIZE(mxc_sdhc2_resources), | 437 | .num_resources = ARRAY_SIZE(mxc_sdhc2_resources), |
437 | .resource = mxc_sdhc2_resources, | 438 | .resource = mxc_sdhc2_resources, |
438 | }; | 439 | }; |
439 | 440 | ||
440 | #ifdef CONFIG_MACH_MX27 | 441 | #ifdef CONFIG_MACH_MX27 |
@@ -450,7 +451,7 @@ static struct resource otg_resources[] = { | |||
450 | }, | 451 | }, |
451 | }; | 452 | }; |
452 | 453 | ||
453 | static u64 otg_dmamask = 0xffffffffUL; | 454 | static u64 otg_dmamask = DMA_BIT_MASK(32); |
454 | 455 | ||
455 | /* OTG gadget device */ | 456 | /* OTG gadget device */ |
456 | struct platform_device mxc_otg_udc_device = { | 457 | struct platform_device mxc_otg_udc_device = { |
@@ -458,7 +459,7 @@ struct platform_device mxc_otg_udc_device = { | |||
458 | .id = -1, | 459 | .id = -1, |
459 | .dev = { | 460 | .dev = { |
460 | .dma_mask = &otg_dmamask, | 461 | .dma_mask = &otg_dmamask, |
461 | .coherent_dma_mask = 0xffffffffUL, | 462 | .coherent_dma_mask = DMA_BIT_MASK(32), |
462 | }, | 463 | }, |
463 | .resource = otg_resources, | 464 | .resource = otg_resources, |
464 | .num_resources = ARRAY_SIZE(otg_resources), | 465 | .num_resources = ARRAY_SIZE(otg_resources), |
@@ -469,7 +470,7 @@ struct platform_device mxc_otg_host = { | |||
469 | .name = "mxc-ehci", | 470 | .name = "mxc-ehci", |
470 | .id = 0, | 471 | .id = 0, |
471 | .dev = { | 472 | .dev = { |
472 | .coherent_dma_mask = 0xffffffff, | 473 | .coherent_dma_mask = DMA_BIT_MASK(32), |
473 | .dma_mask = &otg_dmamask, | 474 | .dma_mask = &otg_dmamask, |
474 | }, | 475 | }, |
475 | .resource = otg_resources, | 476 | .resource = otg_resources, |
@@ -478,7 +479,7 @@ struct platform_device mxc_otg_host = { | |||
478 | 479 | ||
479 | /* USB host 1 */ | 480 | /* USB host 1 */ |
480 | 481 | ||
481 | static u64 usbh1_dmamask = 0xffffffffUL; | 482 | static u64 usbh1_dmamask = DMA_BIT_MASK(32); |
482 | 483 | ||
483 | static struct resource mxc_usbh1_resources[] = { | 484 | static struct resource mxc_usbh1_resources[] = { |
484 | { | 485 | { |
@@ -496,7 +497,7 @@ struct platform_device mxc_usbh1 = { | |||
496 | .name = "mxc-ehci", | 497 | .name = "mxc-ehci", |
497 | .id = 1, | 498 | .id = 1, |
498 | .dev = { | 499 | .dev = { |
499 | .coherent_dma_mask = 0xffffffff, | 500 | .coherent_dma_mask = DMA_BIT_MASK(32), |
500 | .dma_mask = &usbh1_dmamask, | 501 | .dma_mask = &usbh1_dmamask, |
501 | }, | 502 | }, |
502 | .resource = mxc_usbh1_resources, | 503 | .resource = mxc_usbh1_resources, |
@@ -504,7 +505,7 @@ struct platform_device mxc_usbh1 = { | |||
504 | }; | 505 | }; |
505 | 506 | ||
506 | /* USB host 2 */ | 507 | /* USB host 2 */ |
507 | static u64 usbh2_dmamask = 0xffffffffUL; | 508 | static u64 usbh2_dmamask = DMA_BIT_MASK(32); |
508 | 509 | ||
509 | static struct resource mxc_usbh2_resources[] = { | 510 | static struct resource mxc_usbh2_resources[] = { |
510 | { | 511 | { |
@@ -522,7 +523,7 @@ struct platform_device mxc_usbh2 = { | |||
522 | .name = "mxc-ehci", | 523 | .name = "mxc-ehci", |
523 | .id = 2, | 524 | .id = 2, |
524 | .dev = { | 525 | .dev = { |
525 | .coherent_dma_mask = 0xffffffff, | 526 | .coherent_dma_mask = DMA_BIT_MASK(32), |
526 | .dma_mask = &usbh2_dmamask, | 527 | .dma_mask = &usbh2_dmamask, |
527 | }, | 528 | }, |
528 | .resource = mxc_usbh2_resources, | 529 | .resource = mxc_usbh2_resources, |