diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-10-05 10:49:12 -0400 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-13 04:24:09 -0400 |
commit | d9e8b88478be7c8cd3fab91213c05e6194de294e (patch) | |
tree | 9c41fbc33e97eb67d04bff0e5651f8c92d92fe57 /arch/arm/mach-mx3/devices.c | |
parent | 324c1aa3dfb4235c80df603e761cc06e28a7e903 (diff) |
fix pcm037_eet compilation with the new SPI driver
Fix pcm037_eet compilation with the new imx SPI driver by unifying
platform device names.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Valentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/devices.c')
-rw-r--r-- | arch/arm/mach-mx3/devices.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 8a577f367250..e6abe181b967 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c | |||
@@ -459,7 +459,7 @@ struct platform_device mxc_usbh2 = { | |||
459 | * SPI master controller | 459 | * SPI master controller |
460 | * 3 channels | 460 | * 3 channels |
461 | */ | 461 | */ |
462 | static struct resource imx_spi_0_resources[] = { | 462 | static struct resource mxc_spi_0_resources[] = { |
463 | { | 463 | { |
464 | .start = CSPI1_BASE_ADDR, | 464 | .start = CSPI1_BASE_ADDR, |
465 | .end = CSPI1_BASE_ADDR + SZ_4K - 1, | 465 | .end = CSPI1_BASE_ADDR + SZ_4K - 1, |
@@ -471,7 +471,7 @@ static struct resource imx_spi_0_resources[] = { | |||
471 | }, | 471 | }, |
472 | }; | 472 | }; |
473 | 473 | ||
474 | static struct resource imx_spi_1_resources[] = { | 474 | static struct resource mxc_spi_1_resources[] = { |
475 | { | 475 | { |
476 | .start = CSPI2_BASE_ADDR, | 476 | .start = CSPI2_BASE_ADDR, |
477 | .end = CSPI2_BASE_ADDR + SZ_4K - 1, | 477 | .end = CSPI2_BASE_ADDR + SZ_4K - 1, |
@@ -483,7 +483,7 @@ static struct resource imx_spi_1_resources[] = { | |||
483 | }, | 483 | }, |
484 | }; | 484 | }; |
485 | 485 | ||
486 | static struct resource imx_spi_2_resources[] = { | 486 | static struct resource mxc_spi_2_resources[] = { |
487 | { | 487 | { |
488 | .start = CSPI3_BASE_ADDR, | 488 | .start = CSPI3_BASE_ADDR, |
489 | .end = CSPI3_BASE_ADDR + SZ_4K - 1, | 489 | .end = CSPI3_BASE_ADDR + SZ_4K - 1, |
@@ -495,25 +495,25 @@ static struct resource imx_spi_2_resources[] = { | |||
495 | }, | 495 | }, |
496 | }; | 496 | }; |
497 | 497 | ||
498 | struct platform_device imx_spi_device0 = { | 498 | struct platform_device mxc_spi_device0 = { |
499 | .name = "spi_imx", | 499 | .name = "spi_imx", |
500 | .id = 0, | 500 | .id = 0, |
501 | .num_resources = ARRAY_SIZE(imx_spi_0_resources), | 501 | .num_resources = ARRAY_SIZE(mxc_spi_0_resources), |
502 | .resource = imx_spi_0_resources, | 502 | .resource = mxc_spi_0_resources, |
503 | }; | 503 | }; |
504 | 504 | ||
505 | struct platform_device imx_spi_device1 = { | 505 | struct platform_device mxc_spi_device1 = { |
506 | .name = "spi_imx", | 506 | .name = "spi_imx", |
507 | .id = 1, | 507 | .id = 1, |
508 | .num_resources = ARRAY_SIZE(imx_spi_1_resources), | 508 | .num_resources = ARRAY_SIZE(mxc_spi_1_resources), |
509 | .resource = imx_spi_1_resources, | 509 | .resource = mxc_spi_1_resources, |
510 | }; | 510 | }; |
511 | 511 | ||
512 | struct platform_device imx_spi_device2 = { | 512 | struct platform_device mxc_spi_device2 = { |
513 | .name = "spi_imx", | 513 | .name = "spi_imx", |
514 | .id = 2, | 514 | .id = 2, |
515 | .num_resources = ARRAY_SIZE(imx_spi_2_resources), | 515 | .num_resources = ARRAY_SIZE(mxc_spi_2_resources), |
516 | .resource = imx_spi_2_resources, | 516 | .resource = mxc_spi_2_resources, |
517 | }; | 517 | }; |
518 | 518 | ||
519 | #ifdef CONFIG_ARCH_MX35 | 519 | #ifdef CONFIG_ARCH_MX35 |