linux-stable/drivers/staging
Olof Johansson c8a1ceccf3 Timer clean-up to get us closer to moving timer code to drivers,
and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
 or devicetree provided timer configuration.
 
 Note that these changes are on top of the recent timer fixes.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJQrR6hAAoJEBvUPslcq6VzpzQP/iSD9/hmauoZ8oO5R2poVNNZ
 R5nsSCNRZgvOEZrs0o0wyXJWig0N5zHLsFz9cExad3AbiOyVL5dWXdk4RAEIt9y4
 2yuydZXma2e6DidQ3vEMYapRKF3ggj18SINbHhoxBaHEx3ZHFWF2DTzlX1jhFDlZ
 ptZ4yj75laoLIlIGz6o/GMEWNznhA/+fZ0N2N0hTfOiuHCatB6WJ5Mco4Y5tgkem
 FTWffJDrXS2WTqNnk0VCJs6atuBN/hKwg4ixCXG8aO9byV9YKqEfrHWHLN1YIiRQ
 VLjM2DvwSHhbjhBZKIU/5a35MTKr1wsRlrwxyMAy9NfP+HfiCG10N98lx43mP9r5
 8reqMlBcWQ0HRpd6FhP1JoDd78ogNzLI2g0H/YAjxNVnjrUBnGoxqp4ubCLQpGwG
 rz2W9d71RK7EnbC4n90ftHl1EoBWUGOqo6t2iBoQK+X9IQwddB6OmvHZbrE3174D
 nkNb47+nr89kZ0ZsTtKZsMhajHdMpLDDwT9PchglQi1gix09ObF2UNU3I2hx928s
 LvPjtGB4lhS77/b7I3izMtNu84jnCyK1NrOLcbnvO5cwEExpRWIWA0GNj/Bhx4XJ
 VUE0Q64D45k/I3vsJOWJBzUSJBjb/Bi5M8/UevBp9eXUy8nwNW55h8AkqkIdTPUn
 gb4xjTrNWoiawNvtSbH+
 =XZ+L
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

Timer clean-up to get us closer to moving timer code to drivers,
and to get rid of CONFIG_OMAP_32K_TIMER and rely on the board
or devicetree provided timer configuration.

Note that these changes are on top of the recent timer fixes.

By Jon Hunter (32) and others
via Tony Lindgren
* tag 'omap-for-v3.8/cleanup-timer-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (71 commits)
  ARM: OMAP3: cm-t3517: use GPTIMER for system clock
  ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
  ARM: OMAP2+: Fix compiler warning for 32k timer
  ARM: OMAP: Remove unnecessary inclusion of dmtimer.h
  ARM: OMAP: Add platform data header for DMTIMERs
  ARM: OMAP: Remove unnecessary omap_dm_timer structure declaration
  ARM: OMAP2+: Remove unnecessary local variable in timer code
  ARM: OMAP: Don't store timers physical address
  ARM: OMAP: Define omap_dm_timer_prepare function as static
  ARM: OMAP: Clean-up dmtimer reset code
  ARM: OMAP: Remove __omap_dm_timer_set_source function
  ARM: OMAP: Remove unnecessary call to clk_get()
  ARM: OMAP: Add dmtimer interrupt disable function
  ARM: OMAP: Fix spurious interrupts when using timer match feature
  ARM: OMAP: Don't restore DMTIMER interrupt status register
  ARM: OMAP: Don't restore of DMTIMER TISTAT register
  ARM: OMAP: Fix dmtimer reset for timer1
  ARM: OMAP2+: Don't use __omap_dm_timer_reset()
  ARM: OMAP2/3: Define HWMOD software reset status for DMTIMERs
  ARM: OMAP3: Correct HWMOD DMTIMER SYSC register declarations
  ...

Change/change conflict in arch/arm/mach-omap2/board-cm-t3517.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-11-29 22:30:11 -08:00
..
android Revert "Staging: Android alarm: IOCTL command encoding fix" 2012-11-13 13:04:43 -08:00
asus_oled
bcm Staging: bcm: Remove typedef for _stCPacketClassificationRuleSI and call directly. 2012-09-26 09:31:52 -07:00
ccg Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq 2012-10-02 09:54:49 -07:00
ced1401 staging:ced1401: remove read write callbacks from fops 2012-09-21 08:56:41 -07:00
comedi staging: comedi: ni_labpc: fix possible NULL deref during detach 2012-10-22 11:46:35 -07:00
cptm1217
crystalhd
csr staging: Fix spelling of "asynchronous" in comments. 2012-09-21 08:56:41 -07:00
cxt1e1
dgrp staging: dgrp: check return value of alloc_tty_driver 2012-10-17 14:10:10 -07:00
echo
et131x Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
frontier
ft1000 staging: ft1000: replace c99 comments with c88 2012-09-17 05:31:32 -07:00
gdm72xx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-10-02 13:38:27 -07:00
iio staging:iio:adis16400: Fixup adis16336 temp channel attributes 2012-10-19 16:23:34 +01:00
imx-drm staging: drm/imx: Add TODO 2012-09-21 09:17:07 -07:00
ipack staging: ipack: add missing include (implicit declaration of function 'kfree') 2012-10-24 15:12:01 -07:00
keucr USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
line6
media [media] v4l2: make vidioc_s_crop const 2012-09-26 11:02:25 -03:00
net
nvec staging: nvec: remove include of <mach/iomap.h> 2012-11-05 11:36:05 -07:00
octeon
olpc_dcon
omap-thermal Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux into thermal 2012-10-09 01:35:52 -04:00
omapdrm staging: omapdrm: fix allocation size for page addresses array 2012-10-22 15:41:09 -07:00
ozwpan staging: ozwpan: compare pointer to NULL rather than 0 2012-09-19 09:28:14 +01:00
panel staging: Fix misspellings of "whether". 2012-09-21 08:56:40 -07:00
phison
quickstart
ramster staging: ramster: depends on NET 2012-10-22 15:42:38 -07:00
rtl8187se
rtl8192e Staging tree update for 3.7-rc1 2012-10-01 12:11:39 -07:00
rtl8192u staging: Fix misspellings of "whether". 2012-09-21 08:56:40 -07:00
rtl8712 staging: r8712u: Do not queue cloned skb 2012-09-26 13:05:50 -07:00
rts5139 staging: rts5139: use kzalloc() to close an info leak 2012-09-26 09:19:50 -07:00
rts_pstor staging/rts_pstor: Delete some lines (dev_info() and dev_err()) in rtsx.c 2012-09-21 08:56:41 -07:00
sbe-2t3e3 staging: sbe-2t3e3: fix error handling in t3e3_init_channel() 2012-09-25 15:48:25 -07:00
sep
serqt_usb2 USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
silicom staging: fix silicom dependencies and build errors 2012-09-21 08:56:40 -07:00
slicoss
sm7xxfb staging: sm7xxfb: remove smtc_VRAMBaseAddress 2012-09-17 14:57:53 -07:00
speakup TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
ste_rmi4
telephony staging: Fix spelling of "asynchronous" in comments. 2012-09-21 08:56:41 -07:00
tidspbridge ARM: OMAP: Remove unnecessary inclusion of dmtimer.h 2012-11-16 10:35:08 -06:00
usbip USB merge for 3.7-rc1 2012-10-01 13:23:01 -07:00
vme
vt6655
vt6656
winbond Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-10-02 13:38:27 -07:00
wlags49_h2
wlags49_h25 staging: "wlags49_h25" Fix typos. 2012-09-17 14:50:33 -07:00
wlan-ng staging "wlan-ng" Fix typos. 2012-09-26 09:19:50 -07:00
xgifb
zcache
zram staging: zram: Fix handling of incompressible pages 2012-10-22 13:45:19 -07:00
zsmalloc
Kconfig TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
Makefile TTY merge for 3.7-rc1 2012-10-01 12:26:52 -07:00
staging.c