* linux-next: manual merge of the usb tree with the i.MX tree
@ 2010-02-26 7:25 Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2010-02-26 7:25 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Martin Fuzzey,
"Uwe Kleine-König",
Sascha Hauer
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-mx2/devices.c between various commits from the i.MX tree
and commits 304ae32ac8ac68ac5a091a67187645dc84b6067c ("USB: MXC: use
DMA_BIT_MASK macro rather than hardcoded constants") and
3f1c5d0f4c64f5e9e4ac329a935b3da67593691f ("USB: MXC: add platform
resources for i.MX21 USB host controller") from the usb tree.
I fixed it up (I think - see below) and cam carry the fixes as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-mx2/devices.c
index a4b809b,3956d82..0000000
--- a/arch/arm/mach-mx2/devices.c
+++ b/arch/arm/mach-mx2/devices.c
@@@ -270,38 -380,63 +271,38 @@@ struct platform_device mxc_pwm_device
/*
* Resource definition for the MXC SDHC
*/
-static struct resource mxc_sdhc1_resources[] = {
- {
- .start = SDHC1_BASE_ADDR,
- .end = SDHC1_BASE_ADDR + SZ_4K - 1,
- .flags = IORESOURCE_MEM,
- }, {
- .start = MXC_INT_SDHC1,
- .end = MXC_INT_SDHC1,
- .flags = IORESOURCE_IRQ,
- }, {
- .start = DMA_REQ_SDHC1,
- .end = DMA_REQ_SDHC1,
- .flags = IORESOURCE_DMA,
- },
-};
-
-static u64 mxc_sdhc1_dmamask = DMA_BIT_MASK(32);
-
-struct platform_device mxc_sdhc_device0 = {
- .name = "mxc-mmc",
- .id = 0,
- .dev = {
- .dma_mask = &mxc_sdhc1_dmamask,
- .coherent_dma_mask = DMA_BIT_MASK(32),
- },
- .num_resources = ARRAY_SIZE(mxc_sdhc1_resources),
- .resource = mxc_sdhc1_resources,
-};
-
-static struct resource mxc_sdhc2_resources[] = {
- {
- .start = SDHC2_BASE_ADDR,
- .end = SDHC2_BASE_ADDR + SZ_4K - 1,
- .flags = IORESOURCE_MEM,
- }, {
- .start = MXC_INT_SDHC2,
- .end = MXC_INT_SDHC2,
- .flags = IORESOURCE_IRQ,
- }, {
- .start = DMA_REQ_SDHC2,
- .end = DMA_REQ_SDHC2,
- .flags = IORESOURCE_DMA,
- },
-};
-
-static u64 mxc_sdhc2_dmamask = DMA_BIT_MASK(32);
+#define DEFINE_MXC_MMC_DEVICE(n, baseaddr, irq, dmareq) \
+ static struct resource mxc_sdhc_resources ## n[] = { \
+ { \
+ .start = baseaddr, \
+ .end = baseaddr + SZ_4K - 1, \
+ .flags = IORESOURCE_MEM, \
+ }, { \
+ .start = irq, \
+ .end = irq, \
+ .flags = IORESOURCE_IRQ, \
+ }, { \
+ .start = dmareq, \
+ .end = dmareq, \
+ .flags = IORESOURCE_DMA, \
+ }, \
+ }; \
+ \
- static u64 mxc_sdhc ## n ## _dmamask = 0xffffffffUL; \
++ static u64 mxc_sdhc ## n ## _dmamask = DMA_BIT_MASK(32); \
+ \
+ struct platform_device mxc_sdhc_device ## n = { \
+ .name = "mxc-mmc", \
+ .id = n, \
+ .dev = { \
+ .dma_mask = &mxc_sdhc ## n ## _dmamask, \
- .coherent_dma_mask = 0xffffffff, \
++ .coherent_dma_mask = DMA_BIT_MASK(32), \
+ }, \
+ .num_resources = ARRAY_SIZE(mxc_sdhc_resources ## n), \
+ .resource = mxc_sdhc_resources ## n, \
+ }
-struct platform_device mxc_sdhc_device1 = {
- .name = "mxc-mmc",
- .id = 1,
- .dev = {
- .dma_mask = &mxc_sdhc2_dmamask,
- .coherent_dma_mask = DMA_BIT_MASK(32),
- },
- .num_resources = ARRAY_SIZE(mxc_sdhc2_resources),
- .resource = mxc_sdhc2_resources,
-};
+DEFINE_MXC_MMC_DEVICE(0, MX2x_SDHC1_BASE_ADDR, MX2x_INT_SDHC1, MX2x_DMA_REQ_SDHC1);
+DEFINE_MXC_MMC_DEVICE(1, MX2x_SDHC2_BASE_ADDR, MX2x_INT_SDHC2, MX2x_DMA_REQ_SDHC2);
#ifdef CONFIG_MACH_MX27
static struct resource otg_resources[] = {
@@@ -320,14 -455,14 +321,14 @@@ static u64 otg_dmamask = DMA_BIT_MASK(3
/* OTG gadget device */
struct platform_device mxc_otg_udc_device = {
- .name = "fsl-usb2-udc",
- .id = -1,
- .dev = {
- .dma_mask = &otg_dmamask,
- .coherent_dma_mask = 0xffffffffUL,
+ .name = "fsl-usb2-udc",
+ .id = -1,
+ .dev = {
+ .dma_mask = &otg_dmamask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
},
- .resource = otg_resources,
- .num_resources = ARRAY_SIZE(otg_resources),
+ .resource = otg_resources,
+ .num_resources = ARRAY_SIZE(otg_resources),
};
/* OTG host */
@@@ -469,15 -641,32 +470,42 @@@ DEFINE_MXC_GPIO_PORTS(MX27, imx27)
int __init mxc_register_gpios(void)
{
- return mxc_gpio_init(imx_gpio_ports, ARRAY_SIZE(imx_gpio_ports));
+#ifdef CONFIG_MACH_MX21
+ if (cpu_is_mx21())
+ return mxc_gpio_init(imx21_gpio_ports, ARRAY_SIZE(imx21_gpio_ports));
+ else
+#endif
+#ifdef CONFIG_MACH_MX27
+ if (cpu_is_mx27())
+ return mxc_gpio_init(imx27_gpio_ports, ARRAY_SIZE(imx27_gpio_ports));
+ else
+#endif
+ return 0;
}
+
+ #ifdef CONFIG_MACH_MX21
+ static struct resource mx21_usbhc_resources[] = {
+ {
+ .start = USBOTG_BASE_ADDR,
+ .end = USBOTG_BASE_ADDR + 0x1FFF,
+ .flags = IORESOURCE_MEM,
+ },
+ {
+ .start = MXC_INT_USBHOST,
+ .end = MXC_INT_USBHOST,
+ .flags = IORESOURCE_IRQ,
+ },
+ };
+
+ struct platform_device mx21_usbhc_device = {
+ .name = "imx21-hcd",
+ .id = 0,
+ .dev = {
+ .dma_mask = &mx21_usbhc_device.dev.coherent_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+ .num_resources = ARRAY_SIZE(mx21_usbhc_resources),
+ .resource = mx21_usbhc_resources,
+ };
+ #endif
+
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the usb tree with the i.MX tree
2010-02-26 7:25 linux-next: manual merge of the usb tree with the i.MX tree Stephen Rothwell
@ 2010-02-26 8:04 ` Uwe Kleine-König
0 siblings, 0 replies; 7+ messages in thread
From: Uwe Kleine-König @ 2010-02-26 8:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Martin Fuzzey, Sascha Hauer
Hi Stephen,
On Fri, Feb 26, 2010 at 06:25:45PM +1100, Stephen Rothwell wrote:
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-mx2/devices.c between various commits from the i.MX tree
> and commits 304ae32ac8ac68ac5a091a67187645dc84b6067c ("USB: MXC: use
> DMA_BIT_MASK macro rather than hardcoded constants") and
> 3f1c5d0f4c64f5e9e4ac329a935b3da67593691f ("USB: MXC: add platform
> resources for i.MX21 USB host controller") from the usb tree.
>
> I fixed it up (I think - see below) and cam carry the fixes as necessary.
looks OK for me, too.
thanks Stephen,
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the usb tree with the i.MX tree
2011-03-04 4:58 Stephen Rothwell
@ 2011-03-04 17:12 ` Greg KH
0 siblings, 0 replies; 7+ messages in thread
From: Greg KH @ 2011-03-04 17:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Richard Zhao, Sascha Hauer, Fabio Estevam
On Fri, Mar 04, 2011 at 03:58:00PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/gadget/fsl_mxc_udc.c between commit
> 4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
> ARCH_MX3X") from the i.MX tree and commit
> a51ea8cc9cfcfd719240455ff8f217b4f165d1d0 ("usb: gadget/fsl_mxc_udc:
> Detect the CPU type in run-time") from the usb tree.
>
> The latter is a superset of the former, so I used that.
Thanks, I appreciate it.
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the usb tree with the i.MX tree
@ 2011-03-04 4:58 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2011-03-04 4:58 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Richard Zhao, Sascha Hauer, Fabio Estevam
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/gadget/fsl_mxc_udc.c between commit
4d2f13be1e370a670c1cae20c194d5ce961e0fa5 ("ARM: imx3x: clean up
ARCH_MX3X") from the i.MX tree and commit
a51ea8cc9cfcfd719240455ff8f217b4f165d1d0 ("usb: gadget/fsl_mxc_udc:
Detect the CPU type in run-time") from the usb tree.
The latter is a superset of the former, so I used that.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the usb tree with the i.MX tree
2010-02-26 8:04 ` Uwe Kleine-König
@ 2010-02-26 8:09 ` Stephen Rothwell
0 siblings, 0 replies; 7+ messages in thread
From: Stephen Rothwell @ 2010-02-26 8:09 UTC (permalink / raw)
To: "Uwe Kleine-König"
Cc: Greg KH, linux-next, linux-kernel, Martin Fuzzey, Sascha Hauer
[-- Attachment #1: Type: text/plain, Size: 266 bytes --]
Hi,
On Fri, 26 Feb 2010 09:04:22 +0100 Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote:
>
> Looks OK, thanks
Thanks for the confirmation.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: linux-next: manual merge of the usb tree with the i.MX tree
2010-02-26 7:10 Stephen Rothwell
@ 2010-02-26 8:04 ` Uwe Kleine-König
2010-02-26 8:09 ` Stephen Rothwell
0 siblings, 1 reply; 7+ messages in thread
From: Uwe Kleine-König @ 2010-02-26 8:04 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Greg KH, linux-next, linux-kernel, Martin Fuzzey, Sascha Hauer
On Fri, Feb 26, 2010 at 06:10:03PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> arch/arm/mach-mx2/devices.h between commit
> 68c94b40b31926f627573a7f656b903f6644744e ("arm/mx2: use cpp magic to
> create spi_imx devices") from the i.MX tree and commit
> 3f1c5d0f4c64f5e9e4ac329a935b3da67593691f ("USB: MXC: add platform
> resources for i.MX21 USB host controller") from the usb tree.
>
> Just context changes. I fixed it up (see below) and can carry the fix as
> necessary.
Looks OK, thanks
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 7+ messages in thread
* linux-next: manual merge of the usb tree with the i.MX tree
@ 2010-02-26 7:10 Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König
0 siblings, 1 reply; 7+ messages in thread
From: Stephen Rothwell @ 2010-02-26 7:10 UTC (permalink / raw)
To: Greg KH
Cc: linux-next, linux-kernel, Martin Fuzzey,
"Uwe Kleine-König",
Sascha Hauer
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
arch/arm/mach-mx2/devices.h between commit
68c94b40b31926f627573a7f656b903f6644744e ("arm/mx2: use cpp magic to
create spi_imx devices") from the i.MX tree and commit
3f1c5d0f4c64f5e9e4ac329a935b3da67593691f ("USB: MXC: add platform
resources for i.MX21 USB host controller") from the usb tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-mx2/devices.h
index f15df2a,f12694b..0000000
--- a/arch/arm/mach-mx2/devices.h
+++ b/arch/arm/mach-mx2/devices.h
@@@ -34,8 -25,7 +34,9 @@@ extern struct platform_device mxc_usbh1
extern struct platform_device mxc_usbh2;
extern struct platform_device mxc_spi_device0;
extern struct platform_device mxc_spi_device1;
+#ifdef CONFIG_MACH_MX27
extern struct platform_device mxc_spi_device2;
+#endif
+ extern struct platform_device mx21_usbhc_device;
extern struct platform_device imx_ssi_device0;
extern struct platform_device imx_ssi_device1;
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-03-04 17:14 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-26 7:25 linux-next: manual merge of the usb tree with the i.MX tree Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König
-- strict thread matches above, loose matches on Subject: below --
2011-03-04 4:58 Stephen Rothwell
2011-03-04 17:12 ` Greg KH
2010-02-26 7:10 Stephen Rothwell
2010-02-26 8:04 ` Uwe Kleine-König
2010-02-26 8:09 ` Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.