Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm

* 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits)
  msm: scm: Check for interruption immediately
  msm: scm: Fix improper register assignment
  msm: scm: Mark inline asm as volatile
  msm: iommu: Enable HTW L2 redirection on MSM8960
  msm: iommu: Don't read from write-only registers
  msm: iommu: Remove dependency on IDR
  msm: iommu: Use ASID tagging instead of VMID tagging
  msm: iommu: Rework clock logic and add IOMMU bus clock control
  msm: iommu: Clock control for the IOMMU driver
  msm: mdp: Set the correct pack pattern for XRGB/ARGB
  msm_fb: Fix framebuffer console
  msm: mdp: Add support for RGBX 8888 image format.
  video: msmfb: Put the partial update magic value into the fix_screen struct.
  msm: clock: Migrate to clkdev
  msm: clock: Remove references to clk_ops_pcom
  msm: headsmp.S: Fix section mismatch
  msm: Use explicit GPLv2 licenses
  msm: iommu: Enable IOMMU support for MSM8960
  msm: iommu: Generalize platform data for multiple targets
  msm: iommu: Create a Kconfig item for the IOMMU driver
  ...

1 files changed, 130 insertions, 0 deletions

diff --git a/arch/arm/mach-msm/clock-debug.c b/arch/arm/mach-msm/clock-debug.c
new file mode 100644
index 000000000000..4886404d42f5
--- /dev/null
+++ b/arch/arm/mach-msm/clock-debug.c
@@ -0,0 +1,130 @@
+/*
+ * Copyright (C) 2007 Google, Inc.
+ * Copyright (c) 2007-2010, Code Aurora Forum. All rights reserved.
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+#include <linux/ctype.h>
+#include <linux/debugfs.h>
+#include <linux/clk.h>
+#include "clock.h"
+
+static int clock_debug_rate_set(void *data, u64 val)
+{
+        struct clk *clock = data;
+        int ret;
+
+        /* Only increases to max rate will succeed, but that's actually good
+         * for debugging purposes so we don't check for error. */
+        if (clock->flags & CLK_MAX)
+                clk_set_max_rate(clock, val);
+        if (clock->flags & CLK_MIN)
+                ret = clk_set_min_rate(clock, val);
+        else
+                ret = clk_set_rate(clock, val);
+        if (ret != 0)
+                printk(KERN_ERR "clk_set%s_rate failed (%d)\n",
+                        (clock->flags & CLK_MIN) ? "_min" : "", ret);
+        return ret;
+}
+
+static int clock_debug_rate_get(void *data, u64 *val)
+{
+        struct clk *clock = data;
+        *val = clk_get_rate(clock);
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(clock_rate_fops, clock_debug_rate_get,
+                        clock_debug_rate_set, "%llu\n");
+
+static int clock_debug_enable_set(void *data, u64 val)
+{
+        struct clk *clock = data;
+        int rc = 0;
+
+        if (val)
+                rc = clock->ops->enable(clock->id);
+        else
+                clock->ops->disable(clock->id);
+
+        return rc;
+}
+
+static int clock_debug_enable_get(void *data, u64 *val)
+{
+        struct clk *clock = data;
+
+        *val = clock->ops->is_enabled(clock->id);
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(clock_enable_fops, clock_debug_enable_get,
+                        clock_debug_enable_set, "%llu\n");
+
+static int clock_debug_local_get(void *data, u64 *val)
+{
+        struct clk *clock = data;
+
+        *val = clock->ops->is_local(clock->id);
+
+        return 0;
+}
+
+DEFINE_SIMPLE_ATTRIBUTE(clock_local_fops, clock_debug_local_get,
+                        NULL, "%llu\n");
+
+static struct dentry *debugfs_base;
+
+int __init clock_debug_init(void)
+{
+        debugfs_base = debugfs_create_dir("clk", NULL);
+        if (!debugfs_base)
+                return -ENOMEM;
+        return 0;
+}
+
+int __init clock_debug_add(struct clk *clock)
+{
+        char temp[50], *ptr;
+        struct dentry *clk_dir;
+
+        if (!debugfs_base)
+                return -ENOMEM;
+
+        strncpy(temp, clock->dbg_name, ARRAY_SIZE(temp)-1);
+        for (ptr = temp; *ptr; ptr++)
+                *ptr = tolower(*ptr);
+
+        clk_dir = debugfs_create_dir(temp, debugfs_base);
+        if (!clk_dir)
+                return -ENOMEM;
+
+        if (!debugfs_create_file("rate", S_IRUGO | S_IWUSR, clk_dir,
+                                clock, &clock_rate_fops))
+                goto error;
+
+        if (!debugfs_create_file("enable", S_IRUGO | S_IWUSR, clk_dir,
+                                clock, &clock_enable_fops))
+                goto error;
+
+        if (!debugfs_create_file("is_local", S_IRUGO, clk_dir, clock,
+                                &clock_local_fops))
+                goto error;
+        return 0;
+error:
+        debugfs_remove_recursive(clk_dir);
+        return -ENOMEM;
+}