Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC fixes from Olof Johansson:
 "A mixed bag of fixes, some for merge window fallout (tegra, MXS), and
  a short series of fixes for marvell platforms that didn't make it in
  before 3.5."

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: mxs: fix compile error caused by prom_update_property change
  ARM: dt: tegra trimslice: enable USB2 port
  ARM: dt: tegra trimslice: add vbus-gpio property
  ARM: vt8500: Add maintainer for VT8500 architecture
  ARM: Kirkwood: Replace mrvl with marvell
  ARM: Orion: fix driver probe error handling with respect to clk
  ARM: Dove: Fixup ge00 initialisation
  ARM: Kirkwood: Fix PHY disable clk problems
  ARM: Kirkwood: Ensure runit clock always ticks.
  ARM: versatile: Don't use platform clock for Integrator & VE
  ARM: tegra: harmony: add regulator supply name and its input supply

diff --git a/Documentation/devicetree/bindings/mtd/orion-nand.txt b/Documentation/devicetree/bindings/mtd/orion-nand.txt
index b2356b7d2fa40bd863086c89dd32ef9f0cf4a392..2d6ab660e6032a3c4147d2e22ab2f33e417d1155 100644 (file)
--- a/Documentation/devicetree/bindings/mtd/orion-nand.txt
+++ b/Documentation/devicetree/bindings/mtd/orion-nand.txt
@@ -1,7 +1,7 @@
 NAND support for Marvell Orion SoC platforms
 
 Required properties:
-- compatible : "mrvl,orion-nand".
+- compatible : "marvell,orion-nand".
 - reg : Base physical address of the NAND and length of memory mapped
        region
 
@@ -24,7 +24,7 @@ nand@f4000000 {
        ale = <1>;
        bank-width = <1>;
        chip-delay = <25>;
-       compatible = "mrvl,orion-nand";
+       compatible = "marvell,orion-nand";
        reg = <0xf4000000 0x400>;
 
        partition@0 {

diff --git a/MAINTAINERS b/MAINTAINERS
index 3bc49687b653f55d1bd1c07656a43378df9630b9..bd451649f13a2ee9527bda181cfa002c77c526f4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1186,6 +1186,17 @@ S:       Maintained
 F:     arch/arm/mach-pxa/vpac270.c
 F:     arch/arm/mach-pxa/include/mach/vpac270.h
 
+ARM/VT8500 ARM ARCHITECTURE
+M:     Tony Prisk <linux@prisktech.co.nz>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/mach-vt8500/
+F:     drivers/video/vt8500lcdfb.*
+F:     drivers/video/wm8505fb*
+F:     drivers/video/wmt_ge_rops.*
+F:     drivers/tty/serial/vt8500_serial.c
+F:     drivers/rtc/rtc-vt8500-c
+
 ARM/ZIPIT Z2 SUPPORT
 M:     Marek Vasut <marek.vasut@gmail.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index b25c9d3c379a74701dddc777b7077f2a9478d0cd..9124ff75fe5348560587b97592260d6a3a5a6fd6 100644 (file)
--- 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 dc09a735b04a97213076305e8e70da6ce724903e..9a33077130e8498cb73f022fd99aaef114120eab 100644 (file)
--- 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 c2a5562525d2b8638c087950cef2ebc6a1e873e6..16734c1b5dfe91a6ee4ee71aacd0a1149de18648 100644 (file)
--- 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 a5376b84227f73158a75c2244217e5ef63d70f3e..78b0f06a09a2591bc6714d487324e0502f697a4c 100644 (file)
--- 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 ada0f0c23085c7c5b5ff353a4740c516a8b4973b..f59dcf6dc45f6b8cc7e7238bf0ac9230a9ff98f0 100644 (file)
--- 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 1ba75d4adecce16eb7007fd7282414e1b657a55a..026a1f82d813345989c00dd104419e4c4b6efaef 100644 (file)
--- 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 926528b81baa00dace4faf5b39ca0dbe7b2dfe03..f95dbc190ab623c0c0decd5899336841afa9f6b8 100644 (file)
--- 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 9de5636023f69694d39bf4196f1bca180e7ebb43..27fb8a67ea42ffa3887f646a903bbb9f04be3493 100644 (file)
--- 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 9493076fc5948e38258ec573f223d78bafdadde8..4db5de54b6a7e1658639dc8888a79ec8cede8cc7 100644 (file)
--- 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 f261cd2426434aac74e2856c6069c9052d6f035f..c9201539ffbd7cb17117278dbce407127887bc56 100644 (file)
--- 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 648bdd05d38bb95006401378af9540580501970a..8dabfe81d07c5f143626f10c57cfb993e87c6a1a 100644 (file)
--- 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 44dcb2e869b50ddbf64277c16c38a6790ad31b4a..8fd387bf31f0c66a27b313d3b5edc8bd976e3d0a 100644 (file)
--- 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;

diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c
index 0d4071754352f54a36ff74875619ed95ffdaa246..21c1a87032b76b3efce5f0d8bf4a5d3051ddeed8 100644 (file)
--- a/drivers/crypto/mv_cesa.c
+++ b/drivers/crypto/mv_cesa.c
@@ -1127,6 +1127,10 @@ err_unreg_ecb:
        crypto_unregister_alg(&mv_aes_alg_ecb);
 err_irq:
        free_irq(irq, cp);
+       if (!IS_ERR(cp->clk)) {
+               clk_disable_unprepare(cp->clk);
+               clk_put(cp->clk);
+       }
 err_thread:
        kthread_stop(cp->queue_th);
 err_unmap_sram:

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 3b9136c1a475428b8e95732de6425215dc2d337c..a61cb5fca22d360e600974fb754470666d7f612d 100644 (file)
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -839,6 +839,10 @@ out:
        if (r)
                release_resource(r);
        if (mmc)
+               if (!IS_ERR_OR_NULL(host->clk)) {
+                       clk_disable_unprepare(host->clk);
+                       clk_put(host->clk);
+               }
                mmc_free_host(mmc);
 
        return ret;

diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 513dc88a05ca422ac23525dac7db3f20ef9b0bfc..fc5a868c436e9b530018afb0e7fd428a12985c45 100644 (file)
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -183,6 +183,10 @@ static int __init orion_nand_probe(struct platform_device *pdev)
        return 0;
 
 no_dev:
+       if (!IS_ERR(clk)) {
+               clk_disable_unprepare(clk);
+               clk_put(clk);
+       }
        platform_set_drvdata(pdev, NULL);
        iounmap(io_base);
 no_res:
@@ -214,7 +218,7 @@ static int __devexit orion_nand_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static struct of_device_id orion_nand_of_match_table[] = {
-       { .compatible = "mrvl,orion-nand", },
+       { .compatible = "marvell,orion-nand", },
        {},
 };
 #endif

diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c
index 770ee557924ca38a9d4a245f88c9bd2a8ba9ee3e..087b9e0669f181c5832a3e51d08c0b785ed8134f 100644 (file)
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2983,6 +2983,12 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
        return 0;
 
 out:
+#if defined(CONFIG_HAVE_CLK)
+       if (!IS_ERR(mp->clk)) {
+               clk_disable_unprepare(mp->clk);
+               clk_put(mp->clk);
+       }
+#endif
        free_netdev(dev);
 
        return err;

diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c
index b2185f4255aa4075124e4f8d8c084e10abd0cc56..ebc1649d45d61ef068792d479bdc7deb438ad5c8 100644 (file)
--- a/drivers/rtc/rtc-mv.c
+++ b/drivers/rtc/rtc-mv.c
@@ -297,7 +297,7 @@ static int __exit mv_rtc_remove(struct platform_device *pdev)
 
 #ifdef CONFIG_OF
 static struct of_device_id rtc_mv_of_match_table[] = {
-       { .compatible = "mrvl,orion-rtc", },
+       { .compatible = "marvell,orion-rtc", },
        {}
 };
 #endif

diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 9408da83eaf156172c9c72c00006544de3c6bb57..8892d3642cefcc769494de9904b6d1eeae3dfe91 100644 (file)
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -283,6 +283,10 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev)
 err4:
        usb_put_hcd(hcd);
 err3:
+       if (!IS_ERR(clk)) {
+               clk_disable_unprepare(clk);
+               clk_put(clk);
+       }
        iounmap(regs);
 err2:
        release_mem_region(res->start, resource_size(res));

diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index fa4556750451ce29f7236174356573b65e52e56c..7646dd7f30cb084fc83c58b8b802085e45770ef4 100644 (file)
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -458,7 +458,13 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
        }
        clk_prepare_enable(priv->clk);
 
-       return snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai);
+       err = snd_soc_register_dai(&pdev->dev, &kirkwood_i2s_dai);
+       if (!err)
+               return 0;
+       dev_err(&pdev->dev, "snd_soc_register_dai failed\n");
+
+       clk_disable_unprepare(priv->clk);
+       clk_put(priv->clk);
 
 err_ioremap:
        iounmap(priv->io);