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

Commit d9e8b884 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Sascha Hauer
Browse files

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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarValentin Longchamp <valentin.longchamp@epfl.ch>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent 324c1aa3

arch/arm/mach-mx3/devices.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -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

arch/arm/mach-mx3/devices.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -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;