Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / metag / include / asm / clock.h

diff --git a/arch/metag/include/asm/clock.h b/arch/metag/include/asm/clock.h
index 3e2915a280c7b89cfead9cf5ef56240b267a9878..ded4ab2e1fd05f5acc75b45cef033520e0603519 100644 (file)
--- a/arch/metag/include/asm/clock.h
+++ b/arch/metag/include/asm/clock.h
@@ -19,6 +19,8 @@
  *                     core frequency will be determined like this:
  *                     Meta 1: based on loops_per_jiffy.
  *                     Meta 2: (EXPAND_TIMER_DIV + 1) MHz.
+ *                     If a "core" clock is provided by the device tree, it
+ *                     will override this function.
  */
 struct meta_clock_desc {
        unsigned long           (*get_core_freq)(void);
@@ -26,6 +28,12 @@ struct meta_clock_desc {
 
 extern struct meta_clock_desc _meta_clock;
 
+/*
+ * Perform platform clock initialisation, reading clocks from device tree etc.
+ * Only accessible during boot.
+ */
+void init_metag_clocks(void);
+
 /*
  * Set up the default clock, ensuring all callbacks are valid - only accessible
  * during boot.