12 files changed, 89 insertions, 46 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b25c9d3c379a..9124ff75fe53 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -279,7 +279,6 @@ config ARCH_INTEGRATOR
         select ICST
         select GENERIC_CLOCKEVENTS
         select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_FPGA_IRQ
         select NEED_MACH_IO_H
         select NEED_MACH_MEMORY_H
@@ -336,7 +335,6 @@ config ARCH_VEXPRESS
         select ICST
         select NO_IOPORT
         select PLAT_VERSATILE
-        select PLAT_VERSATILE_CLOCK
         select PLAT_VERSATILE_CLCD
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         help
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index dc09a735b04a..9a33077130e8 100644
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -4,7 +4,7 @@
 
 / {
         model = "D-Link DNS-320 NAS (Rev A1)";
-        compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
         memory {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
index c2a5562525d2..16734c1b5dfe 100644
--- a/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -4,7 +4,7 @@
 
 / {
         model = "D-Link DNS-325 NAS (Rev A1)";
-        compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
         memory {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index a5376b84227f..78b0f06a09a2 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -4,7 +4,7 @@
 
 / {
         model = "Globalscale Technologies Dreamplug";
-        compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        compatible = "globalscale,dreamplug-003-ds2001", "globalscale,dreamplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
         memory {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index ada0f0c23085..f59dcf6dc45f 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -4,7 +4,7 @@
 
 / {
         model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
-        compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
         memory {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 1ba75d4adecc..026a1f82d813 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -4,7 +4,7 @@
 
 / {
         model = "Iomega Iconnect";
-        compatible = "iom,iconnect-1.1", "iom,iconnect", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        compatible = "iom,iconnect-1.1", "iom,iconnect", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
         memory {
                 device_type = "memory";
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 926528b81baa..f95dbc190ab6 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -1,7 +1,7 @@
 /include/ "skeleton.dtsi"
 
 / {
-        compatible = "mrvl,kirkwood";
+        compatible = "marvell,kirkwood";
 
         ocp@f1000000 {
                 compatible = "simple-bus";
@@ -28,7 +28,7 @@
                 };
 
                 rtc@10300 {
-                        compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc";
+                        compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
                         reg = <0x10300 0x20>;
                         interrupts = <53>;
                 };
@@ -39,7 +39,7 @@
                         cle = <0>;
                         ale = <1>;
                         bank-width = <1>;
-                        compatible = "mrvl,orion-nand";
+                        compatible = "marvell,orion-nand";
                         reg = <0x3000000 0x400>;
                         chip-delay = <25>;
                         /* set partition map and/or chip-delay in board dts */
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 9de5636023f6..27fb8a67ea42 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -276,9 +276,11 @@
 
         usb@c5000000 {
                 status = "okay";
+                nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
         };
 
         usb@c5004000 {
+                status = "okay";
                 nvidia,phy-reset-gpio = <&gpio 168 0>; /* gpio PV0 */
         };
 
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 9493076fc594..4db5de54b6a7 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -101,8 +101,8 @@ void __init dove_ehci1_init(void)
  ****************************************************************************/
 void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data)
 {
-        orion_ge00_init(eth_data,
-                        DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, 0);
+        orion_ge00_init(eth_data, DOVE_GE00_PHYS_BASE,
+                        IRQ_DOVE_GE00_SUM, IRQ_DOVE_GE00_ERR);
 }
 
 /*****************************************************************************
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index f261cd242643..c9201539ffbd 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -67,6 +67,14 @@ void __init kirkwood_map_io(void)
  * CLK tree
  ****************************************************************************/
 
+static void enable_sata0(void)
+{
+        /* Enable PLL and IVREF */
+        writel(readl(SATA0_PHY_MODE_2) | 0xf, SATA0_PHY_MODE_2);
+        /* Enable PHY */
+        writel(readl(SATA0_IF_CTRL) & ~0x200, SATA0_IF_CTRL);
+}
+
 static void disable_sata0(void)
 {
         /* Disable PLL and IVREF */
@@ -75,6 +83,14 @@ static void disable_sata0(void)
         writel(readl(SATA0_IF_CTRL) | 0x200, SATA0_IF_CTRL);
 }
 
+static void enable_sata1(void)
+{
+        /* Enable PLL and IVREF */
+        writel(readl(SATA1_PHY_MODE_2) | 0xf, SATA1_PHY_MODE_2);
+        /* Enable PHY */
+        writel(readl(SATA1_IF_CTRL) & ~0x200, SATA1_IF_CTRL);
+}
+
 static void disable_sata1(void)
 {
         /* Disable PLL and IVREF */
@@ -107,23 +123,38 @@ static void disable_pcie1(void)
         }
 }
 
-/* An extended version of the gated clk. This calls fn() before
- * disabling the clock. We use this to turn off PHYs etc. */
+/* An extended version of the gated clk. This calls fn_en()/fn_dis
+ * before enabling/disabling the clock.  We use this to turn on/off
+ * PHYs etc.  */
 struct clk_gate_fn {
         struct clk_gate gate;
-        void (*fn)(void);
+        void (*fn_en)(void);
+        void (*fn_dis)(void);
 };
 
 #define to_clk_gate_fn(_gate) container_of(_gate, struct clk_gate_fn, gate)
 #define to_clk_gate(_hw) container_of(_hw, struct clk_gate, hw)
 
+static int clk_gate_fn_enable(struct clk_hw *hw)
+{
+        struct clk_gate *gate = to_clk_gate(hw);
+        struct clk_gate_fn *gate_fn = to_clk_gate_fn(gate);
+        int ret;
+
+        ret = clk_gate_ops.enable(hw);
+        if (!ret && gate_fn->fn_en)
+                gate_fn->fn_en();
+
+        return ret;
+}
+
 static void clk_gate_fn_disable(struct clk_hw *hw)
 {
         struct clk_gate *gate = to_clk_gate(hw);
         struct clk_gate_fn *gate_fn = to_clk_gate_fn(gate);
 
-        if (gate_fn->fn)
-                gate_fn->fn();
+        if (gate_fn->fn_dis)
+                gate_fn->fn_dis();
 
         clk_gate_ops.disable(hw);
 }
@@ -135,7 +166,7 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
                 const char *parent_name, unsigned long flags,
                 void __iomem *reg, u8 bit_idx,
                 u8 clk_gate_flags, spinlock_t *lock,
-                void (*fn)(void))
+                void (*fn_en)(void), void (*fn_dis)(void))
 {
         struct clk_gate_fn *gate_fn;
         struct clk *clk;
@@ -159,11 +190,14 @@ static struct clk __init *clk_register_gate_fn(struct device *dev,
         gate_fn->gate.flags = clk_gate_flags;
         gate_fn->gate.lock = lock;
         gate_fn->gate.hw.init = &init;
-        gate_fn->fn = fn;
+        gate_fn->fn_en = fn_en;
+        gate_fn->fn_dis = fn_dis;
 
-        /* ops is the gate ops, but with our disable function */
-        if (clk_gate_fn_ops.disable != clk_gate_fn_disable) {
+        /* ops is the gate ops, but with our enable/disable functions */
+        if (clk_gate_fn_ops.enable != clk_gate_fn_enable ||
+            clk_gate_fn_ops.disable != clk_gate_fn_disable) {
                 clk_gate_fn_ops = clk_gate_ops;
+                clk_gate_fn_ops.enable = clk_gate_fn_enable;
                 clk_gate_fn_ops.disable = clk_gate_fn_disable;
         }
 
@@ -187,11 +221,12 @@ static struct clk __init *kirkwood_register_gate(const char *name, u8 bit_idx)
 
 static struct clk __init *kirkwood_register_gate_fn(const char *name,
                                                     u8 bit_idx,
-                                                    void (*fn)(void))
+                                                    void (*fn_en)(void),
+                                                    void (*fn_dis)(void))
 {
         return clk_register_gate_fn(NULL, name, "tclk", 0,
                                     (void __iomem *)CLOCK_GATING_CTRL,
-                                    bit_idx, 0, &gating_lock, fn);
+                                    bit_idx, 0, &gating_lock, fn_en, fn_dis);
 }
 
 static struct clk *ge0, *ge1;
@@ -208,18 +243,18 @@ void __init kirkwood_clk_init(void)
         ge0 = kirkwood_register_gate("ge0",    CGC_BIT_GE0);
         ge1 = kirkwood_register_gate("ge1",    CGC_BIT_GE1);
         sata0 = kirkwood_register_gate_fn("sata0",  CGC_BIT_SATA0,
-                                          disable_sata0);
+                                          enable_sata0, disable_sata0);
         sata1 = kirkwood_register_gate_fn("sata1",  CGC_BIT_SATA1,
-                                          disable_sata1);
+                                          enable_sata1, disable_sata1);
         usb0 = kirkwood_register_gate("usb0",   CGC_BIT_USB0);
         sdio = kirkwood_register_gate("sdio",   CGC_BIT_SDIO);
         crypto = kirkwood_register_gate("crypto", CGC_BIT_CRYPTO);
         xor0 = kirkwood_register_gate("xor0",   CGC_BIT_XOR0);
         xor1 = kirkwood_register_gate("xor1",   CGC_BIT_XOR1);
         pex0 = kirkwood_register_gate_fn("pex0",   CGC_BIT_PEX0,
-                                         disable_pcie0);
+                                         NULL, disable_pcie0);
         pex1 = kirkwood_register_gate_fn("pex1",   CGC_BIT_PEX1,
-                                         disable_pcie1);
+                                         NULL, disable_pcie1);
         audio = kirkwood_register_gate("audio",  CGC_BIT_AUDIO);
         kirkwood_register_gate("tdm",    CGC_BIT_TDM);
         kirkwood_register_gate("tsu",    CGC_BIT_TSU);
@@ -241,6 +276,11 @@ void __init kirkwood_clk_init(void)
         orion_clkdev_add("0", "pcie", pex0);
         orion_clkdev_add("1", "pcie", pex1);
         orion_clkdev_add(NULL, "kirkwood-i2s", audio);
+
+        /* Marvell says runit is used by SPI, UART, NAND, TWSI, ...,
+         * so should never be gated.
+         */
+        clk_prepare_enable(runit);
 }
 
 /*****************************************************************************
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 648bdd05d38b..8dabfe81d07c 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -162,7 +162,7 @@ enum mac_oui {
 static void __init update_fec_mac_prop(enum mac_oui oui)
 {
         struct device_node *np, *from = NULL;
-        struct property *oldmac, *newmac;
+        struct property *newmac;
         const u32 *ocotp = mxs_get_ocotp();
         u8 *macaddr;
         u32 val;
@@ -208,11 +208,7 @@ static void __init update_fec_mac_prop(enum mac_oui oui)
                 macaddr[4] = (val >> 8) & 0xff;
                 macaddr[5] = (val >> 0) & 0xff;
 
-                oldmac = of_find_property(np, newmac->name, NULL);
-                if (oldmac)
-                        prom_update_property(np, newmac, oldmac);
-                else
-                        prom_add_property(np, newmac);
+                prom_update_property(np, newmac);
         }
 }
 
diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c
index 44dcb2e869b5..8fd387bf31f0 100644
--- a/arch/arm/mach-tegra/board-harmony-power.c
+++ b/arch/arm/mach-tegra/board-harmony-power.c
@@ -19,6 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
 #include <linux/mfd/tps6586x.h>
 #include <linux/of.h>
 #include <linux/of_i2c.h>
@@ -34,7 +35,9 @@ static struct regulator_consumer_supply tps658621_ldo0_supply[] = {
 };
 
 static struct regulator_init_data ldo0_data = {
+        .supply_regulator = "vdd_sm2",
         .constraints = {
+                .name = "vdd_ldo0",
                 .min_uV = 3300 * 1000,
                 .max_uV = 3300 * 1000,
                 .valid_modes_mask = (REGULATOR_MODE_NORMAL |
@@ -48,9 +51,11 @@ static struct regulator_init_data ldo0_data = {
         .consumer_supplies = tps658621_ldo0_supply,
 };
 
-#define HARMONY_REGULATOR_INIT(_id, _minmv, _maxmv)                     \
+#define HARMONY_REGULATOR_INIT(_id, _name, _supply, _minmv, _maxmv)     \
         static struct regulator_init_data _id##_data = {                \
+                .supply_regulator = _supply,                            \
                 .constraints = {                                        \
+                        .name = _name,                                  \
                         .min_uV = (_minmv)*1000,                        \
                         .max_uV = (_maxmv)*1000,                        \
                         .valid_modes_mask = (REGULATOR_MODE_NORMAL |    \
@@ -61,18 +66,18 @@ static struct regulator_init_data ldo0_data = {
                 },                                                      \
         }
 
-HARMONY_REGULATOR_INIT(sm0, 725, 1500);
-HARMONY_REGULATOR_INIT(sm1, 725, 1500);
-HARMONY_REGULATOR_INIT(sm2, 3000, 4550);
-HARMONY_REGULATOR_INIT(ldo1, 725, 1500);
-HARMONY_REGULATOR_INIT(ldo2, 725, 1500);
-HARMONY_REGULATOR_INIT(ldo3, 1250, 3300);
-HARMONY_REGULATOR_INIT(ldo4, 1700, 2475);
-HARMONY_REGULATOR_INIT(ldo5, 1250, 3300);
-HARMONY_REGULATOR_INIT(ldo6, 1250, 3300);
-HARMONY_REGULATOR_INIT(ldo7, 1250, 3300);
-HARMONY_REGULATOR_INIT(ldo8, 1250, 3300);
-HARMONY_REGULATOR_INIT(ldo9, 1250, 3300);
+HARMONY_REGULATOR_INIT(sm0,  "vdd_sm0",  "vdd_sys", 725, 1500);
+HARMONY_REGULATOR_INIT(sm1,  "vdd_sm1",  "vdd_sys", 725, 1500);
+HARMONY_REGULATOR_INIT(sm2,  "vdd_sm2",  "vdd_sys", 3000, 4550);
+HARMONY_REGULATOR_INIT(ldo1, "vdd_ldo1", "vdd_sm2", 725, 1500);
+HARMONY_REGULATOR_INIT(ldo2, "vdd_ldo2", "vdd_sm2", 725, 1500);
+HARMONY_REGULATOR_INIT(ldo3, "vdd_ldo3", "vdd_sm2", 1250, 3300);
+HARMONY_REGULATOR_INIT(ldo4, "vdd_ldo4", "vdd_sm2", 1700, 2475);
+HARMONY_REGULATOR_INIT(ldo5, "vdd_ldo5", NULL,      1250, 3300);
+HARMONY_REGULATOR_INIT(ldo6, "vdd_ldo6", "vdd_sm2", 1250, 3300);
+HARMONY_REGULATOR_INIT(ldo7, "vdd_ldo7", "vdd_sm2", 1250, 3300);
+HARMONY_REGULATOR_INIT(ldo8, "vdd_ldo8", "vdd_sm2", 1250, 3300);
+HARMONY_REGULATOR_INIT(ldo9, "vdd_ldo9", "vdd_sm2", 1250, 3300);
 
 #define TPS_REG(_id, _data)                     \
         {                                       \
@@ -115,6 +120,8 @@ static struct i2c_board_info __initdata harmony_regulators[] = {
 int __init harmony_regulator_init(void)
 {
         if (machine_is_harmony()) {
+                regulator_register_always_on(0, "vdd_sys",
+                        NULL, 0, 5000000);
                 i2c_register_board_info(3, harmony_regulators, 1);
         } else { /* Harmony, booted using device tree */
                 struct device_node *np;