Merge branch 'common/clkfwk' into sh-fixes-for-linus

2 files changed, 0 insertions, 36 deletions

diff --git a/Documentation/DocBook/sh.tmpl b/Documentation/DocBook/sh.tmpl
index d858d92cf6d9..4a38f604fa66 100644
--- a/Documentation/DocBook/sh.tmpl
+++ b/Documentation/DocBook/sh.tmpl
@@ -79,10 +79,6 @@
       </sect2>
     </sect1>
   </chapter>
-  <chapter id="clk">
-    <title>Clock Framework Extensions</title>
-!Iinclude/linux/sh_clk.h
-  </chapter>
   <chapter id="mach">
     <title>Machine Specific Interfaces</title>
     <sect1 id="dreamcast">
diff --git a/Documentation/sh/clk.txt b/Documentation/sh/clk.txt
deleted file mode 100644
index 114b595cfa97..000000000000
--- a/Documentation/sh/clk.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Clock framework on SuperH architecture
-
-The framework on SH extends existing API by the function clk_set_rate_ex,
-which prototype is as follows:
-
-    clk_set_rate_ex (struct clk *clk, unsigned long rate, int algo_id)
-
-The algo_id parameter is used to specify algorithm used to recalculate clocks,
-adjanced to clock, specified as first argument. It is assumed that algo_id==0
-means no changes to adjanced clock
-
-Internally, the clk_set_rate_ex forwards request to clk->ops->set_rate method,
-if it is present in ops structure. The method should set the clock rate and adjust
-all needed clocks according to the passed algo_id.
-Exact values for algo_id are machine-dependent. For the sh7722, the following
-values are defined:
-
-        NO_CHANGE       = 0,
-        IUS_N1_N1,      /* I:U = N:1, U:Sh = N:1 */
-        IUS_322,        /* I:U:Sh = 3:2:2        */
-        IUS_522,        /* I:U:Sh = 5:2:2        */
-        IUS_N11,        /* I:U:Sh = N:1:1        */
-        SB_N1,          /* Sh:B = N:1            */
-        SB3_N1,         /* Sh:B3 = N:1           */
-        SB3_32,         /* Sh:B3 = 3:2           */
-        SB3_43,         /* Sh:B3 = 4:3           */
-        SB3_54,         /* Sh:B3 = 5:4           */
-        BP_N1,          /* B:P   = N:1           */
-        IP_N1           /* I:P   = N:1           */
-
-Each of these constants means relation between clocks that can be set via the FRQCR
-register