diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-14 06:45:30 -0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-14 06:45:30 -0200 |
| commit | b93cd6a0c7352b428ba2b8437b44fff6e76d81d2 (patch) | |
| tree | 9521480c841f978f8299374a649d4c2ef0b2b22b /include | |
| parent | d291ffb3cf4f8f74b73bac77478c619251ee8a9f (diff) | |
| parent | ab4f75cd0a9f5ffdcc3d9fc2b29ca14525215b78 (diff) | |
Merge branch 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh
* 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh:
mailmap: Fix up some renesas attributions
sh: clkfwk: Kill off remaining debugfs cruft.
drivers: sh: Kill off dead pathname for runtime PM stub.
drivers: sh: Generalize runtime PM platform stub.
sh: Wire up process_vm syscalls.
sh: clkfwk: add clk_rate_mult_range_round()
serial: sh-sci: Fix up SH-2A SCIF support.
sh: Fix cached/uncaced address calculation in 29bit mode
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/serial_sci.h | 1 | ||||
| -rw-r--r-- | include/linux/sh_clk.h | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h index 0efa1f10bc2..369273a5267 100644 --- a/include/linux/serial_sci.h +++ b/include/linux/serial_sci.h @@ -67,6 +67,7 @@ enum { SCIx_IRDA_REGTYPE, SCIx_SCIFA_REGTYPE, SCIx_SCIFB_REGTYPE, + SCIx_SH2_SCIF_FIFODATA_REGTYPE, SCIx_SH3_SCIF_REGTYPE, SCIx_SH4_SCIF_REGTYPE, SCIx_SH4_SCIF_NO_SCSPTR_REGTYPE, diff --git a/include/linux/sh_clk.h b/include/linux/sh_clk.h index 3ccf18648d0..a20831cf336 100644 --- a/include/linux/sh_clk.h +++ b/include/linux/sh_clk.h @@ -52,7 +52,6 @@ struct clk { unsigned long arch_flags; void *priv; - struct dentry *dentry; struct clk_mapping *mapping; struct cpufreq_frequency_table *freq_table; unsigned int nr_freqs; @@ -94,6 +93,9 @@ int clk_rate_table_find(struct clk *clk, long clk_rate_div_range_round(struct clk *clk, unsigned int div_min, unsigned int div_max, unsigned long rate); +long clk_rate_mult_range_round(struct clk *clk, unsigned int mult_min, + unsigned int mult_max, unsigned long rate); + long clk_round_parent(struct clk *clk, unsigned long target, unsigned long *best_freq, unsigned long *parent_freq, unsigned int div_min, unsigned int div_max); |