← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to arch/mips/include/asm/octeon/trace-clock.h

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/mips/include/asm/octeon/trace-clock.h
 
1
/*
 
2
 * Copyright (C) 2005,2008 Mathieu Desnoyers
 
3
 *
 
4
 * Trace clock MIPS Octeon definitions.
 
5
 */
 
6
 
 
7
#ifndef _ASM_MIPS_OCTEON_TRACE_CLOCK_H
 
8
#define _ASM_MIPS_OCTEON_TRACE_CLOCK_H
 
9
 
 
10
#include <asm/octeon/octeon.h>
 
11
 
 
12
#define TC_HW_BITS                      64
 
13
 
 
14
static inline u32 trace_clock_read32(void)
 
15
{
 
16
        return (u32)read_c0_cvmcount(); /* only need the 32 LSB */
 
17
}
 
18
 
 
19
static inline u64 trace_clock_read64(void)
 
20
{
 
21
        return read_c0_cvmcount();
 
22
}
 
23
 
 
24
static inline u64 trace_clock_frequency(void)
 
25
{
 
26
        return octeon_get_clock_rate();
 
27
}
 
28
 
 
29
static inline u32 trace_clock_freq_scale(void)
 
30
{
 
31
        return 1;
 
32
}
 
33
 
 
34
static inline int get_trace_clock(void)
 
35
{
 
36
        return 0;
 
37
}
 
38
 
 
39
static inline void put_trace_clock(void)
 
40
{
 
41
        return;
 
42
}
 
43
#endif /* _ASM_MIPS_OCTEON_TRACE_CLOCK_H */