Skip to contentSkip to conversation

fix pcm037_eet compilation with the new SPI driver

PATCH Superseded Guennadi Liakhovetski 3 participants 6 messages Oct 5, 2009 – Oct 6, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix pcm037_eet compilation with the new SPI driver

At some point the SPI device name in arch/arm/mach-mx3/devices.c has changed, which then broke compilation of pcm037_eet with the new SPI driver. Use the correct name.

---

arch/arm/mach-mx3/pcm037_eet.c +1 -1
index 8d38600..dc6baf3 100644
@@ -184,7 +184,7 @@ static int eet_init_devices(void)
 	/* SPI */
 	spi_register_board_info(pcm037_spi_dev, ARRAY_SIZE(pcm037_spi_dev));
 #if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
-	mxc_register_device(&mxc_spi_device0, &pcm037_spi1_master);
+	mxc_register_device(&imx_spi_device0, &pcm037_spi1_master);
 #endif
 
 	platform_device_register(&pcm037_gpio_keys_device);
#1 lore raw

PATCH 1/1 fix pcm037_eet compilation with the new SPI driver

Hi Guennadi,

Quoted 3 lines · Guennadi Liakhovetski

At some point the SPI device name in arch/arm/mach-mx3/devices.c has changed, which then broke compilation of pcm037_eet with the new SPI driver. Use the correct name.

It didn't change, it was merged with imx_spi_device0. Can we change the name in devices.[ch] instead? All other devices start with mxc_. Sorry, my bad.

Sascha

Quoted 17 lines

---

arch/arm/mach-mx3/pcm037_eet.c +1 -1
index 8d38600..dc6baf3 100644
@@ -184,7 +184,7 @@ static int eet_init_devices(void)
 	/* SPI */
 	spi_register_board_info(pcm037_spi_dev, ARRAY_SIZE(pcm037_spi_dev));
 #if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
-	mxc_register_device(&mxc_spi_device0, &pcm037_spi1_master);
+	mxc_register_device(&imx_spi_device0, &pcm037_spi1_master);
 #endif
 
 	platform_device_register(&pcm037_gpio_keys_device);
Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
#2 lore raw

PATCH 1/1 fix pcm037_eet compilation with the new SPI driver

Hi Sascha,

Quoted 9 lines · Sascha Hauer
Quoted 3 lines · Guennadi Liakhovetski

At some point the SPI device name in arch/arm/mach-mx3/devices.c has changed, which then broke compilation of pcm037_eet with the new SPI driver. Use the correct name.

It didn't change, it was merged with imx_spi_device0. Can we change the name in devices.[ch] instead? All other devices start with mxc_. Sorry, my bad.

I don't really where it is changed ... mxc seems better so devices.[ch] is more logical.

But I have sent the exact same patch on Friday and received no comment ... I hope mine or Guennadi's (I don't really care) can get its way to -rc4.

Val

Quoted 21 lines

Sascha

Quoted 16 lines

---

arch/arm/mach-mx3/pcm037_eet.c +1 -1
index 8d38600..dc6baf3 100644
@@ -184,7 +184,7 @@ static int eet_init_devices(void)
 	/* SPI */
 	spi_register_board_info(pcm037_spi_dev, ARRAY_SIZE(pcm037_spi_dev));
 #if defined(CONFIG_SPI_IMX) || defined(CONFIG_SPI_IMX_MODULE)
-	mxc_register_device(&mxc_spi_device0, &pcm037_spi1_master);
+	mxc_register_device(&imx_spi_device0, &pcm037_spi1_master);
 #endif
 
 	platform_device_register(&pcm037_gpio_keys_device);
#3 lore raw

PATCH v2 1/1 fix pcm037_eet compilation with the new SPI driver

Fix pcm037_eet compilation with the new imx SPI driver by unifying platform device names.

---

Quoted 13 lines · Valentin Longchamp

Hi Sascha,

Quoted 9 lines · Sascha Hauer
Quoted 3 lines · Guennadi Liakhovetski

At some point the SPI device name in arch/arm/mach-mx3/devices.c has changed, which then broke compilation of pcm037_eet with the new SPI driver. Use the correct name.

It didn't change, it was merged with imx_spi_device0. Can we change the name in devices.[ch] instead? All other devices start with mxc_. Sorry, my bad.

Quoted 5 lines

I don't really where it is changed ... mxc seems better so devices.[ch] is more logical.

But I have sent the exact same patch on Friday and received no comment ... I hope mine or Guennadi's (I don't really care) can get its way to -rc4.

Sorry, I missed it. Here's a version with changed devices.[hc].

arch/arm/mach-mx3/devices.c +12 -12
index 8a577f3..e6abe18 100644
@@ -459,7 +459,7 @@ struct platform_device mxc_usbh2 = {
  * SPI master controller
  * 3 channels
  */
-static struct resource imx_spi_0_resources[] = {
+static struct resource mxc_spi_0_resources[] = {
 	{
 	       .start = CSPI1_BASE_ADDR,
 	       .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,
 		.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,
 		.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",
 	.id = 0,
-	.num_resources = ARRAY_SIZE(imx_spi_0_resources),
-	.resource = imx_spi_0_resources,
+	.num_resources = ARRAY_SIZE(mxc_spi_0_resources),
+	.resource = mxc_spi_0_resources,
 };
 
-struct platform_device imx_spi_device1 = {
+struct platform_device mxc_spi_device1 = {
 	.name = "spi_imx",
 	.id = 1,
-	.num_resources = ARRAY_SIZE(imx_spi_1_resources),
-	.resource = imx_spi_1_resources,
+	.num_resources = ARRAY_SIZE(mxc_spi_1_resources),
+	.resource = mxc_spi_1_resources,
 };
 
-struct platform_device imx_spi_device2 = {
+struct platform_device mxc_spi_device2 = {
 	.name = "spi_imx",
 	.id = 2,
-	.num_resources = ARRAY_SIZE(imx_spi_2_resources),
-	.resource = imx_spi_2_resources,
+	.num_resources = ARRAY_SIZE(mxc_spi_2_resources),
+	.resource = mxc_spi_2_resources,
 };
 
 #ifdef CONFIG_ARCH_MX35
arch/arm/mach-mx3/devices.h +3 -3
index 79f2be4..ab87419 100644
@@ -20,7 +20,7 @@ extern struct platform_device mxc_otg_host;
 extern struct platform_device mxc_usbh1;
 extern struct platform_device mxc_usbh2;
 extern struct platform_device mxc_rnga_device;
-extern struct platform_device imx_spi_device0;
-extern struct platform_device imx_spi_device1;
-extern struct platform_device imx_spi_device2;
+extern struct platform_device mxc_spi_device0;
+extern struct platform_device mxc_spi_device1;
+extern struct platform_device mxc_spi_device2;
 
#4 lore raw

PATCH v2 1/1 fix pcm037_eet compilation with the new SPI driver

Hi Guennadi and Sacha,

Quoted 2 lines · Guennadi Liakhovetski

Fix pcm037_eet compilation with the new imx SPI driver by unifying platform device names.

This looks fine to me and I have tested it with success.

Quoted 2 lines
Quoted 13 lines

---

Quoted 10 lines · Valentin Longchamp

Hi Sascha,

Quoted 7 lines · Sascha Hauer
Quoted 3 lines · Guennadi Liakhovetski

At some point the SPI device name in arch/arm/mach-mx3/devices.c has changed, which then broke compilation of pcm037_eet with the new SPI driver. Use the correct name.

It didn't change, it was merged with imx_spi_device0. Can we change the name in devices.[ch] instead? All other devices start with mxc_. Sorry, my bad.

Quoted 7 lines
Quoted 5 lines

I don't really where it is changed ... mxc seems better so devices.[ch] is more logical.

But I have sent the exact same patch on Friday and received no comment ... I hope mine or Guennadi's (I don't really care) can get its way to -rc4.

Sorry, I missed it. Here's a version with changed devices.[hc].

No problem, as long as it gets fixed.

Quoted 81 lines
arch/arm/mach-mx3/devices.c +12 -12
index 8a577f3..e6abe18 100644
@@ -459,7 +459,7 @@ struct platform_device mxc_usbh2 = {
  * SPI master controller
  * 3 channels
  */
-static struct resource imx_spi_0_resources[] = {
+static struct resource mxc_spi_0_resources[] = {
 	{
 	       .start = CSPI1_BASE_ADDR,
 	       .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,
 		.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,
 		.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",
 	.id = 0,
-	.num_resources = ARRAY_SIZE(imx_spi_0_resources),
-	.resource = imx_spi_0_resources,
+	.num_resources = ARRAY_SIZE(mxc_spi_0_resources),
+	.resource = mxc_spi_0_resources,
 };
 
-struct platform_device imx_spi_device1 = {
+struct platform_device mxc_spi_device1 = {
 	.name = "spi_imx",
 	.id = 1,
-	.num_resources = ARRAY_SIZE(imx_spi_1_resources),
-	.resource = imx_spi_1_resources,
+	.num_resources = ARRAY_SIZE(mxc_spi_1_resources),
+	.resource = mxc_spi_1_resources,
 };
 
-struct platform_device imx_spi_device2 = {
+struct platform_device mxc_spi_device2 = {
 	.name = "spi_imx",
 	.id = 2,
-	.num_resources = ARRAY_SIZE(imx_spi_2_resources),
-	.resource = imx_spi_2_resources,
+	.num_resources = ARRAY_SIZE(mxc_spi_2_resources),
+	.resource = mxc_spi_2_resources,
 };
 
 #ifdef CONFIG_ARCH_MX35
arch/arm/mach-mx3/devices.h +3 -3
index 79f2be4..ab87419 100644
@@ -20,7 +20,7 @@ extern struct platform_device mxc_otg_host;
 extern struct platform_device mxc_usbh1;
 extern struct platform_device mxc_usbh2;
 extern struct platform_device mxc_rnga_device;
-extern struct platform_device imx_spi_device0;
-extern struct platform_device imx_spi_device1;
-extern struct platform_device imx_spi_device2;
+extern struct platform_device mxc_spi_device0;
+extern struct platform_device mxc_spi_device1;
+extern struct platform_device mxc_spi_device2;
#5 lore raw

PATCH v2 1/1 fix pcm037_eet compilation with the new SPI driver

In reply to Guennadi Liakhovetski
Quoted 20 lines · Guennadi Liakhovetski

Fix pcm037_eet compilation with the new imx SPI driver by unifying platform device names.

---

Quoted 13 lines · Valentin Longchamp

Hi Sascha,

Quoted 9 lines · Sascha Hauer
Quoted 3 lines · Guennadi Liakhovetski

At some point the SPI device name in arch/arm/mach-mx3/devices.c has changed, which then broke compilation of pcm037_eet with the new SPI driver. Use the correct name.

It didn't change, it was merged with imx_spi_device0. Can we change the name in devices.[ch] instead? All other devices start with mxc_. Sorry, my bad.

Quoted 7 lines
Quoted 5 lines

I don't really where it is changed ... mxc seems better so devices.[ch] is more logical.

But I have sent the exact same patch on Friday and received no comment ... I hope mine or Guennadi's (I don't really care) can get its way to -rc4.

Sorry, I missed it. Here's a version with changed devices.[hc].

Ok, thanks.

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |