Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (163 commits)
  omap: complete removal of machine_desc.io_pg_offst and .phys_io
  omap: UART: fix wakeup registers for OMAP24xx UART2
  omap: Fix spotty MMC voltages
  ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h
  serial: omap-serial: fix signess error
  OMAP3: DMA: Errata i541: sDMA FIFO draining does not finish
  omap: dma: Fix buffering disable bit setting for omap24xx
  omap: serial: Fix the boot-up crash/reboot without CONFIG_PM
  OMAP3: PM: fix scratchpad memory accesses for off-mode
  omap4: pandaboard: enable the ehci port on pandaboard
  omap4: pandaboard: Fix the init if CONFIG_MMC_OMAP_HS is not set
  omap4: pandaboard: remove unused hsmmc definition
  OMAP: McBSP: Remove null omap44xx ops comment
  OMAP: McBSP: Swap CLKS source definition
  OMAP: McBSP: Fix CLKR and FSR signal muxing
  OMAP2+: clock: reduce the amount of standard debugging while disabling unused clocks
  OMAP: control: move plat-omap/control.h to mach-omap2/control.h
  OMAP: split plat-omap/common.c
  OMAP: McBSP: implement functional clock switching via clock framework
  OMAP: McBSP: implement McBSP CLKR and FSR signal muxing via mach-omap2/mcbsp.c
  ...

Fixed up trivial conflicts in arch/arm/mach-omap2/
{board-zoom-peripherals.c,devices.c} as per Tony

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap1/board-htcherald.c
Simple merge

diff --cc arch/arm/mach-omap1/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/board-2430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-3630sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-4430sdp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-am3517evm.c
index e1f8dda62799683c82986dd61a286340c78cca85,fada04ea1d5cf3a2356753063d11318c8aebd8fd..07399505312b19fac8331d1d0b5367e85418a422
--- 1/arch/arm/mach-omap2/board-am3517evm.c
--- 2/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@@ -38,31 -36,14 +37,32 @@@
  #include <plat/display.h>
  
  #include "mux.h"
+ #include "control.h"
  
 -#define AM35XX_EVM_PHY_MASK           (0xF)
  #define AM35XX_EVM_MDIO_FREQUENCY     (1000000)
  
 +static struct mdio_platform_data am3517_evm_mdio_pdata = {
 +      .bus_freq       = AM35XX_EVM_MDIO_FREQUENCY,
 +};
 +
 +static struct resource am3517_mdio_resources[] = {
 +      {
 +              .start  = AM35XX_IPSS_EMAC_BASE + AM35XX_EMAC_MDIO_OFFSET,
 +              .end    = AM35XX_IPSS_EMAC_BASE + AM35XX_EMAC_MDIO_OFFSET +
 +                        SZ_4K - 1,
 +              .flags  = IORESOURCE_MEM,
 +      },
 +};
 +
 +static struct platform_device am3517_mdio_device = {
 +      .name           = "davinci_mdio",
 +      .id             = 0,
 +      .num_resources  = ARRAY_SIZE(am3517_mdio_resources),
 +      .resource       = am3517_mdio_resources,
 +      .dev.platform_data = &am3517_evm_mdio_pdata,
 +};
 +
  static struct emac_platform_data am3517_evm_emac_pdata = {
 -      .phy_mask       = AM35XX_EVM_PHY_MASK,
 -      .mdio_max_freq  = AM35XX_EVM_MDIO_FREQUENCY,
        .rmii_en        = 1,
  };
  

diff --cc arch/arm/mach-omap2/board-apollon.c
Simple merge

diff --cc arch/arm/mach-omap2/board-cm-t35.c
Simple merge

diff --cc arch/arm/mach-omap2/board-devkit8000.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
index 69064b1c6a75da991e7a229296be750eb68c4649,8aee862b625a49071e21997c9801063d4c630ea0..b1c2c9a11c389f44e4e870f39ed8236f2b4ae649
--- 1/arch/arm/mach-omap2/board-generic.c
--- 2/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -48,12 -48,26 +48,24 @@@ static void __init omap_generic_init(vo
  
  static void __init omap_generic_map_io(void)
  {
-       omap2_set_globals_242x(); /* should be 242x, 243x, or 343x */
-       omap242x_map_common_io();
+       if (cpu_is_omap242x()) {
+               omap2_set_globals_242x();
+               omap242x_map_common_io();
+       } else if (cpu_is_omap243x()) {
+               omap2_set_globals_243x();
+               omap243x_map_common_io();
+       } else if (cpu_is_omap34xx()) {
+               omap2_set_globals_3xxx();
+               omap34xx_map_common_io();
+       } else if (cpu_is_omap44xx()) {
+               omap2_set_globals_443x();
+               omap44xx_map_common_io();
+       }
  }
  
+ /* XXX This machine entry name should be updated */
  MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
        /* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
 -      .phys_io        = 0x48000000,
 -      .io_pg_offst    = ((0xfa000000) >> 18) & 0xfffc,
        .boot_params    = 0x80000100,
        .map_io         = omap_generic_map_io,
        .reserve        = omap_reserve,

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/board-igep0020.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
Simple merge

diff --cc arch/arm/mach-omap2/board-n8x0.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3beagle.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3pandora.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3stalker.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap3touchbook.c
Simple merge

diff --cc arch/arm/mach-omap2/board-omap4panda.c
Simple merge

diff --cc arch/arm/mach-omap2/board-overo.c
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
Simple merge

diff --cc arch/arm/mach-omap2/board-zoom-peripherals.c
index bc8232845d7ade22e219b4c4ddf01ef08acf24df,239c1f0eb9407c57bfe97b7d49552a7e6a46f538..86c9b210295214c175638df2997745d2643cd447
--- 1/arch/arm/mach-omap2/board-zoom-peripherals.c
--- 2/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@@ -16,8 -16,7 +16,9 @@@
  #include <linux/gpio.h>
  #include <linux/i2c/twl.h>
  #include <linux/regulator/machine.h>
 +#include <linux/regulator/fixed.h>
 +#include <linux/wl12xx.h>
+ #include <linux/mmc/host.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -31,11 -30,8 +32,11 @@@
  #include "mux.h"
  #include "hsmmc.h"
  
 +#define OMAP_ZOOM_WLAN_PMENA_GPIO     (101)
 +#define OMAP_ZOOM_WLAN_IRQ_GPIO               (162)
 +
  /* Zoom2 has Qwerty keyboard*/
- static int board_keymap[] = {
+ static uint32_t board_keymap[] = {
        KEY(0, 0, KEY_E),
        KEY(0, 1, KEY_R),
        KEY(0, 2, KEY_T),
@@@ -341,11 -282,8 +342,12 @@@ static void enable_board_wakeup_source(
  
  void __init zoom_peripherals_init(void)
  {
 +      if (wl12xx_set_platform_data(&omap_zoom_wlan_data))
 +              pr_err("error setting wl12xx data\n");
 +
        omap_i2c_init();
 +      platform_device_register(&omap_vwlan_device);
        usb_musb_init(&musb_board_data);
        enable_board_wakeup_source();
+       omap_serial_init();
  }

diff --cc arch/arm/mach-omap2/board-zoom2.c
Simple merge

diff --cc arch/arm/mach-omap2/board-zoom3.c
Simple merge

diff --cc arch/arm/mach-omap2/devices.c
index c5cf1ba08a6f525732c9e76b4e5b109a1b495aca,eaf37994403b4d1ae01efbe4ef883b5396d2e1d2..5a0c148e23bc8fe3a76b25dc80d3933a06caf981
--- 1/arch/arm/mach-omap2/devices.c
--- 2/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -22,10 -22,8 +22,9 @@@
  #include <asm/mach/map.h>
  #include <asm/pmu.h>
  
- #include <plat/control.h>
  #include <plat/tc.h>
  #include <plat/board.h>
 +#include <plat/mcbsp.h>
  #include <mach/gpio.h>
  #include <plat/mmc.h>
  #include <plat/dma.h>
@@@ -954,8 -978,8 +1016,9 @@@ static int __init omap2_init_devices(vo
        /* please keep these calls, and their implementations above,
         * in alphabetical order so they're easier to sort through.
         */
+       omap_disable_wdt();
        omap_hsmmc_reset();
 +      omap_init_audio();
        omap_init_camera();
        omap_init_mbox();
        omap_init_mcspi();

diff --cc arch/arm/mach-omap2/hsmmc.h
Simple merge

diff --cc arch/arm/mach-omap2/include/mach/board-zoom.h
index 80591fda8f8f7732a992d991280a744614445ce3,3986f2476b1c26ba33dfa14bf1c3f5e331e114d7..f93ca3928c3bd65aaa63473a72e732a869a89930
--- 1/arch/arm/mach-omap2/include/mach/board-zoom.h
--- 2/arch/arm/mach-omap2/include/mach/board-zoom.h
+++ b/arch/arm/mach-omap2/include/mach/board-zoom.h
@@@ -1,13 -1,7 +1,9 @@@
  /*
   * Defines for zoom boards
   */
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
- 
  #define ZOOM_NAND_CS    0
  
- extern void __init board_nand_init(struct mtd_partition *, u8 nr_parts, u8 cs);
  extern int __init zoom_debugboard_init(void);
  extern void __init zoom_peripherals_init(void);
 +
 +#define ZOOM2_HEADSET_EXTMUTE_GPIO    153

diff --cc arch/arm/plat-omap/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/fb.c
Simple merge

diff --cc arch/arm/plat-omap/include/plat/mcbsp.h
Simple merge

diff --cc arch/arm/plat-omap/include/plat/usb.h
Simple merge

diff --cc arch/arm/plat-omap/mcbsp.c
Simple merge

diff --cc arch/arm/plat-omap/sram.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
Simple merge

diff --cc drivers/watchdog/omap_wdt.c
Simple merge

diff --cc include/linux/serial_core.h
Simple merge

diff --cc sound/soc/omap/omap-mcbsp.c
Simple merge

diff --cc sound/soc/omap/omap-mcpdm.c
Simple merge