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

Pull clock framework updates from Michael Turquette:
 "The changes to the common clock framework for 4.0 are mostly new clock
  drivers and updates to existing ones for feature enhancements and bug
  fixes.

  There is more churn than usual in the framework core due to the change
  to introduce per-user unique struct clk pointers in 4.0.  This caused
  several regressions to surface, some of which were sent as fixes to
  4.0.  New generic clock drivers were added for GPIO- and PWM-based
  clock controllers.

  Additionally the common clk-divider code recieved several fixes to the
  way it rounds rates"

* tag 'clk-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (91 commits)
  clk: check ->determine/round_rate() return value in clk_calc_new_rates
  clk: at91: usb: propagate rate modification to the parent clk
  clk: samsung: exynos4: Disable ARMCLK down feature on Exynos4210 SoC
  clk: don't use __initconst for non-const arrays
  clk: at91: change to using endian agnositc IO
  clk: clk-gpio-gate: Fix active low
  clk: Add PWM clock driver
  clk: Add clock driver for mb86s7x
  clk: pxa: pxa3xx: add missing os timer clock
  clk: tegra: Use the proper parent for plld_dsi
  clk: tegra: Use generic tegra_osc_clk_init() on Tegra114
  clk: tegra: Model oscillator as clock
  clk: tegra: Add peripheral registers for bank Y
  clk: tegra: Register the proper number of resets
  clk: tegra: Remove needless initializations
  clk: tegra: Use consistent indentation
  clk: tegra: Various whitespace cleanups
  clk: tegra: Enable HDA to HDMI clocks on Tegra124
  clk: tegra: Fix a bunch of sparse warnings
  clk: tegra: Fix typo tabel -> table
  ...

1 files changed, 198 insertions, 0 deletions

diff --git a/include/trace/events/clk.h b/include/trace/events/clk.h
new file mode 100644
index 000000000000..758607226bfd
--- /dev/null
+++ b/include/trace/events/clk.h
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2014-2015, The Linux Foundation. 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.
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM clk
+
+#if !defined(_TRACE_CLK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_CLK_H
+
+#include <linux/tracepoint.h>
+
+struct clk_core;
+
+DECLARE_EVENT_CLASS(clk,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name       )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+        ),
+
+        TP_printk("%s", __get_str(name))
+);
+
+DEFINE_EVENT(clk, clk_enable,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_enable_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_disable,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_disable_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_prepare,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_prepare_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_unprepare,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DEFINE_EVENT(clk, clk_unprepare_complete,
+
+        TP_PROTO(struct clk_core *core),
+
+        TP_ARGS(core)
+);
+
+DECLARE_EVENT_CLASS(clk_rate,
+
+        TP_PROTO(struct clk_core *core, unsigned long rate),
+
+        TP_ARGS(core, rate),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name                )
+                __field(unsigned long,           rate                      )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+                __entry->rate = rate;
+        ),
+
+        TP_printk("%s %lu", __get_str(name), (unsigned long)__entry->rate)
+);
+
+DEFINE_EVENT(clk_rate, clk_set_rate,
+
+        TP_PROTO(struct clk_core *core, unsigned long rate),
+
+        TP_ARGS(core, rate)
+);
+
+DEFINE_EVENT(clk_rate, clk_set_rate_complete,
+
+        TP_PROTO(struct clk_core *core, unsigned long rate),
+
+        TP_ARGS(core, rate)
+);
+
+DECLARE_EVENT_CLASS(clk_parent,
+
+        TP_PROTO(struct clk_core *core, struct clk_core *parent),
+
+        TP_ARGS(core, parent),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name                )
+                __string(        pname,          parent->name              )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+                __assign_str(pname, parent->name);
+        ),
+
+        TP_printk("%s %s", __get_str(name), __get_str(pname))
+);
+
+DEFINE_EVENT(clk_parent, clk_set_parent,
+
+        TP_PROTO(struct clk_core *core, struct clk_core *parent),
+
+        TP_ARGS(core, parent)
+);
+
+DEFINE_EVENT(clk_parent, clk_set_parent_complete,
+
+        TP_PROTO(struct clk_core *core, struct clk_core *parent),
+
+        TP_ARGS(core, parent)
+);
+
+DECLARE_EVENT_CLASS(clk_phase,
+
+        TP_PROTO(struct clk_core *core, int phase),
+
+        TP_ARGS(core, phase),
+
+        TP_STRUCT__entry(
+                __string(        name,           core->name                )
+                __field(          int,           phase                     )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, core->name);
+                __entry->phase = phase;
+        ),
+
+        TP_printk("%s %d", __get_str(name), (int)__entry->phase)
+);
+
+DEFINE_EVENT(clk_phase, clk_set_phase,
+
+        TP_PROTO(struct clk_core *core, int phase),
+
+        TP_ARGS(core, phase)
+);
+
+DEFINE_EVENT(clk_phase, clk_set_phase_complete,
+
+        TP_PROTO(struct clk_core *core, int phase),
+
+        TP_ARGS(core, phase)
+);
+
+#endif /* _TRACE_CLK_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>