← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/plat-omap/counter_32k.c

  • 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/arm/plat-omap/counter_32k.c
54
54
#define omap16xx_32k_read       NULL
55
55
#endif
56
56
 
57
 
#ifdef CONFIG_ARCH_OMAP2420
 
57
#ifdef CONFIG_SOC_OMAP2420
58
58
static cycle_t notrace omap2420_32k_read(struct clocksource *cs)
59
59
{
60
60
        return omap_readl(OMAP2420_32KSYNCT_BASE + 0x10) - offset_32k;
63
63
#define omap2420_32k_read       NULL
64
64
#endif
65
65
 
66
 
#ifdef CONFIG_ARCH_OMAP2430
 
66
#ifdef CONFIG_SOC_OMAP2430
67
67
static cycle_t notrace omap2430_32k_read(struct clocksource *cs)
68
68
{
69
69
        return omap_readl(OMAP2430_32KSYNCT_BASE + 0x10) - offset_32k;
107
107
        .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
108
108
};
109
109
 
 
110
struct clocksource *get_clocksource_32k(void)
 
111
{
 
112
        return &clocksource_32k;
 
113
}
 
114
 
110
115
/*
111
116
 * Returns current time from boot in nsecs. It's OK for this to wrap
112
117
 * around for now, as it's just a relative time stamp.