5 files changed, 89 insertions, 61 deletions

diff --git a/Documentation/blackfin/00-INDEX b/Documentation/blackfin/00-INDEX
index d6840a91e1e1..c34e12440fec 100644
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
@@ -1,9 +1,6 @@
 00-INDEX
         - This file
 
-cache-lock.txt
-        - HOWTO for blackfin cache locking.
-
 cachefeatures.txt
         - Supported cache features.
 
diff --git a/Documentation/blackfin/Makefile b/Documentation/blackfin/Makefile
new file mode 100644
index 000000000000..773dbb103f1c
--- /dev/null
+++ b/Documentation/blackfin/Makefile
@@ -0,0 +1,6 @@
+obj-m := gptimers-example.o
+
+all: modules
+
+modules clean:
+        $(MAKE) -C ../.. SUBDIRS=$(PWD) $@
diff --git a/Documentation/blackfin/cache-lock.txt b/Documentation/blackfin/cache-lock.txt
deleted file mode 100644
index 88ba1e6c31c3..000000000000
--- a/Documentation/blackfin/cache-lock.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * File:         Documentation/blackfin/cache-lock.txt
- * Based on:
- * Author:
- *
- * Created:
- * Description:  This file contains the simple DMA Implementation for Blackfin
- *
- * Rev:          $Id: cache-lock.txt 2384 2006-11-01 04:12:43Z magicyang $
- *
- * Modified:
- *               Copyright 2004-2006 Analog Devices Inc.
- *
- * Bugs:         Enter bugs at http://blackfin.uclinux.org/
- *
- */
-
-How to lock your code in cache in uClinux/blackfin
---------------------------------------------------
-
-There are only a few steps required to lock your code into the cache.
-Currently you can lock the code by Way.
-
-Below are the interface provided for locking the cache.
-
-
-1. cache_grab_lock(int Ways);
-
-This function grab the lock for locking your code into the cache specified
-by Ways.
-
-
-2. cache_lock(int Ways);
-
-This function should be called after your critical code has been executed.
-Once the critical code exits, the code is now loaded into the cache. This
-function locks the code into the cache.
-
-
-So, the example sequence will be:
-
-        cache_grab_lock(WAY0_L);        /* Grab the lock */
-
-        critical_code();                /* Execute the code of interest */
-
-        cache_lock(WAY0_L);             /* Lock the cache */
-
-Where WAY0_L signifies WAY0 locking.
diff --git a/Documentation/blackfin/cachefeatures.txt b/Documentation/blackfin/cachefeatures.txt
index 0fbec23becb5..75de51f94515 100644
--- a/Documentation/blackfin/cachefeatures.txt
+++ b/Documentation/blackfin/cachefeatures.txt
@@ -41,16 +41,6 @@
                 icplb_flush();
                 dcplb_flush();
 
-        - Locking the cache.
-
-                cache_grab_lock();
-                cache_lock();
-
-        Please refer linux-2.6.x/Documentation/blackfin/cache-lock.txt for how to
-        lock the cache.
-
-        Locking the cache is optional feature.
-
         - Miscellaneous cache functions.
 
                 flush_cache_all();
diff --git a/Documentation/blackfin/gptimers-example.c b/Documentation/blackfin/gptimers-example.c
new file mode 100644
index 000000000000..b1bd6340e748
--- /dev/null
+++ b/Documentation/blackfin/gptimers-example.c
@@ -0,0 +1,83 @@
+/*
+ * Simple gptimers example
+ *      http://docs.blackfin.uclinux.org/doku.php?id=linux-kernel:drivers:gptimers
+ *
+ * Copyright 2007-2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/interrupt.h>
+#include <linux/module.h>
+
+#include <asm/gptimers.h>
+#include <asm/portmux.h>
+
+/* ... random driver includes ... */
+
+#define DRIVER_NAME "gptimer_example"
+
+struct gptimer_data {
+        uint32_t period, width;
+};
+static struct gptimer_data data;
+
+/* ... random driver state ... */
+
+static irqreturn_t gptimer_example_irq(int irq, void *dev_id)
+{
+        struct gptimer_data *data = dev_id;
+
+        /* make sure it was our timer which caused the interrupt */
+        if (!get_gptimer_intr(TIMER5_id))
+                return IRQ_NONE;
+
+        /* read the width/period values that were captured for the waveform */
+        data->width = get_gptimer_pwidth(TIMER5_id);
+        data->period = get_gptimer_period(TIMER5_id);
+
+        /* acknowledge the interrupt */
+        clear_gptimer_intr(TIMER5_id);
+
+        /* tell the upper layers we took care of things */
+        return IRQ_HANDLED;
+}
+
+/* ... random driver code ... */
+
+static int __init gptimer_example_init(void)
+{
+        int ret;
+
+        /* grab the peripheral pins */
+        ret = peripheral_request(P_TMR5, DRIVER_NAME);
+        if (ret) {
+                printk(KERN_NOTICE DRIVER_NAME ": peripheral request failed\n");
+                return ret;
+        }
+
+        /* grab the IRQ for the timer */
+        ret = request_irq(IRQ_TIMER5, gptimer_example_irq, IRQF_SHARED, DRIVER_NAME, &data);
+        if (ret) {
+                printk(KERN_NOTICE DRIVER_NAME ": IRQ request failed\n");
+                peripheral_free(P_TMR5);
+                return ret;
+        }
+
+        /* setup the timer and enable it */
+        set_gptimer_config(TIMER5_id, WDTH_CAP | PULSE_HI | PERIOD_CNT | IRQ_ENA);
+        enable_gptimers(TIMER5bit);
+
+        return 0;
+}
+module_init(gptimer_example_init);
+
+static void __exit gptimer_example_exit(void)
+{
+        disable_gptimers(TIMER5bit);
+        free_irq(IRQ_TIMER5, &data);
+        peripheral_free(P_TMR5);
+}
+module_exit(gptimer_example_exit);
+
+MODULE_LICENSE("BSD");