Merge remote-tracking branch 'arm/for-next'

diff --combined arch/arm/mach-exynos4/mach-universal_c210.c
index b3b5d8911004422fdb6cc9001ecb8ab1ae4df475,d7ec84d586f24af1989bd5274b6758bd9f6c9393..2aac6f755c8e242d8be13c01a063101a1b65c036
--- 1/arch/arm/mach-exynos4/mach-universal_c210.c
--- 2/arch/arm/mach-exynos4/mach-universal_c210.c
+++ b/arch/arm/mach-exynos4/mach-universal_c210.c
@@@ -79,7 -79,7 +79,7 @@@ static struct s3c2410_uartcfg universal
  };
  
  static struct regulator_consumer_supply max8952_consumer =
 -      REGULATOR_SUPPLY("vddarm", NULL);
 +      REGULATOR_SUPPLY("vdd_arm", NULL);
  
  static struct max8952_platform_data universal_max8952_pdata __initdata = {
        .gpio_vid0      = EXYNOS4_GPX0(3),
@@@ -105,7 -105,7 +105,7 @@@
  };
  
  static struct regulator_consumer_supply lp3974_buck1_consumer =
 -      REGULATOR_SUPPLY("vddint", NULL);
 +      REGULATOR_SUPPLY("vdd_int", NULL);
  
  static struct regulator_consumer_supply lp3974_buck2_consumer =
        REGULATOR_SUPPLY("vddg3d", NULL);
@@@ -762,7 -762,7 +762,7 @@@ static void __init universal_machine_in
  
  MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
        /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
-       .boot_params    = S5P_PA_SDRAM + 0x100,
+       .atag_offset    = 0x100,
        .init_irq       = exynos4_init_irq,
        .map_io         = universal_map_io,
        .init_machine   = universal_machine_init,

diff --combined arch/arm/mach-orion5x/dns323-setup.c
index c105556a0ee1a9ab158742e8d3b417eae7a8646b,418b80ca55ac8086773f10bba33fcaf31ba42f65..343f60e9639fe54a9f3cf59978ceb17730d6fcb6
--- 1/arch/arm/mach-orion5x/dns323-setup.c
--- 2/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@@ -13,7 -13,7 +13,7 @@@
   * License, or (at your option) any later version.
   *
   */
- 
+ #include <linux/gpio.h>
  #include <linux/kernel.h>
  #include <linux/init.h>
  #include <linux/delay.h>
@@@ -30,7 -30,6 +30,6 @@@
  #include <linux/phy.h>
  #include <linux/marvell_phy.h>
  #include <asm/mach-types.h>
- #include <asm/gpio.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/pci.h>
  #include <mach/orion5x.h>
@@@ -77,7 -76,7 +76,7 @@@ static int __init dns323_pci_map_irq(co
        /*
         * Check for devices with hard-wired IRQs.
         */
 -      irq = orion5x_pci_map_irq(const dev, slot, pin);
 +      irq = orion5x_pci_map_irq(dev, slot, pin);
        if (irq != -1)
                return irq;
  
@@@ -730,7 -729,7 +729,7 @@@ static void __init dns323_init(void
  /* Warning: D-Link uses a wrong mach-type (=526) in their bootloader */
  MACHINE_START(DNS323, "D-Link DNS-323")
        /* Maintainer: Herbert Valerio Riedel <hvr@gnu.org> */
-       .boot_params    = 0x00000100,
+       .atag_offset    = 0x100,
        .init_machine   = dns323_init,
        .map_io         = orion5x_map_io,
        .init_early     = orion5x_init_early,

diff --combined arch/arm/mach-shmobile/board-ag5evm.c
index cdfdd624d21dd27719c156639588c06e95be1b9d,167a67c5ca54312f516d0a13f505f67bf347bbe0..5fde49da399a3a09c3d80dde524a833480662079
--- 1/arch/arm/mach-shmobile/board-ag5evm.c
--- 2/arch/arm/mach-shmobile/board-ag5evm.c
+++ b/arch/arm/mach-shmobile/board-ag5evm.c
@@@ -37,6 -37,7 +37,7 @@@
  #include <linux/mmc/sh_mobile_sdhi.h>
  #include <linux/mfd/tmio.h>
  #include <linux/sh_clk.h>
+ #include <linux/dma-mapping.h>
  #include <video/sh_mobile_lcdc.h>
  #include <video/sh_mipi_dsi.h>
  #include <sound/sh_fsi.h>
@@@ -341,7 -342,6 +342,7 @@@ static struct platform_device mipidsi0_
  static struct sh_mobile_sdhi_info sdhi0_info = {
        .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
        .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
 +      .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
        .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
        .tmio_ocr_mask  = MMC_VDD_27_28 | MMC_VDD_28_29,
  };
@@@ -383,7 -383,7 +384,7 @@@ void ag5evm_sdhi1_set_pwr(struct platfo
  }
  
  static struct sh_mobile_sdhi_info sh_sdhi1_info = {
 -      .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE,
 +      .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
        .tmio_caps      = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,
        .tmio_ocr_mask  = MMC_VDD_32_33 | MMC_VDD_33_34,
        .set_pwr        = ag5evm_sdhi1_set_pwr,
@@@ -447,6 -447,8 +448,8 @@@ static struct map_desc ag5evm_io_desc[
  static void __init ag5evm_map_io(void)
  {
        iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc));
+       /* DMA memory at 0xf6000000 - 0xffdfffff */
+       init_consistent_dma_size(158 << 20);
  
        /* setup early devices and console here as well */
        sh73a0_add_early_devices();

diff --combined arch/arm/mach-shmobile/board-ap4evb.c
index 523f608eb8cf0109609188b4589f56e03bdc4a36,ec8f9d960e27db23689d8013af28714f092a15af..b622d8d3ab7297da7bd1b3d76ec8a89a55d5f00f
--- 1/arch/arm/mach-shmobile/board-ap4evb.c
--- 2/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
@@@ -42,6 -42,7 +42,7 @@@
  #include <linux/leds.h>
  #include <linux/input/sh_keysc.h>
  #include <linux/usb/r8a66597.h>
+ #include <linux/dma-mapping.h>
  
  #include <media/sh_mobile_ceu.h>
  #include <media/sh_mobile_csi2.h>
@@@ -1170,6 -1171,8 +1171,8 @@@ static struct map_desc ap4evb_io_desc[
  static void __init ap4evb_map_io(void)
  {
        iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));
+       /* DMA memory at 0xf6000000 - 0xffdfffff */
+       init_consistent_dma_size(158 << 20);
  
        /* setup early devices and console here as well */
        sh7372_add_early_devices();
@@@ -1412,7 -1415,6 +1415,7 @@@ static void __init ap4evb_init(void
        fsi_init_pm_clock();
        sh7372_pm_init();
        pm_clk_add(&fsi_device.dev, "spu2");
 +      pm_clk_add(&lcdc1_device.dev, "hdmi");
  }
  
  static void __init ap4evb_timer_init(void)

diff --combined arch/arm/mach-shmobile/board-mackerel.c
index 17c19dc2560431b99699e28569f52f68f9202cc8,671925dcf5f987278fd287e8aa41609fadb58a1e..de2253d7f15764197b8eea75abd683a2dffea30b
--- 1/arch/arm/mach-shmobile/board-mackerel.c
--- 2/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@@ -45,6 -45,7 +45,7 @@@
  #include <linux/tca6416_keypad.h>
  #include <linux/usb/r8a66597.h>
  #include <linux/usb/renesas_usbhs.h>
+ #include <linux/dma-mapping.h>
  
  #include <video/sh_mobile_hdmi.h>
  #include <video/sh_mobile_lcdc.h>
@@@ -641,8 -642,6 +642,8 @@@ static struct usbhs_private usbhs0_priv
                },
                .driver_param = {
                        .buswait_bwait  = 4,
 +                      .d0_tx_id       = SHDMA_SLAVE_USB0_TX,
 +                      .d1_rx_id       = SHDMA_SLAVE_USB0_RX,
                },
        },
  };
@@@ -812,8 -811,6 +813,8 @@@ static struct usbhs_private usbhs1_priv
                        .buswait_bwait  = 4,
                        .pipe_type      = usbhs1_pipe_cfg,
                        .pipe_size      = ARRAY_SIZE(usbhs1_pipe_cfg),
 +                      .d0_tx_id       = SHDMA_SLAVE_USB1_TX,
 +                      .d1_rx_id       = SHDMA_SLAVE_USB1_RX,
                },
        },
  };
@@@ -1381,6 -1378,8 +1382,8 @@@ static struct map_desc mackerel_io_desc
  static void __init mackerel_map_io(void)
  {
        iotable_init(mackerel_io_desc, ARRAY_SIZE(mackerel_io_desc));
+       /* DMA memory at 0xf6000000 - 0xffdfffff */
+       init_consistent_dma_size(158 << 20);
  
        /* setup early devices and console here as well */
        sh7372_add_early_devices();
@@@ -1592,7 -1591,6 +1595,7 @@@ static void __init mackerel_init(void
        hdmi_init_pm_clock();
        sh7372_pm_init();
        pm_clk_add(&fsi_device.dev, "spu2");
 +      pm_clk_add(&hdmi_lcdc_device.dev, "hdmi");
  }
  
  static void __init mackerel_timer_init(void)