* [PATCH] fix pcm037_eet compilation with the new SPI driver @ 2009-10-05 8:04 Guennadi Liakhovetski 2009-10-05 12:19 ` Sascha Hauer 0 siblings, 1 reply; 6+ messages in thread From: Guennadi Liakhovetski @ 2009-10-05 8:04 UTC (permalink / raw) To: linux-arm-kernel 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. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- diff --git a/arch/arm/mach-mx3/pcm037_eet.c b/arch/arm/mach-mx3/pcm037_eet.c index 8d38600..dc6baf3 100644 --- a/arch/arm/mach-mx3/pcm037_eet.c +++ b/arch/arm/mach-mx3/pcm037_eet.c @@ -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); ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] fix pcm037_eet compilation with the new SPI driver 2009-10-05 8:04 [PATCH] fix pcm037_eet compilation with the new SPI driver Guennadi Liakhovetski @ 2009-10-05 12:19 ` Sascha Hauer 2009-10-05 14:01 ` Valentin Longchamp 0 siblings, 1 reply; 6+ messages in thread From: Sascha Hauer @ 2009-10-05 12:19 UTC (permalink / raw) To: linux-arm-kernel Hi Guennadi, On Mon, Oct 05, 2009 at 10:04:51AM +0200, Guennadi Liakhovetski wrote: > 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 > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > diff --git a/arch/arm/mach-mx3/pcm037_eet.c b/arch/arm/mach-mx3/pcm037_eet.c > index 8d38600..dc6baf3 100644 > --- a/arch/arm/mach-mx3/pcm037_eet.c > +++ b/arch/arm/mach-mx3/pcm037_eet.c > @@ -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); > -- 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 | ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] fix pcm037_eet compilation with the new SPI driver 2009-10-05 12:19 ` Sascha Hauer @ 2009-10-05 14:01 ` Valentin Longchamp 2009-10-05 14:49 ` [PATCH v2] " Guennadi Liakhovetski 0 siblings, 1 reply; 6+ messages in thread From: Valentin Longchamp @ 2009-10-05 14:01 UTC (permalink / raw) To: linux-arm-kernel Hi Sascha, Sascha Hauer wrote: > > On Mon, Oct 05, 2009 at 10:04:51AM +0200, Guennadi Liakhovetski wrote: >> 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 > > Sascha > > >> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> >> --- >> diff --git a/arch/arm/mach-mx3/pcm037_eet.c b/arch/arm/mach-mx3/pcm037_eet.c >> index 8d38600..dc6baf3 100644 >> --- a/arch/arm/mach-mx3/pcm037_eet.c >> +++ b/arch/arm/mach-mx3/pcm037_eet.c >> @@ -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); >> > ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] fix pcm037_eet compilation with the new SPI driver 2009-10-05 14:01 ` Valentin Longchamp @ 2009-10-05 14:49 ` Guennadi Liakhovetski 2009-10-05 15:34 ` Valentin Longchamp 2009-10-06 6:48 ` Sascha Hauer 0 siblings, 2 replies; 6+ messages in thread From: Guennadi Liakhovetski @ 2009-10-05 14:49 UTC (permalink / raw) To: linux-arm-kernel Fix pcm037_eet compilation with the new imx SPI driver by unifying platform device names. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- On Mon, 5 Oct 2009, Valentin Longchamp wrote: > Hi Sascha, > > Sascha Hauer wrote: > > > > On Mon, Oct 05, 2009 at 10:04:51AM +0200, Guennadi Liakhovetski wrote: > > > 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. Sorry, I missed it. Here's a version with changed devices.[hc]. diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index 8a577f3..e6abe18 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -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 diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h index 79f2be4..ab87419 100644 --- a/arch/arm/mach-mx3/devices.h +++ b/arch/arm/mach-mx3/devices.h @@ -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; ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2] fix pcm037_eet compilation with the new SPI driver 2009-10-05 14:49 ` [PATCH v2] " Guennadi Liakhovetski @ 2009-10-05 15:34 ` Valentin Longchamp 2009-10-06 6:48 ` Sascha Hauer 1 sibling, 0 replies; 6+ messages in thread From: Valentin Longchamp @ 2009-10-05 15:34 UTC (permalink / raw) To: linux-arm-kernel Hi Guennadi and Sacha, Guennadi Liakhovetski wrote: > 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. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Acked-by: Valentin Longchamp <valentin.longchamp@epfl.ch> > --- > On Mon, 5 Oct 2009, Valentin Longchamp wrote: > >> Hi Sascha, >> >> Sascha Hauer wrote: >>> On Mon, Oct 05, 2009 at 10:04:51AM +0200, Guennadi Liakhovetski wrote: >>>> 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. > > Sorry, I missed it. Here's a version with changed devices.[hc]. No problem, as long as it gets fixed. > > diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c > index 8a577f3..e6abe18 100644 > --- a/arch/arm/mach-mx3/devices.c > +++ b/arch/arm/mach-mx3/devices.c > @@ -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 > diff --git a/arch/arm/mach-mx3/devices.h b/arch/arm/mach-mx3/devices.h > index 79f2be4..ab87419 100644 > --- a/arch/arm/mach-mx3/devices.h > +++ b/arch/arm/mach-mx3/devices.h > @@ -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; ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] fix pcm037_eet compilation with the new SPI driver 2009-10-05 14:49 ` [PATCH v2] " Guennadi Liakhovetski 2009-10-05 15:34 ` Valentin Longchamp @ 2009-10-06 6:48 ` Sascha Hauer 1 sibling, 0 replies; 6+ messages in thread From: Sascha Hauer @ 2009-10-06 6:48 UTC (permalink / raw) To: linux-arm-kernel On Mon, Oct 05, 2009 at 04:49:12PM +0200, Guennadi Liakhovetski wrote: > Fix pcm037_eet compilation with the new imx SPI driver by unifying > platform device names. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> > --- > On Mon, 5 Oct 2009, Valentin Longchamp wrote: > > > Hi Sascha, > > > > Sascha Hauer wrote: > > > > > > On Mon, Oct 05, 2009 at 10:04:51AM +0200, Guennadi Liakhovetski wrote: > > > > 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. > > Sorry, I missed it. Here's a version with changed devices.[hc]. Ok, thanks. Sascha -- 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 | ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-10-06 6:48 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2009-10-05 8:04 [PATCH] fix pcm037_eet compilation with the new SPI driver Guennadi Liakhovetski 2009-10-05 12:19 ` Sascha Hauer 2009-10-05 14:01 ` Valentin Longchamp 2009-10-05 14:49 ` [PATCH v2] " Guennadi Liakhovetski 2009-10-05 15:34 ` Valentin Longchamp 2009-10-06 6:48 ` Sascha Hauer
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).