Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups...

diff --cc arch/arm/mach-mx5/board-cpuimx51.c
index 68934ea8725a8a18399d7da508752c81c09dc0b3,d0ac21cc514611688150bba09134838c723e8f29,49ec98ee5bddbd5db2818ce8e0f5123e55f93d7c,68934ea8725a8a18399d7da508752c81c09dc0b3,e2afe0c2a12ed55ae0d1dbd7f99bbd74e7937d84..b0a140a03e5d6f8a96e5752980adbc316f8c10fb
--- 1/arch/arm/mach-mx5/board-cpuimx51.c
--- 2/arch/arm/mach-mx5/board-cpuimx51.c
--- 3/arch/arm/mach-mx5/board-cpuimx51.c
--- 4/arch/arm/mach-mx5/board-cpuimx51.c
--- 5/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/board-cpuimx51sd.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_babbage.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikamx.c
Simple merge

diff --cc arch/arm/mach-mx5/board-mx51_efikasb.c
Simple merge

diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
Simple merge

diff --cc arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c
Simple merge

diff --cc arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c
Simple merge

diff --cc arch/arm/mach-mx5/mx51_efika.c
index c9209454807ad24887e70867a2f48974e7480aaa,bc1d57bce58a8472d1e4786dee513780dfccb2ce,4d79b5e0709d8d7ff97bfdce9243a964a8d3469b,c9209454807ad24887e70867a2f48974e7480aaa,e99dead65b38d9327a77acb3d401ffedf0d16619..d5bf95825533c69c08412f5b7848f646badcddb8
--- 1/arch/arm/mach-mx5/mx51_efika.c
--- 2/arch/arm/mach-mx5/mx51_efika.c
--- 3/arch/arm/mach-mx5/mx51_efika.c
--- 4/arch/arm/mach-mx5/mx51_efika.c
--- 5/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,
     };