evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix pcm037_eet compilation with the new SPI driver

Browse source 
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>
This commit is contained in:
Guennadi Liakhovetski 2009-10-05 16:49:12 +02:00 • committed by Sascha Hauer
parent 324c1aa3df
commit d9e8b88478
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
arch/arm/mach-mx3/devices.c
View file

@ -459,7 +459,7 @@ struct platform_device mxc_usbh2 = {
* SPI master controller * SPI master controller
* 3 channels * 3 channels
*/ */
static struct resource imx_spi_0_resources[] = { static struct resource mxc_spi_0_resources[] = {
{ {
.start = CSPI1_BASE_ADDR, .start = CSPI1_BASE_ADDR,
.end = CSPI1_BASE_ADDR + SZ_4K - 1, .end = CSPI1_BASE_ADDR + SZ_4K - 1,
@ -471,7 +471,7 @@ static struct resource imx_spi_0_resources[] = {
}, },
}; };
static struct resource imx_spi_1_resources[] = { static struct resource mxc_spi_1_resources[] = {
{ {
.start = CSPI2_BASE_ADDR, .start = CSPI2_BASE_ADDR,
.end = CSPI2_BASE_ADDR + SZ_4K - 1, .end = CSPI2_BASE_ADDR + SZ_4K - 1,
@ -483,7 +483,7 @@ static struct resource imx_spi_1_resources[] = {
}, },
}; };
static struct resource imx_spi_2_resources[] = { static struct resource mxc_spi_2_resources[] = {
{ {
.start = CSPI3_BASE_ADDR, .start = CSPI3_BASE_ADDR,
.end = CSPI3_BASE_ADDR + SZ_4K - 1, .end = CSPI3_BASE_ADDR + SZ_4K - 1,
@ -495,25 +495,25 @@ static struct resource imx_spi_2_resources[] = {
}, },
}; };
struct platform_device imx_spi_device0 = { struct platform_device mxc_spi_device0 = {
.name = "spi_imx", .name = "spi_imx",
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(imx_spi_0_resources), .num_resources = ARRAY_SIZE(mxc_spi_0_resources),
.resource = imx_spi_0_resources, .resource = mxc_spi_0_resources,
}; };
struct platform_device imx_spi_device1 = { struct platform_device mxc_spi_device1 = {
.name = "spi_imx", .name = "spi_imx",
.id = 1, .id = 1,
.num_resources = ARRAY_SIZE(imx_spi_1_resources), .num_resources = ARRAY_SIZE(mxc_spi_1_resources),
.resource = imx_spi_1_resources, .resource = mxc_spi_1_resources,
}; };
struct platform_device imx_spi_device2 = { struct platform_device mxc_spi_device2 = {
.name = "spi_imx", .name = "spi_imx",
.id = 2, .id = 2,
.num_resources = ARRAY_SIZE(imx_spi_2_resources), .num_resources = ARRAY_SIZE(mxc_spi_2_resources),
.resource = imx_spi_2_resources, .resource = mxc_spi_2_resources,
}; };
#ifdef CONFIG_ARCH_MX35 #ifdef CONFIG_ARCH_MX35

6
arch/arm/mach-mx3/devices.h
View file

@ -20,7 +20,7 @@ extern struct platform_device mxc_otg_host;
extern struct platform_device mxc_usbh1; extern struct platform_device mxc_usbh1;
extern struct platform_device mxc_usbh2; extern struct platform_device mxc_usbh2;
extern struct platform_device mxc_rnga_device; extern struct platform_device mxc_rnga_device;
extern struct platform_device imx_spi_device0; extern struct platform_device mxc_spi_device0;
extern struct platform_device imx_spi_device1; extern struct platform_device mxc_spi_device1;
extern struct platform_device imx_spi_device2; extern struct platform_device mxc_spi_device2;