drm/radeon/atpx: add a query for ATPX dGPU power control
[deliverable/linux.git] / drivers / clocksource / h8300_timer16.c
index 0e076c6fc006b26b52729c9389db7d87a9604ce3..75c44079b3454513b2f6a788872b4c579c7f27b8 100644 (file)
@@ -4,85 +4,56 @@
  *  Copyright 2015 Yoshinori Sato <ysato@users.sourcefoge.jp>
  */
 
-#include <linux/errno.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
-#include <linux/string.h>
-#include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
 #include <linux/clocksource.h>
-#include <linux/module.h>
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/of.h>
-
-#include <asm/segment.h>
-#include <asm/irq.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #define TSTR   0
-#define TSNC   1
-#define TMDR   2
-#define TOLR   3
-#define TISRA  4
-#define TISRB  5
 #define TISRC  6
 
 #define TCR    0
-#define TIOR   1
 #define TCNT   2
-#define GRA    4
-#define GRB    6
-
-#define FLAG_REPROGRAM (1 << 0)
-#define FLAG_SKIPEVENT (1 << 1)
-#define FLAG_IRQCONTEXT (1 << 2)
-#define FLAG_STARTED (1 << 3)
 
-#define ONESHOT  0
-#define PERIODIC 1
-
-#define RELATIVE 0
-#define ABSOLUTE 1
+#define bset(b, a) iowrite8(ioread8(a) | (1 << (b)), (a))
+#define bclr(b, a) iowrite8(ioread8(a) & ~(1 << (b)), (a))
 
 struct timer16_priv {
-       struct platform_device *pdev;
        struct clocksource cs;
-       struct irqaction irqaction;
        unsigned long total_cycles;
-       unsigned long mapbase;
-       unsigned long mapcommon;
-       unsigned long flags;
-       unsigned short gra;
+       void __iomem *mapbase;
+       void __iomem *mapcommon;
        unsigned short cs_enabled;
        unsigned char enb;
-       unsigned char imfa;
-       unsigned char imiea;
        unsigned char ovf;
-       raw_spinlock_t lock;
-       struct clk *clk;
+       unsigned char ovie;
 };
 
 static unsigned long timer16_get_counter(struct timer16_priv *p)
 {
-       unsigned long v1, v2, v3;
-       int o1, o2;
+       unsigned short v1, v2, v3;
+       unsigned char  o1, o2;
 
-       o1 = ctrl_inb(p->mapcommon + TISRC) & p->ovf;
+       o1 = ioread8(p->mapcommon + TISRC) & p->ovf;
 
        /* Make sure the timer value is stable. Stolen from acpi_pm.c */
        do {
                o2 = o1;
-               v1 = ctrl_inw(p->mapbase + TCNT);
-               v2 = ctrl_inw(p->mapbase + TCNT);
-               v3 = ctrl_inw(p->mapbase + TCNT);
-               o1 = ctrl_inb(p->mapcommon + TISRC) & p->ovf;
+               v1 = ioread16be(p->mapbase + TCNT);
+               v2 = ioread16be(p->mapbase + TCNT);
+               v3 = ioread16be(p->mapbase + TCNT);
+               o1 = ioread8(p->mapcommon + TISRC) & p->ovf;
        } while (unlikely((o1 != o2) || (v1 > v2 && v1 < v3)
                          || (v2 > v3 && v2 < v1) || (v3 > v1 && v3 < v2)));
 
-       v2 |= 0x10000;
-       return v2;
+       if (likely(!o1))
+               return v2;
+       else
+               return v2 + 0x10000;
 }
 
 
@@ -90,8 +61,7 @@ static irqreturn_t timer16_interrupt(int irq, void *dev_id)
 {
        struct timer16_priv *p = (struct timer16_priv *)dev_id;
 
-       ctrl_outb(ctrl_inb(p->mapcommon + TISRA) & ~p->imfa,
-                 p->mapcommon + TISRA);
+       bclr(p->ovf, p->mapcommon + TISRC);
        p->total_cycles += 0x10000;
 
        return IRQ_HANDLED;
@@ -105,13 +75,10 @@ static inline struct timer16_priv *cs_to_priv(struct clocksource *cs)
 static cycle_t timer16_clocksource_read(struct clocksource *cs)
 {
        struct timer16_priv *p = cs_to_priv(cs);
-       unsigned long flags, raw;
-       unsigned long value;
+       unsigned long raw, value;
 
-       raw_spin_lock_irqsave(&p->lock, flags);
        value = p->total_cycles;
        raw = timer16_get_counter(p);
-       raw_spin_unlock_irqrestore(&p->lock, flags);
 
        return value + raw;
 }
@@ -123,10 +90,10 @@ static int timer16_enable(struct clocksource *cs)
        WARN_ON(p->cs_enabled);
 
        p->total_cycles = 0;
-       ctrl_outw(0x0000, p->mapbase + TCNT);
-       ctrl_outb(0x83, p->mapbase + TCR);
-       ctrl_outb(ctrl_inb(p->mapcommon + TSTR) | p->enb,
-                 p->mapcommon + TSTR);
+       iowrite16be(0x0000, p->mapbase + TCNT);
+       iowrite8(0x83, p->mapbase + TCR);
+       bset(p->ovie, p->mapcommon + TISRC);
+       bset(p->enb, p->mapcommon + TSTR);
 
        p->cs_enabled = true;
        return 0;
@@ -138,116 +105,83 @@ static void timer16_disable(struct clocksource *cs)
 
        WARN_ON(!p->cs_enabled);
 
-       ctrl_outb(ctrl_inb(p->mapcommon + TSTR) & ~p->enb,
-                 p->mapcommon + TSTR);
+       bclr(p->ovie, p->mapcommon + TISRC);
+       bclr(p->enb, p->mapcommon + TSTR);
 
        p->cs_enabled = false;
 }
 
+static struct timer16_priv timer16_priv = {
+       .cs = {
+               .name = "h8300_16timer",
+               .rating = 200,
+               .read = timer16_clocksource_read,
+               .enable = timer16_enable,
+               .disable = timer16_disable,
+               .mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8),
+               .flags = CLOCK_SOURCE_IS_CONTINUOUS,
+       },
+};
+
 #define REG_CH   0
 #define REG_COMM 1
 
-static int timer16_setup(struct timer16_priv *p, struct platform_device *pdev)
+static void __init h8300_16timer_init(struct device_node *node)
 {
-       struct resource *res[2];
+       void __iomem *base[2];
        int ret, irq;
        unsigned int ch;
+       struct clk *clk;
 
-       p->pdev = pdev;
-
-       res[REG_CH] = platform_get_resource(p->pdev,
-                                           IORESOURCE_MEM, REG_CH);
-       res[REG_COMM] = platform_get_resource(p->pdev,
-                                             IORESOURCE_MEM, REG_COMM);
-       if (!res[REG_CH] || !res[REG_COMM]) {
-               dev_err(&p->pdev->dev, "failed to get I/O memory\n");
-               return -ENXIO;
-       }
-       irq = platform_get_irq(p->pdev, 0);
-       if (irq < 0) {
-               dev_err(&p->pdev->dev, "failed to get irq\n");
-               return irq;
+       clk = of_clk_get(node, 0);
+       if (IS_ERR(clk)) {
+               pr_err("failed to get clock for clocksource\n");
+               return;
        }
 
-       p->clk = clk_get(&p->pdev->dev, "fck");
-       if (IS_ERR(p->clk)) {
-               dev_err(&p->pdev->dev, "can't get clk\n");
-               return PTR_ERR(p->clk);
+       base[REG_CH] = of_iomap(node, 0);
+       if (!base[REG_CH]) {
+               pr_err("failed to map registers for clocksource\n");
+               goto free_clk;
        }
-       of_property_read_u32(p->pdev->dev.of_node, "renesas,channel", &ch);
-
-       p->pdev = pdev;
-       p->mapbase = res[REG_CH]->start;
-       p->mapcommon = res[REG_COMM]->start;
-       p->enb = 1 << ch;
-       p->imfa = 1 << ch;
-       p->imiea = 1 << (4 + ch);
-       p->cs.name = pdev->name;
-       p->cs.rating = 200;
-       p->cs.read = timer16_clocksource_read;
-       p->cs.enable = timer16_enable;
-       p->cs.disable = timer16_disable;
-       p->cs.mask = CLOCKSOURCE_MASK(sizeof(unsigned long) * 8);
-       p->cs.flags = CLOCK_SOURCE_IS_CONTINUOUS;
 
-       ret = request_irq(irq, timer16_interrupt,
-                         IRQF_TIMER, pdev->name, p);
-       if (ret < 0) {
-               dev_err(&p->pdev->dev, "failed to request irq %d\n", irq);
-               return ret;
+       base[REG_COMM] = of_iomap(node, 1);
+       if (!base[REG_COMM]) {
+               pr_err("failed to map registers for clocksource\n");
+               goto unmap_ch;
        }
 
-       clocksource_register_hz(&p->cs, clk_get_rate(p->clk) / 8);
-
-       return 0;
-}
-
-static int timer16_probe(struct platform_device *pdev)
-{
-       struct timer16_priv *p = platform_get_drvdata(pdev);
-
-       if (p) {
-               dev_info(&pdev->dev, "kept as earlytimer\n");
-               return 0;
+       irq = irq_of_parse_and_map(node, 0);
+       if (!irq) {
+               pr_err("failed to get irq for clockevent\n");
+               goto unmap_comm;
        }
 
-       p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);
-       if (!p)
-               return -ENOMEM;
+       of_property_read_u32(node, "renesas,channel", &ch);
 
-       return timer16_setup(p, pdev);
-}
-
-static int timer16_remove(struct platform_device *pdev)
-{
-       return -EBUSY;
-}
+       timer16_priv.mapbase = base[REG_CH];
+       timer16_priv.mapcommon = base[REG_COMM];
+       timer16_priv.enb = ch;
+       timer16_priv.ovf = ch;
+       timer16_priv.ovie = 4 + ch;
 
-static const struct of_device_id timer16_of_table[] = {
-       { .compatible = "renesas,16bit-timer" },
-       { }
-};
-static struct platform_driver timer16_driver = {
-       .probe          = timer16_probe,
-       .remove         = timer16_remove,
-       .driver         = {
-               .name   = "h8300h-16timer",
-               .of_match_table = of_match_ptr(timer16_of_table),
+       ret = request_irq(irq, timer16_interrupt,
+                         IRQF_TIMER, timer16_priv.cs.name, &timer16_priv);
+       if (ret < 0) {
+               pr_err("failed to request irq %d of clocksource\n", irq);
+               goto unmap_comm;
        }
-};
 
-static int __init timer16_init(void)
-{
-       return platform_driver_register(&timer16_driver);
-}
+       clocksource_register_hz(&timer16_priv.cs,
+                               clk_get_rate(clk) / 8);
+       return;
 
-static void __exit timer16_exit(void)
-{
-       platform_driver_unregister(&timer16_driver);
+unmap_comm:
+       iounmap(base[REG_COMM]);
+unmap_ch:
+       iounmap(base[REG_CH]);
+free_clk:
+       clk_put(clk);
 }
 
-subsys_initcall(timer16_init);
-module_exit(timer16_exit);
-MODULE_AUTHOR("Yoshinori Sato");
-MODULE_DESCRIPTION("H8/300H 16bit Timer Driver");
-MODULE_LICENSE("GPL v2");
+CLOCKSOURCE_OF_DECLARE(h8300_16bit, "renesas,16bit-timer", h8300_16timer_init);
This page took 0.02983 seconds and 5 git commands to generate.