From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 26 Aug 2011 08:09:31 +0000 (+0200)
Subject: Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=04871e934818988c1da318ec0a15f87065cd1ca2;p=linux-beck.git

Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd
---

04871e934818988c1da318ec0a15f87065cd1ca2
diff --cc arch/arm/mach-mx5/board-cpuimx51.c
index 68934ea8725a,d0ac21cc5146,49ec98ee5bdd,68934ea8725a,e2afe0c2a12e..b0a140a03e5d
--- a/arch/arm/mach-mx5/board-cpuimx51.c
+++ b/arch/arm/mach-mx5/board-cpuimx51.c
@@@@@@ -81,7 -79,7 -81,7 -81,7 -80,7 +78,7 @@@@@@ static struct plat_serial8250_port seri
     		.flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_IOREMAP,
     	}, {
     		.mapbase = (unsigned long)(MX51_CS1_BASE_ADDR + 0x2000000),
-- - 		.irq = gpio_to_irq(CPUIMX51_QUARTD_GPIO),
    -		.irq = irq_to_gpio(CPUIMX51_QUARTD_GPIO),
++ ++		.irq = IMX_GPIO_TO_IRQ(CPUIMX51_QUARTD_GPIO),
     		.irqflags = IRQF_TRIGGER_HIGH,
     		.uartclk = CPUIMX51_QUART_XTAL,
     		.regshift = CPUIMX51_QUART_REGSHIFT,
diff --cc arch/arm/mach-mx5/mx51_efika.c
index c9209454807a,bc1d57bce58a,4d79b5e0709d,c9209454807a,e99dead65b38..d5bf95825533
--- a/arch/arm/mach-mx5/mx51_efika.c
+++ b/arch/arm/mach-mx5/mx51_efika.c
@@@@@@ -186,10 -185,10 -186,10 -186,10 -185,10 +184,10 @@@@@@ static int initialize_usbh1_port(struc
     
     	mdelay(10);
     
    -	return mx51_initialize_usb_hw(0, MXC_EHCI_ITC_NO_THRESHOLD);
    +	return mx51_initialize_usb_hw(pdev->id, MXC_EHCI_ITC_NO_THRESHOLD);
     }
     
---- static struct mxc_usbh_platform_data usbh1_config = {
++++ static struct mxc_usbh_platform_data usbh1_config __initdata = {
     	.init   = initialize_usbh1_port,
     	.portsc = MXC_EHCI_MODE_ULPI,
     };