Merge branch 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel...

* 'fixes-non-critical-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3+: PM: VP: fix integer truncation error
  ARM: OMAP2+: PM: fix wakeupgen warning when hotplug disabled
  ARM: OMAP2+: PM: fix section mismatch with omap2_init_processor_devices()
  ARM: OMAP2: Fix section warning for n8x0 when CONFIG_MMC_OMAP is not set
  ARM: OMAP2+: Fix omap24xx_io_desc warning if SoC subtypes are not selected
  ARM: OMAP1: Fix section mismatch for omap1_init_early()
  ARM: OMAP1: Fix typo in lcd_dma.c
  ARM: OMAP: mailbox: trivial whitespace fix
  ARM: OMAP: Remove definition cpu_is_omap4430()
  ARM: OMAP2+: included some headers twice
  ARM: OMAP: clock.c: included linux/debugfs.h twice
  ARM: OMAP: don't build hwspinlock in vain
  ARM: OMAP2+: ads7846_init: put gpio_pendown into pdata if it's provided
  ARM: omap: pandora: fix usbhs platform data
  ARM: OMAP: sram: Add am33xx SRAM support (minimal)
  ARM: OMAP2+: id: Add am33xx SoC type detection
  ARM: OMAP2+: GPMC: Export gpmc_enable_hwecc and gpmc_calculate_ecc
  ARM: OMAP: dmtimer: fix missing content/correction in low-power mode support

diff --combined arch/arm/mach-omap2/Makefile
index 56a6e98,caca7d4..f109617
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -4,7 -4,7 +4,7 @@@
  
  # Common support
  obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
 -       common.o gpio.o dma.o wd_timer.o display.o
 +       common.o gpio.o dma.o wd_timer.o display.o i2c.o
  
  omap-2-3-common                               = irq.o sdrc.o
  hwmod-common                          = omap_hwmod.o \
@@@ -182,6 -182,9 +182,6 @@@ obj-$(CONFIG_OMAP_IOMMU)           += iommu2.
  iommu-$(CONFIG_OMAP_IOMMU)            := omap-iommu.o
  obj-y                                 += $(iommu-m) $(iommu-y)
  
 -i2c-omap-$(CONFIG_I2C_OMAP)           := i2c.o
 -obj-y                                 += $(i2c-omap-m) $(i2c-omap-y)
 -
  ifneq ($(CONFIG_TIDSPBRIDGE),)
  obj-y                                 += dsp.o
  endif
@@@ -265,6 -268,8 +265,8 @@@ obj-y                                      += $(smc91x-m) $(smc91x-y
  
  smsc911x-$(CONFIG_SMSC911X)           := gpmc-smsc911x.o
  obj-y                                 += $(smsc911x-m) $(smsc911x-y)
- obj-$(CONFIG_ARCH_OMAP4)              += hwspinlock.o
+ ifneq ($(CONFIG_HWSPINLOCK_OMAP),)
+ obj-y                                 += hwspinlock.o
+ endif
  
  obj-y                                 += common-board-devices.o twl-common.o

diff --combined arch/arm/mach-omap2/board-ldp.c
index b5bc9b2,ac42ebe..d50a562
--- 1/arch/arm/mach-omap2/board-ldp.c
--- 2/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@@ -27,7 -27,6 +27,6 @@@
  #include <linux/io.h>
  #include <linux/smsc911x.h>
  #include <linux/mmc/host.h>
- #include <linux/gpio.h>
  
  #include <mach/hardware.h>
  #include <asm/mach-types.h>
@@@ -424,7 -423,7 +423,7 @@@ static void __init omap_ldp_init(void
        board_nand_init(ldp_nand_partitions,
                ARRAY_SIZE(ldp_nand_partitions), ZOOM_NAND_CS, 0);
  
 -      omap2_hsmmc_init(mmc);
 +      omap_hsmmc_init(mmc);
        ldp_display_init();
  }
  

diff --combined arch/arm/mach-omap2/board-n8x0.c
index 6722627,6bb6746..50e40bc
--- 1/arch/arm/mach-omap2/board-n8x0.c
--- 2/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@@ -36,10 -36,6 +36,6 @@@
  
  #include "mux.h"
  
- static int slot1_cover_open;
- static int slot2_cover_open;
- static struct device *mmc_device;
- 
  #define TUSB6010_ASYNC_CS     1
  #define TUSB6010_SYNC_CS      4
  #define TUSB6010_GPIO_INT     58
@@@ -211,6 -207,10 +207,10 @@@ static struct omap_onenand_platform_dat
  #define N810_EMMC_VSD_GPIO    23
  #define N810_EMMC_VIO_GPIO    9
  
+ static int slot1_cover_open;
+ static int slot2_cover_open;
+ static struct device *mmc_device;
+ 
  static int n8x0_mmc_switch_slot(struct device *dev, int slot)
  {
  #ifdef CONFIG_MMC_DEBUG
@@@ -371,11 -371,7 +371,11 @@@ static void n8x0_mmc_callback(void *dat
        else
                *openp = 0;
  
 +#ifdef CONFIG_MMC_OMAP
        omap_mmc_notify_cover_event(mmc_device, index, *openp);
 +#else
 +      pr_warn("MMC: notify cover event not available\n");
 +#endif
  }
  
  static int n8x0_mmc_late_init(struct device *dev)

diff --combined arch/arm/mach-omap2/board-omap3pandora.c
index ace466b,2224b5d..7184b8b
--- 1/arch/arm/mach-omap2/board-omap3pandora.c
--- 2/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -273,7 -273,6 +273,7 @@@ static struct omap2_hsmmc_info omap3pan
                .gpio_cd        = -EINVAL,
                .gpio_wp        = 126,
                .ext_clock      = 0,
 +              .deferred       = true,
        },
        {
                .mmc            = 2,
@@@ -282,7 -281,6 +282,7 @@@
                .gpio_wp        = 127,
                .ext_clock      = 1,
                .transceiver    = true,
 +              .deferred       = true,
        },
        {
                .mmc            = 3,
@@@ -302,7 -300,7 +302,7 @@@ static int omap3pandora_twl_gpio_setup(
        /* gpio + {0,1} is "mmc{0,1}_cd" (input/IRQ) */
        omap3pandora_mmc[0].gpio_cd = gpio + 0;
        omap3pandora_mmc[1].gpio_cd = gpio + 1;
 -      omap2_hsmmc_init(omap3pandora_mmc);
 +      omap_hsmmc_late_init(omap3pandora_mmc);
  
        /* gpio + 13 drives 32kHz buffer for wifi module */
        gpio_32khz = gpio + 13;
@@@ -345,7 -343,7 +345,7 @@@ static struct regulator_consumer_suppl
  };
  
  static struct regulator_consumer_supply pandora_usb_phy_supply[] = {
-       REGULATOR_SUPPLY("hsusb0", "ehci-omap.0"),
+       REGULATOR_SUPPLY("hsusb1", "ehci-omap.0"),
  };
  
  /* ads7846 on SPI and 2 nub controllers on I2C */
@@@ -563,13 -561,13 +563,13 @@@ static struct platform_device *omap3pan
  
  static const struct usbhs_omap_board_data usbhs_bdata __initconst = {
  
-       .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY,
-       .port_mode[1] = OMAP_USBHS_PORT_MODE_UNUSED,
+       .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED,
+       .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY,
        .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED,
  
        .phy_reset  = true,
-       .reset_gpio_port[0]  = 16,
-       .reset_gpio_port[1]  = -EINVAL,
+       .reset_gpio_port[0]  = -EINVAL,
+       .reset_gpio_port[1]  = 16,
        .reset_gpio_port[2]  = -EINVAL
  };
  
@@@ -582,7 -580,6 +582,7 @@@ static struct omap_board_mux board_mux[
  static void __init omap3pandora_init(void)
  {
        omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 +      omap_hsmmc_init(omap3pandora_mmc);
        omap3pandora_i2c_init();
        pandora_wl1251_init();
        platform_add_devices(omap3pandora_devices,

diff --combined arch/arm/mach-omap2/pm.c
index fb9b85b,d00c39e..03f038c
--- 1/arch/arm/mach-omap2/pm.c
--- 2/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@@ -28,7 -28,7 +28,7 @@@
  
  static struct omap_device_pm_latency *pm_lats;
  
 -static int _init_omap_device(char *name)
 +static int __init _init_omap_device(char *name)
  {
        struct omap_hwmod *oh;
        struct platform_device *pdev;
@@@ -49,7 -49,7 +49,7 @@@
  /*
   * Build omap_devices for processors and bus.
   */
- static void omap2_init_processor_devices(void)
+ static void __init omap2_init_processor_devices(void)
  {
        _init_omap_device("mpu");
        if (omap3_has_iva())