7 files changed, 78 insertions, 282 deletions

diff --git a/arch/arm/mach-vt8500/Makefile b/arch/arm/mach-vt8500/Makefile
index 81aedb7c893c..7ce51767c99c 100644
--- a/arch/arm/mach-vt8500/Makefile
+++ b/arch/arm/mach-vt8500/Makefile
@@ -1,9 +1,7 @@
-obj-y += devices.o gpio.o irq.o timer.o
+obj-y += devices.o gpio.o irq.o timer.o restart.o
 
 obj-$(CONFIG_VTWM_VERSION_VT8500) += devices-vt8500.o
 obj-$(CONFIG_VTWM_VERSION_WM8505) += devices-wm8505.o
 
 obj-$(CONFIG_MACH_BV07) += bv07.o
 obj-$(CONFIG_MACH_WM8505_7IN_NETBOOK) += wm8505_7in.o
-
-obj-$(CONFIG_HAVE_PWM) += pwm.o
diff --git a/arch/arm/mach-vt8500/bv07.c b/arch/arm/mach-vt8500/bv07.c
index a464c7584411..f9fbeb2d10e9 100644
--- a/arch/arm/mach-vt8500/bv07.c
+++ b/arch/arm/mach-vt8500/bv07.c
@@ -23,6 +23,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <mach/restart.h>
 
 #include "devices.h"
 
@@ -62,6 +63,7 @@ void __init bv07_init(void)
         else
                 printk(KERN_ERR "PMC Hibernation register could not be remapped, not enabling power off!\n");
 
+        wmt_setup_restart();
         vt8500_set_resources();
         platform_add_devices(devices, ARRAY_SIZE(devices));
         vt8500_gpio_init();
@@ -69,6 +71,7 @@ void __init bv07_init(void)
 
 MACHINE_START(BV07, "Benign BV07 Mini Netbook")
         .atag_offset    = 0x100,
+        .restart        = wmt_restart,
         .reserve        = vt8500_reserve_mem,
         .map_io         = vt8500_map_io,
         .init_irq       = vt8500_init_irq,
diff --git a/arch/arm/mach-vt8500/include/mach/restart.h b/arch/arm/mach-vt8500/include/mach/restart.h
new file mode 100644
index 000000000000..89f9b787d2a0
--- /dev/null
+++ b/arch/arm/mach-vt8500/include/mach/restart.h
@@ -0,0 +1,17 @@
+/* linux/arch/arm/mach-vt8500/restart.h
+ *
+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+void wmt_setup_restart(void);
+void wmt_restart(char mode, const char *cmd);
diff --git a/arch/arm/mach-vt8500/include/mach/system.h b/arch/arm/mach-vt8500/include/mach/system.h
deleted file mode 100644
index 58fa8010ee61..000000000000
--- a/arch/arm/mach-vt8500/include/mach/system.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-vt8500/include/mach/system.h
- *
- */
-#include <asm/io.h>
-
-/* PM Software Reset request register */
-#define VT8500_PMSR_VIRT        0xf8130060
-
-static inline void arch_reset(char mode, const char *cmd)
-{
-        writel(1, VT8500_PMSR_VIRT);
-}
diff --git a/arch/arm/mach-vt8500/pwm.c b/arch/arm/mach-vt8500/pwm.c
deleted file mode 100644
index 8ad825e93592..000000000000
--- a/arch/arm/mach-vt8500/pwm.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/*
- * arch/arm/mach-vt8500/pwm.c
- *
- *  Copyright (C) 2010 Alexey Charkov <alchark@gmail.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/pwm.h>
-#include <linux/delay.h>
-
-#include <asm/div64.h>
-
-#define VT8500_NR_PWMS 4
-
-static DEFINE_MUTEX(pwm_lock);
-static LIST_HEAD(pwm_list);
-
-struct pwm_device {
-        struct list_head        node;
-        struct platform_device  *pdev;
-
-        const char      *label;
-
-        void __iomem    *regbase;
-
-        unsigned int    use_count;
-        unsigned int    pwm_id;
-};
-
-#define msecs_to_loops(t) (loops_per_jiffy / 1000 * HZ * t)
-static inline void pwm_busy_wait(void __iomem *reg, u8 bitmask)
-{
-        int loops = msecs_to_loops(10);
-        while ((readb(reg) & bitmask) && --loops)
-                cpu_relax();
-
-        if (unlikely(!loops))
-                pr_warning("Waiting for status bits 0x%x to clear timed out\n",
-                           bitmask);
-}
-
-int pwm_config(struct pwm_device *pwm, int duty_ns, int period_ns)
-{
-        unsigned long long c;
-        unsigned long period_cycles, prescale, pv, dc;
-
-        if (pwm == NULL || period_ns == 0 || duty_ns > period_ns)
-                return -EINVAL;
-
-        c = 25000000/2; /* wild guess --- need to implement clocks */
-        c = c * period_ns;
-        do_div(c, 1000000000);
-        period_cycles = c;
-
-        if (period_cycles < 1)
-                period_cycles = 1;
-        prescale = (period_cycles - 1) / 4096;
-        pv = period_cycles / (prescale + 1) - 1;
-        if (pv > 4095)
-                pv = 4095;
-
-        if (prescale > 1023)
-                return -EINVAL;
-
-        c = (unsigned long long)pv * duty_ns;
-        do_div(c, period_ns);
-        dc = c;
-
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 1));
-        writel(prescale, pwm->regbase + 0x4 + (pwm->pwm_id << 4));
-
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 2));
-        writel(pv, pwm->regbase + 0x8 + (pwm->pwm_id << 4));
-
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 3));
-        writel(dc, pwm->regbase + 0xc + (pwm->pwm_id << 4));
-
-        return 0;
-}
-EXPORT_SYMBOL(pwm_config);
-
-int pwm_enable(struct pwm_device *pwm)
-{
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 0));
-        writel(5, pwm->regbase + (pwm->pwm_id << 4));
-        return 0;
-}
-EXPORT_SYMBOL(pwm_enable);
-
-void pwm_disable(struct pwm_device *pwm)
-{
-        pwm_busy_wait(pwm->regbase + 0x40 + pwm->pwm_id, (1 << 0));
-        writel(0, pwm->regbase + (pwm->pwm_id << 4));
-}
-EXPORT_SYMBOL(pwm_disable);
-
-struct pwm_device *pwm_request(int pwm_id, const char *label)
-{
-        struct pwm_device *pwm;
-        int found = 0;
-
-        mutex_lock(&pwm_lock);
-
-        list_for_each_entry(pwm, &pwm_list, node) {
-                if (pwm->pwm_id == pwm_id) {
-                        found = 1;
-                        break;
-                }
-        }
-
-        if (found) {
-                if (pwm->use_count == 0) {
-                        pwm->use_count++;
-                        pwm->label = label;
-                } else {
-                        pwm = ERR_PTR(-EBUSY);
-                }
-        } else {
-                pwm = ERR_PTR(-ENOENT);
-        }
-
-        mutex_unlock(&pwm_lock);
-        return pwm;
-}
-EXPORT_SYMBOL(pwm_request);
-
-void pwm_free(struct pwm_device *pwm)
-{
-        mutex_lock(&pwm_lock);
-
-        if (pwm->use_count) {
-                pwm->use_count--;
-                pwm->label = NULL;
-        } else {
-                pr_warning("PWM device already freed\n");
-        }
-
-        mutex_unlock(&pwm_lock);
-}
-EXPORT_SYMBOL(pwm_free);
-
-static inline void __add_pwm(struct pwm_device *pwm)
-{
-        mutex_lock(&pwm_lock);
-        list_add_tail(&pwm->node, &pwm_list);
-        mutex_unlock(&pwm_lock);
-}
-
-static int __devinit pwm_probe(struct platform_device *pdev)
-{
-        struct pwm_device *pwms;
-        struct resource *r;
-        int ret = 0;
-        int i;
-
-        pwms = kzalloc(sizeof(struct pwm_device) * VT8500_NR_PWMS, GFP_KERNEL);
-        if (pwms == NULL) {
-                dev_err(&pdev->dev, "failed to allocate memory\n");
-                return -ENOMEM;
-        }
-
-        for (i = 0; i < VT8500_NR_PWMS; i++) {
-                pwms[i].use_count = 0;
-                pwms[i].pwm_id = i;
-                pwms[i].pdev = pdev;
-        }
-
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (r == NULL) {
-                dev_err(&pdev->dev, "no memory resource defined\n");
-                ret = -ENODEV;
-                goto err_free;
-        }
-
-        r = request_mem_region(r->start, resource_size(r), pdev->name);
-        if (r == NULL) {
-                dev_err(&pdev->dev, "failed to request memory resource\n");
-                ret = -EBUSY;
-                goto err_free;
-        }
-
-        pwms[0].regbase = ioremap(r->start, resource_size(r));
-        if (pwms[0].regbase == NULL) {
-                dev_err(&pdev->dev, "failed to ioremap() registers\n");
-                ret = -ENODEV;
-                goto err_free_mem;
-        }
-
-        for (i = 1; i < VT8500_NR_PWMS; i++)
-                pwms[i].regbase = pwms[0].regbase;
-
-        for (i = 0; i < VT8500_NR_PWMS; i++)
-                __add_pwm(&pwms[i]);
-
-        platform_set_drvdata(pdev, pwms);
-        return 0;
-
-err_free_mem:
-        release_mem_region(r->start, resource_size(r));
-err_free:
-        kfree(pwms);
-        return ret;
-}
-
-static int __devexit pwm_remove(struct platform_device *pdev)
-{
-        struct pwm_device *pwms;
-        struct resource *r;
-        int i;
-
-        pwms = platform_get_drvdata(pdev);
-        if (pwms == NULL)
-                return -ENODEV;
-
-        mutex_lock(&pwm_lock);
-
-        for (i = 0; i < VT8500_NR_PWMS; i++)
-                list_del(&pwms[i].node);
-        mutex_unlock(&pwm_lock);
-
-        iounmap(pwms[0].regbase);
-
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(r->start, resource_size(r));
-
-        kfree(pwms);
-        return 0;
-}
-
-static struct platform_driver pwm_driver = {
-        .driver         = {
-                .name   = "vt8500-pwm",
-                .owner  = THIS_MODULE,
-        },
-        .probe          = pwm_probe,
-        .remove         = __devexit_p(pwm_remove),
-};
-
-static int __init pwm_init(void)
-{
-        return platform_driver_register(&pwm_driver);
-}
-arch_initcall(pwm_init);
-
-static void __exit pwm_exit(void)
-{
-        platform_driver_unregister(&pwm_driver);
-}
-module_exit(pwm_exit);
-
-MODULE_LICENSE("GPL");
diff --git a/arch/arm/mach-vt8500/restart.c b/arch/arm/mach-vt8500/restart.c
new file mode 100644
index 000000000000..497e89a5e130
--- /dev/null
+++ b/arch/arm/mach-vt8500/restart.c
@@ -0,0 +1,54 @@
+/* linux/arch/arm/mach-vt8500/restart.c
+ *
+ * Copyright (C) 2012 Tony Prisk <linux@prisktech.co.nz>
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#include <asm/io.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+
+#define LEGACY_PMC_BASE         0xD8130000
+#define WMT_PRIZM_PMSR_REG      0x60
+
+static void __iomem *pmc_base;
+
+void wmt_setup_restart(void)
+{
+        struct device_node *np;
+
+        /*
+         * Check if Power Mgmt Controller node is present in device tree. If no
+         * device tree node, use the legacy PMSR value (valid for all current
+         * SoCs).
+         */
+        np = of_find_compatible_node(NULL, NULL, "wmt,prizm-pmc");
+        if (np) {
+                pmc_base = of_iomap(np, 0);
+
+                if (!pmc_base)
+                        pr_err("%s:of_iomap(pmc) failed\n", __func__);
+
+                of_node_put(np);
+        } else {
+                pmc_base = ioremap(LEGACY_PMC_BASE, 0x1000);
+                if (!pmc_base) {
+                        pr_err("%s:ioremap(rstc) failed\n", __func__);
+                        return;
+                }
+        }
+}
+
+void wmt_restart(char mode, const char *cmd)
+{
+        if (pmc_base)
+                writel(1, pmc_base + WMT_PRIZM_PMSR_REG);
+}
diff --git a/arch/arm/mach-vt8500/wm8505_7in.c b/arch/arm/mach-vt8500/wm8505_7in.c
index cf910a956080..db19886caf7c 100644
--- a/arch/arm/mach-vt8500/wm8505_7in.c
+++ b/arch/arm/mach-vt8500/wm8505_7in.c
@@ -23,6 +23,7 @@
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <mach/restart.h>
 
 #include "devices.h"
 
@@ -61,7 +62,7 @@ void __init wm8505_7in_init(void)
                 pm_power_off = &vt8500_power_off;
         else
                 printk(KERN_ERR "PMC Hibernation register could not be remapped, not enabling power off!\n");
-
+        wmt_setup_restart();
         wm8505_set_resources();
         platform_add_devices(devices, ARRAY_SIZE(devices));
         vt8500_gpio_init();
@@ -69,6 +70,7 @@ void __init wm8505_7in_init(void)
 
 MACHINE_START(WM8505_7IN_NETBOOK, "WM8505 7-inch generic netbook")
         .atag_offset    = 0x100,
+        .restart        = wmt_restart,
         .reserve        = wm8505_reserve_mem,
         .map_io         = wm8505_map_io,
         .init_irq       = wm8505_init_irq,