21 files changed, 107 insertions, 53 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index c1ce813fcc4a..f37cf9fa5fa0 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -25,6 +25,8 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
         exynos4210-trats.dtb \
         exynos5250-smdk5250.dtb
 dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
+dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
+        integratorcp.dtb
 dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
         kirkwood-dns325.dtb \
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 96fb824b5e6e..5a00022383e7 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -4,21 +4,32 @@
         compatible = "marvell,dove";
         model = "Marvell Armada 88AP510 SoC";
 
-        interrupt-parent = <&intc>;
-
-        intc: interrupt-controller {
-                compatible = "marvell,orion-intc";
-                interrupt-controller;
-                #interrupt-cells = <1>;
-                reg = <0xf1020204 0x04>,
-                      <0xf1020214 0x04>;
-        };
-
-        mbus@f1000000 {
+        soc@f1000000 {
                 compatible = "simple-bus";
-                ranges = <0 0xf1000000 0x4000000>;
                 #address-cells = <1>;
                 #size-cells = <1>;
+                interrupt-parent = <&intc>;
+
+                ranges = <0xc8000000 0xc8000000 0x0100000   /* CESA SRAM   1M */
+                          0xe0000000 0xe0000000 0x8000000   /* PCIe0 Mem 128M */
+                          0xe8000000 0xe8000000 0x8000000   /* PCIe1 Mem 128M */
+                          0xf0000000 0xf0000000 0x0100000   /* ScratchPad  1M */
+                          0x00000000 0xf1000000 0x1000000   /* SB/NB regs 16M */
+                          0xf2000000 0xf2000000 0x0100000   /* PCIe0 I/O   1M */
+                          0xf2100000 0xf2100000 0x0100000   /* PCIe0 I/O   1M */
+                          0xf8000000 0xf8000000 0x8000000>; /* BootROM   128M */
+
+                l2: l2-cache {
+                        compatible = "marvell,tauros2-cache";
+                        marvell,tauros2-cache-features = <0>;
+                };
+
+                intc: interrupt-controller {
+                        compatible = "marvell,orion-intc";
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        reg = <0x20204 0x04>, <0x20214 0x04>;
+                };
 
                 uart0: serial@12000 {
                         compatible = "ns16550a";
@@ -56,11 +67,6 @@
                         status = "disabled";
                 };
 
-                wdt: wdt@20300 {
-                        compatible = "marvell,orion-wdt";
-                        reg = <0x20300 0x28>;
-                };
-
                 gpio0: gpio@d0400 {
                         compatible = "marvell,orion-gpio";
                         #gpio-cells = <2>;
@@ -139,5 +145,14 @@
                         nr-ports = <1>;
                         status = "disabled";
                 };
+
+                crypto: crypto@30000 {
+                        compatible = "marvell,orion-crypto";
+                        reg = <0x30000 0x10000>,
+                              <0xc8000000 0x800>;
+                        reg-names = "regs", "sram";
+                        interrupts = <31>;
+                        status = "okay";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 15df4c105e89..5bfa02a3f85c 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -37,6 +37,13 @@
                                         pinctrl_hog: hoggrp {
                                                 fsl,pins = <
                                                         176  0x80000000 /* MX6Q_PAD_EIM_D25__GPIO_3_25 */
+                                                >;
+                                        };
+                                };
+
+                                arm2 {
+                                        pinctrl_usdhc3_arm2: usdhc3grp-arm2 {
+                                                fsl,pins = <
                                                         1363 0x80000000 /* MX6Q_PAD_NANDF_CS0__GPIO_6_11 */
                                                         1369 0x80000000 /* MX6Q_PAD_NANDF_CS1__GPIO_6_14 */
                                                 >;
@@ -58,7 +65,8 @@
                                 wp-gpios = <&gpio6 14 0>;
                                 vmmc-supply = <&reg_3p3v>;
                                 pinctrl-names = "default";
-                                pinctrl-0 = <&pinctrl_usdhc3_1>;
+                                pinctrl-0 = <&pinctrl_usdhc3_1
+                                             &pinctrl_usdhc3_arm2>;
                                 status = "okay";
                         };
 
diff --git a/arch/arm/boot/dts/wm8505.dtsi b/arch/arm/boot/dts/wm8505.dtsi
index b459691655ab..330f833ac3b0 100644
--- a/arch/arm/boot/dts/wm8505.dtsi
+++ b/arch/arm/boot/dts/wm8505.dtsi
@@ -71,13 +71,13 @@
                 ehci@d8007100 {
                         compatible = "via,vt8500-ehci";
                         reg = <0xd8007100 0x200>;
-                        interrupts = <43>;
+                        interrupts = <1>;
                 };
 
                 uhci@d8007300 {
                         compatible = "platform-uhci";
                         reg = <0xd8007300 0x200>;
-                        interrupts = <43>;
+                        interrupts = <0>;
                 };
 
                 fb@d8050800 {
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index b37bef1d5ffa..f723fe13d0f0 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -32,6 +32,7 @@
 #include <linux/irq.h>
 #include <plat/time.h>
 #include <linux/platform_data/usb-ehci-orion.h>
+#include <plat/irq.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
 #include "common.h"
@@ -109,8 +110,8 @@ static void __init dove_clk_init(void)
 
         orion_clkdev_add(NULL, "orion-ehci.0", usb0);
         orion_clkdev_add(NULL, "orion-ehci.1", usb1);
-        orion_clkdev_add(NULL, "mv643xx_eth.0", ge);
-        orion_clkdev_add("0", "sata_mv.0", sata);
+        orion_clkdev_add(NULL, "mv643xx_eth_port.0", ge);
+        orion_clkdev_add(NULL, "sata_mv.0", sata);
         orion_clkdev_add("0", "pcie", pex0);
         orion_clkdev_add("1", "pcie", pex1);
         orion_clkdev_add(NULL, "sdhci-dove.0", sdio0);
@@ -399,7 +400,7 @@ static void __init dove_dt_init(void)
                 (dove_tclk + 499999) / 1000000);
 
 #ifdef CONFIG_CACHE_TAUROS2
-        tauros2_init();
+        tauros2_init(0);
 #endif
         dove_setup_cpu_mbus();
 
@@ -415,7 +416,6 @@ static void __init dove_dt_init(void)
         dove_ehci0_init();
         dove_ehci1_init();
         dove_pcie_init(1, 1);
-        dove_crypto_init();
 
         of_platform_populate(NULL, of_default_bus_match_table,
                              dove_auxdata_lookup, NULL);
diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c
index bb15b26041cb..0ef4435b1657 100644
--- a/arch/arm/mach-dove/pcie.c
+++ b/arch/arm/mach-dove/pcie.c
@@ -10,6 +10,7 @@
 
 #include <linux/kernel.h>
 #include <linux/pci.h>
+#include <linux/clk.h>
 #include <video/vga.h>
 #include <asm/mach/pci.h>
 #include <asm/mach/arch.h>
@@ -188,6 +189,10 @@ static void __init add_pcie_port(int index, void __iomem *base)
 
         if (orion_pcie_link_up(base)) {
                 struct pcie_port *pp = &pcie_port[num_pcie_ports++];
+                struct clk *clk = clk_get_sys("pcie", (index ? "1" : "0"));
+
+                if (!IS_ERR(clk))
+                        clk_prepare_enable(clk);
 
                 printk(KERN_INFO "link up\n");
 
diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c
index d661d138f270..6efc30c961a5 100644
--- a/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@ -3294,7 +3294,7 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "auxclk5_src_ck",               &auxclk5_src_ck,        CK_443X),
         CLK(NULL,       "auxclk5_ck",                   &auxclk5_ck,    CK_443X),
         CLK(NULL,       "auxclkreq5_ck",                &auxclkreq5_ck, CK_443X),
-        CLK(NULL,       "gpmc_ck",                      &dummy_ck,      CK_443X),
+        CLK("omap-gpmc",        "fck",                          &dummy_ck,      CK_443X),
         CLK("omap_i2c.1",       "ick",                          &dummy_ck,      CK_443X),
         CLK("omap_i2c.2",       "ick",                          &dummy_ck,      CK_443X),
         CLK("omap_i2c.3",       "ick",                          &dummy_ck,      CK_443X),
diff --git a/arch/arm/mach-omap2/clockdomain.c b/arch/arm/mach-omap2/clockdomain.c
index cbb879139c51..512e79a842cb 100644
--- a/arch/arm/mach-omap2/clockdomain.c
+++ b/arch/arm/mach-omap2/clockdomain.c
@@ -925,15 +925,18 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm)
         if (!clkdm || !arch_clkdm || !arch_clkdm->clkdm_clk_enable)
                 return -EINVAL;
 
+        spin_lock_irqsave(&clkdm->lock, flags);
+
         /*
          * For arch's with no autodeps, clkcm_clk_enable
          * should be called for every clock instance or hwmod that is
          * enabled, so the clkdm can be force woken up.
          */
-        if ((atomic_inc_return(&clkdm->usecount) > 1) && autodeps)
+        if ((atomic_inc_return(&clkdm->usecount) > 1) && autodeps) {
+                spin_unlock_irqrestore(&clkdm->lock, flags);
                 return 0;
+        }
 
-        spin_lock_irqsave(&clkdm->lock, flags);
         arch_clkdm->clkdm_clk_enable(clkdm);
         pwrdm_state_switch(clkdm->pwrdm.ptr);
         spin_unlock_irqrestore(&clkdm->lock, flags);
@@ -950,15 +953,19 @@ static int _clkdm_clk_hwmod_disable(struct clockdomain *clkdm)
         if (!clkdm || !arch_clkdm || !arch_clkdm->clkdm_clk_disable)
                 return -EINVAL;
 
+        spin_lock_irqsave(&clkdm->lock, flags);
+
         if (atomic_read(&clkdm->usecount) == 0) {
+                spin_unlock_irqrestore(&clkdm->lock, flags);
                 WARN_ON(1); /* underflow */
                 return -ERANGE;
         }
 
-        if (atomic_dec_return(&clkdm->usecount) > 0)
+        if (atomic_dec_return(&clkdm->usecount) > 0) {
+                spin_unlock_irqrestore(&clkdm->lock, flags);
                 return 0;
+        }
 
-        spin_lock_irqsave(&clkdm->lock, flags);
         arch_clkdm->clkdm_clk_disable(clkdm);
         pwrdm_state_switch(clkdm->pwrdm.ptr);
         spin_unlock_irqrestore(&clkdm->lock, flags);
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index c8c211731d26..cba60e05e32e 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -341,7 +341,7 @@ static void __init omap_init_dmic(void)
 
         oh = omap_hwmod_lookup("dmic");
         if (!oh) {
-                printk(KERN_ERR "Could not look up mcpdm hw_mod\n");
+                pr_err("Could not look up dmic hw_mod\n");
                 return;
         }
 
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 5ac5cf30406a..92b5718fa722 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -868,9 +868,9 @@ static void __devexit gpmc_mem_exit(void)
 
 }
 
-static void __devinit gpmc_mem_init(void)
+static int __devinit gpmc_mem_init(void)
 {
-        int cs;
+        int cs, rc;
         unsigned long boot_rom_space = 0;
 
         /* never allocate the first page, to facilitate bug detection;
@@ -890,13 +890,21 @@ static void __devinit gpmc_mem_init(void)
                 if (!gpmc_cs_mem_enabled(cs))
                         continue;
                 gpmc_cs_get_memconf(cs, &base, &size);
-                if (gpmc_cs_insert_mem(cs, base, size) < 0)
-                        BUG();
+                rc = gpmc_cs_insert_mem(cs, base, size);
+                if (IS_ERR_VALUE(rc)) {
+                        while (--cs >= 0)
+                                if (gpmc_cs_mem_enabled(cs))
+                                        gpmc_cs_delete_mem(cs);
+                        return rc;
+                }
         }
+
+        return 0;
 }
 
 static __devinit int gpmc_probe(struct platform_device *pdev)
 {
+        int rc;
         u32 l;
         struct resource *res;
 
@@ -936,7 +944,13 @@ static __devinit int gpmc_probe(struct platform_device *pdev)
         dev_info(gpmc_dev, "GPMC revision %d.%d\n", GPMC_REVISION_MAJOR(l),
                  GPMC_REVISION_MINOR(l));
 
-        gpmc_mem_init();
+        rc = gpmc_mem_init();
+        if (IS_ERR_VALUE(rc)) {
+                clk_disable_unprepare(gpmc_l3_clk);
+                clk_put(gpmc_l3_clk);
+                dev_err(gpmc_dev, "failed to reserve memory\n");
+                return rc;
+        }
 
         if (IS_ERR_VALUE(gpmc_setup_irq()))
                 dev_warn(gpmc_dev, "gpmc_setup_irq failed\n");
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 44f9aa7ec0c0..69e46631a7cd 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -467,7 +467,7 @@ OMAP_SYS_TIMER(3_am33xx)
 #ifdef CONFIG_ARCH_OMAP4
 #ifdef CONFIG_LOCAL_TIMERS
 static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,
-                              OMAP44XX_LOCAL_TWD_BASE, 29 + OMAP_INTC_START);
+                              OMAP44XX_LOCAL_TWD_BASE, 29);
 #endif
 
 static void __init omap4_timer_init(void)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2912eab3b967..3cc8b1c21da9 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1196,7 +1196,7 @@ static void __init eva_init(void)
 
 #ifdef CONFIG_CACHE_L2X0
         /* Early BRESP enable, Shared attribute override enable, 32K*8way */
-        l2x0_init(__io(0xf0002000), 0x40440000, 0x82000fff);
+        l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
 #endif
 
         i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 3cafb6ab5e9a..37b2a3133b3b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -24,17 +24,17 @@
 #include <linux/clkdev.h>
 #include <mach/common.h>
 
-#define FRQMR   0xffc80014
-#define MSTPCR0 0xffc80030
-#define MSTPCR1 0xffc80034
-#define MSTPCR3 0xffc8003c
-#define MSTPSR1 0xffc80044
-#define MSTPSR4 0xffc80048
-#define MSTPSR6 0xffc8004c
-#define MSTPCR4 0xffc80050
-#define MSTPCR5 0xffc80054
-#define MSTPCR6 0xffc80058
-#define MSTPCR7 0xffc80040
+#define FRQMR           IOMEM(0xffc80014)
+#define MSTPCR0         IOMEM(0xffc80030)
+#define MSTPCR1         IOMEM(0xffc80034)
+#define MSTPCR3         IOMEM(0xffc8003c)
+#define MSTPSR1         IOMEM(0xffc80044)
+#define MSTPSR4         IOMEM(0xffc80048)
+#define MSTPSR6         IOMEM(0xffc8004c)
+#define MSTPCR4         IOMEM(0xffc80050)
+#define MSTPCR5         IOMEM(0xffc80054)
+#define MSTPCR6         IOMEM(0xffc80058)
+#define MSTPCR7         IOMEM(0xffc80040)
 
 /* ioremap() through clock mapping mandatory to avoid
  * collision with ARM coherent DMA virtual memory range.
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c
index 57e235f4ac74..aa5325cd1c42 100644
--- a/arch/arm/mach-tegra/board-dt-tegra20.c
+++ b/arch/arm/mach-tegra/board-dt-tegra20.c
@@ -182,7 +182,7 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)")
         .init_early     = tegra20_init_early,
         .init_irq       = tegra_dt_init_irq,
         .handle_irq     = gic_handle_irq,
-        .timer          = &tegra_timer,
+        .timer          = &tegra_sys_timer,
         .init_machine   = tegra_dt_init,
         .init_late      = tegra_dt_init_late,
         .restart        = tegra_assert_system_reset,
diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c
index e4a676d4ddf7..5e92a81f9a2e 100644
--- a/arch/arm/mach-tegra/board-dt-tegra30.c
+++ b/arch/arm/mach-tegra/board-dt-tegra30.c
@@ -89,7 +89,7 @@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Tegra30 (Flattened Device Tree)")
         .init_early     = tegra30_init_early,
         .init_irq       = tegra_dt_init_irq,
         .handle_irq     = gic_handle_irq,
-        .timer          = &tegra_timer,
+        .timer          = &tegra_sys_timer,
         .init_machine   = tegra30_dt_init,
         .init_late      = tegra_init_late,
         .restart        = tegra_assert_system_reset,
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index f88e5143c767..91fbe733a21e 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -55,5 +55,5 @@ static inline int harmony_pcie_init(void) { return 0; }
 
 void __init tegra_paz00_wifikill_init(void);
 
-extern struct sys_timer tegra_timer;
+extern struct sys_timer tegra_sys_timer;
 #endif
diff --git a/arch/arm/mach-tegra/tegra20_clocks_data.c b/arch/arm/mach-tegra/tegra20_clocks_data.c
index cc9b5fd8c3d3..8d398a33adf7 100644
--- a/arch/arm/mach-tegra/tegra20_clocks_data.c
+++ b/arch/arm/mach-tegra/tegra20_clocks_data.c
@@ -953,6 +953,7 @@ PERIPH_CLK(pcie_xclk,	NULL,		  "pcie_xclk",  74,     0,	26000000,  mux_clk_m,
 static struct clk *tegra_list_clks[] = {
         &tegra_apbdma,
         &tegra_rtc,
+        &tegra_timer,
         &tegra_i2s1,
         &tegra_i2s2,
         &tegra_spdif_out,
diff --git a/arch/arm/mach-tegra/tegra30_clocks.c b/arch/arm/mach-tegra/tegra30_clocks.c
index 5cd502c27163..e9de5dfd94ec 100644
--- a/arch/arm/mach-tegra/tegra30_clocks.c
+++ b/arch/arm/mach-tegra/tegra30_clocks.c
@@ -1199,7 +1199,7 @@ static long tegra30_pll_round_rate(struct clk_hw *hw, unsigned long rate,
 {
         struct clk_tegra *c = to_clk_tegra(hw);
         unsigned long input_rate = *prate;
-        unsigned long output_rate = *prate;
+        u64 output_rate = *prate;
         const struct clk_pll_freq_table *sel;
         struct clk_pll_freq_table cfg;
         int mul;
diff --git a/arch/arm/mach-tegra/tegra30_clocks_data.c b/arch/arm/mach-tegra/tegra30_clocks_data.c
index d92cb556ae35..3d2e5532a9ea 100644
--- a/arch/arm/mach-tegra/tegra30_clocks_data.c
+++ b/arch/arm/mach-tegra/tegra30_clocks_data.c
@@ -1143,6 +1143,7 @@ struct clk *tegra_list_clks[] = {
         &tegra_apbdma,
         &tegra_rtc,
         &tegra_kbc,
+        &tegra_timer,
         &tegra_kfuse,
         &tegra_fuse,
         &tegra_fuse_burn,
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index eccdce983043..d3b8c8e7368f 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -245,7 +245,7 @@ static void __init tegra_init_timer(void)
         register_persistent_clock(NULL, tegra_read_persistent_clock);
 }
 
-struct sys_timer tegra_timer = {
+struct sys_timer tegra_sys_timer = {
         .init = tegra_init_timer,
 };
 
diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c
index c7a4c0902b38..5a4678edd65a 100644
--- a/arch/arm/plat-omap/debug-devices.c
+++ b/arch/arm/plat-omap/debug-devices.c
@@ -16,6 +16,7 @@
 #include <linux/smc91x.h>
 
 #include <mach/hardware.h>
+#include "../mach-omap2/debug-devices.h"
 
 /* Many OMAP development platforms reuse the same "debug board"; these
  * platforms include H2, H3, H4, and Perseus2.