Merge commit 'v2.6.37-rc4' into imx-for-2.6.38

Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

diff --cc arch/arm/mach-imx/devices-imx25.h
index 760e66c57c1bfb8c380c8b6a2ab1db66c27f9689,0000000000000000000000000000000000000000..bde33caf1b90001b3cc53f145062fe80803b5bb7
mode 100644,000000..100644
--- 1/arch/arm/mach-imx/devices-imx25.h
--- /dev/null
+++ b/arch/arm/mach-imx/devices-imx25.h
@@@ -1,87 -1,0 +1,87 @@@
- extern const struct imx_spi_imx_data imx25_spi_imx_data[] __initconst;
 +/*
 + * Copyright (C) 2010 Pengutronix
 + * Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
 + *
 + * This program is free software; you can redistribute it and/or modify it under
 + * the terms of the GNU General Public License version 2 as published by the
 + * Free Software Foundation.
 + */
 +#include <mach/mx25.h>
 +#include <mach/devices-common.h>
 +
 +extern const struct imx_fec_data imx25_fec_data __initconst;
 +#define imx25_add_fec(pdata)  \
 +      imx_add_fec(&imx25_fec_data, pdata)
 +
 +extern const struct imx_flexcan_data imx25_flexcan_data[] __initconst;
 +#define imx25_add_flexcan(id, pdata)  \
 +      imx_add_flexcan(&imx25_flexcan_data[id], pdata)
 +#define imx25_add_flexcan0(pdata)     imx25_add_flexcan(0, pdata)
 +#define imx25_add_flexcan1(pdata)     imx25_add_flexcan(1, pdata)
 +
 +extern const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst;
 +#define imx25_add_fsl_usb2_udc(pdata) \
 +      imx_add_fsl_usb2_udc(&imx25_fsl_usb2_udc_data, pdata)
 +
 +extern struct imx_imxdi_rtc_data imx25_imxdi_rtc_data __initconst;
 +#define imx25_add_imxdi_rtc(pdata)    \
 +      imx_add_imxdi_rtc(&imx25_imxdi_rtc_data)
 +
 +extern const struct imx_imx2_wdt_data imx25_imx2_wdt_data __initconst;
 +#define imx25_add_imx2_wdt(pdata)     \
 +      imx_add_imx2_wdt(&imx25_imx2_wdt_data)
 +
 +extern const struct imx_imx_fb_data imx25_imx_fb_data __initconst;
 +#define imx25_add_imx_fb(pdata)       \
 +      imx_add_imx_fb(&imx25_imx_fb_data, pdata)
 +
 +extern const struct imx_imx_i2c_data imx25_imx_i2c_data[] __initconst;
 +#define imx25_add_imx_i2c(id, pdata)  \
 +      imx_add_imx_i2c(&imx25_imx_i2c_data[id], pdata)
 +#define imx25_add_imx_i2c0(pdata)     imx25_add_imx_i2c(0, pdata)
 +#define imx25_add_imx_i2c1(pdata)     imx25_add_imx_i2c(1, pdata)
 +#define imx25_add_imx_i2c2(pdata)     imx25_add_imx_i2c(2, pdata)
 +
 +extern const struct imx_imx_keypad_data imx25_imx_keypad_data __initconst;
 +#define imx25_add_imx_keypad(pdata)   \
 +      imx_add_imx_keypad(&imx25_imx_keypad_data, pdata)
 +
 +extern const struct imx_imx_ssi_data imx25_imx_ssi_data[] __initconst;
 +#define imx25_add_imx_ssi(id, pdata)  \
 +      imx_add_imx_ssi(&imx25_imx_ssi_data[id], pdata)
 +
 +extern const struct imx_imx_uart_1irq_data imx25_imx_uart_data[] __initconst;
 +#define imx25_add_imx_uart(id, pdata) \
 +      imx_add_imx_uart_1irq(&imx25_imx_uart_data[id], pdata)
 +#define imx25_add_imx_uart0(pdata)    imx25_add_imx_uart(0, pdata)
 +#define imx25_add_imx_uart1(pdata)    imx25_add_imx_uart(1, pdata)
 +#define imx25_add_imx_uart2(pdata)    imx25_add_imx_uart(2, pdata)
 +#define imx25_add_imx_uart3(pdata)    imx25_add_imx_uart(3, pdata)
 +#define imx25_add_imx_uart4(pdata)    imx25_add_imx_uart(4, pdata)
 +
 +extern const struct imx_mx2_camera_data imx25_mx2_camera_data __initconst;
 +#define imx25_add_mx2_camera(pdata)   \
 +      imx_add_mx2_camera(&imx25_mx2_camera_data, pdata)
 +
 +extern const struct imx_mxc_ehci_data imx25_mxc_ehci_otg_data __initconst;
 +#define imx25_add_mxc_ehci_otg(pdata) \
 +      imx_add_mxc_ehci(&imx25_mxc_ehci_otg_data, pdata)
 +extern const struct imx_mxc_ehci_data imx25_mxc_ehci_hs_data __initconst;
 +#define imx25_add_mxc_ehci_hs(pdata)  \
 +      imx_add_mxc_ehci(&imx25_mxc_ehci_hs_data, pdata)
 +
 +extern const struct imx_mxc_nand_data imx25_mxc_nand_data __initconst;
 +#define imx25_add_mxc_nand(pdata)     \
 +      imx_add_mxc_nand(&imx25_mxc_nand_data, pdata)
 +
 +extern const struct imx_sdhci_esdhc_imx_data
 +imx25_sdhci_esdhc_imx_data[] __initconst;
 +#define imx25_add_sdhci_esdhc_imx(id, pdata)  \
 +      imx_add_sdhci_esdhc_imx(&imx25_sdhci_esdhc_imx_data[id], pdata)
 +
++extern const struct imx_spi_imx_data imx25_cspi_data[] __initconst;
 +#define imx25_add_spi_imx(id, pdata)  \
 +      imx_add_spi_imx(&imx25_spi_imx_data[id], pdata)
 +#define imx25_add_spi_imx0(pdata)     imx25_add_spi_imx(0, pdata)
 +#define imx25_add_spi_imx1(pdata)     imx25_add_spi_imx(1, pdata)
 +#define imx25_add_spi_imx2(pdata)     imx25_add_spi_imx(2, pdata)

diff --cc arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
Simple merge

diff --cc arch/arm/plat-mxc/devices/platform-imx-dma.c
Simple merge

diff --cc arch/arm/plat-mxc/devices/platform-spi_imx.c
index e1ffa1f665e223237c4acdc4cb4f901835384d83,17f724c9452d3d5520f451bfd8a198216b4fd503..8ea49adcdfc1ccfcf3384c416a4aff3aed6dd5ef
--- 1/arch/arm/plat-mxc/devices/platform-spi_imx.c
--- 2/arch/arm/plat-mxc/devices/platform-spi_imx.c
+++ b/arch/arm/plat-mxc/devices/platform-spi_imx.c
@@@ -27,9 -27,10 +27,10 @@@ const struct imx_spi_imx_data imx21_csp
        imx_spi_imx_data_entry(MX21, CSPI, "imx21-cspi", _id, _hwid, SZ_4K)
        imx21_cspi_data_entry(0, 1),
        imx21_cspi_data_entry(1, 2),
+ };
  #endif
  
 -#ifdef CONFIG_ARCH_MX25
 +#ifdef CONFIG_SOC_IMX25
  const struct imx_spi_imx_data imx25_cspi_data[] __initconst = {
  #define imx25_cspi_data_entry(_id, _hwid)                             \
        imx_spi_imx_data_entry(MX25, CSPI, "imx25-cspi", _id, _hwid, SZ_16K)