Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6

* commit '4cb38750d49010ae72e718d46605ac9ba5a851b4': (6849 commits)
  bcma: fix invalid PMU chip control masks
  [libata] pata_cmd64x: whitespace cleanup
  libata-acpi: fix up for acpi_pm_device_sleep_state API
  sata_dwc_460ex: device tree may specify dma_channel
  ahci, trivial: fixed coding style issues related to braces
  ahci_platform: add hibernation callbacks
  libata-eh.c: local functions should not be exposed globally
  libata-transport.c: local functions should not be exposed globally
  sata_dwc_460ex: support hardreset
  ata: use module_pci_driver
  drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
  pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
  ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
  [libata] Prevent interface errors with Seagate FreeAgent GoFlex
  drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
  libata-acpi: add missing inlines in libata.h
  i2c-omap: Add support for I2C_M_STOP message flag
  i2c: Fall back to emulated SMBus if the operation isn't supported natively
  i2c: Add SCCB support
  i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/arm/mach-imx/mach-cpuimx51sd.c b/arch/arm/mach-imx/mach-cpuimx51sd.c
index ac50f1671e38..b87cc49ab1e8 100644
--- a/arch/arm/mach-imx/mach-cpuimx51sd.c
+++ b/arch/arm/mach-imx/mach-cpuimx51sd.c
@@ -142,7 +142,6 @@ static struct i2c_board_info eukrea_cpuimx51sd_i2c_devices[] = {
                 I2C_BOARD_INFO("pcf8563", 0x51),
         }, {
                 I2C_BOARD_INFO("tsc2007", 0x49),
-                .type           = "tsc2007",
                 .platform_data  = &tsc2007_info,
         },
 };
@@ -218,18 +217,18 @@ static const struct mxc_usbh_platform_data usbh1_config __initconst = {
         .portsc = MXC_EHCI_MODE_ULPI,
 };
 
-static int otg_mode_host;
+static bool otg_mode_host __initdata;
 
 static int __init eukrea_cpuimx51sd_otg_mode(char *options)
 {
         if (!strcmp(options, "host"))
-                otg_mode_host = 1;
+                otg_mode_host = true;
         else if (!strcmp(options, "device"))
-                otg_mode_host = 0;
+                otg_mode_host = false;
         else
                 pr_info("otg_mode neither \"host\" nor \"device\". "
                         "Defaulting to device\n");
-        return 0;
+        return 1;
 }
 __setup("otg_mode=", eukrea_cpuimx51sd_otg_mode);
 
@@ -259,7 +258,7 @@ static struct spi_board_info cpuimx51sd_spi_device[] = {
                 .mode           = SPI_MODE_0,
                 .chip_select     = 0,
                 .platform_data   = &mcp251x_info,
-                .irq             = IMX_GPIO_TO_IRQ(CAN_IRQGPIO)
+                /* irq number is run-time assigned */
         },
 };
 
@@ -293,7 +292,7 @@ static void __init eukrea_cpuimx51sd_init(void)
 
         imx51_add_imx_uart(0, &uart_pdata);
         imx51_add_mxc_nand(&eukrea_cpuimx51sd_nand_board_info);
-        imx51_add_imx2_wdt(0, NULL);
+        imx51_add_imx2_wdt(0);
 
         gpio_request(ETH_RST, "eth_rst");
         gpio_set_value(ETH_RST, 1);
@@ -310,6 +309,7 @@ static void __init eukrea_cpuimx51sd_init(void)
         msleep(20);
         gpio_set_value(CAN_RST, 1);
         imx51_add_ecspi(0, &cpuimx51sd_ecspi1_pdata);
+        cpuimx51sd_spi_device[0].irq = gpio_to_irq(CAN_IRQGPIO);
         spi_register_board_info(cpuimx51sd_spi_device,
                                 ARRAY_SIZE(cpuimx51sd_spi_device));