← 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/include/plat/dmtimer.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/arm/plat-omap/include/plat/dmtimer.h
3
3
 *
4
4
 * OMAP Dual-Mode Timers
5
5
 *
 
6
 * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.com/
 
7
 * Tarun Kanti DebBarma <tarun.kanti@ti.com>
 
8
 * Thara Gopinath <thara@ti.com>
 
9
 *
 
10
 * Platform device conversion and hwmod support.
 
11
 *
6
12
 * Copyright (C) 2005 Nokia Corporation
7
13
 * Author: Lauri Leukkunen <lauri.leukkunen@nokia.com>
8
14
 * PWM and clock framwork support by Timo Teras.
44
50
#define OMAP_TIMER_TRIGGER_OVERFLOW             0x01
45
51
#define OMAP_TIMER_TRIGGER_OVERFLOW_AND_COMPARE 0x02
46
52
 
 
53
/*
 
54
 * IP revision identifier so that Highlander IP
 
55
 * in OMAP4 can be distinguished.
 
56
 */
 
57
#define OMAP_TIMER_IP_VERSION_1                        0x1
47
58
struct omap_dm_timer;
48
59
extern struct omap_dm_timer *gptimer_wakeup;
49
60
extern struct sys_timer omap_timer;