Commit Graph

39238 Commits

Author SHA1 Message Date
Dima Zavin
760288c357 Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
	arch/arm/common/fiq_debugger.c

Change-Id: If8de163f3e1e41b35f87a5c8e9370f1cc28ed358
2010-11-11 15:35:21 -08:00
Dima Zavin
8086994fdf Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36 2010-11-11 15:31:45 -08:00
Jaikumar Ganesh
901204dc17 Bluetooth: Add BT_POWER L2CAP socket option.
Add BT_POWER socket option used to control the power
characteristics of the underlying ACL link. When the remote end
has put the link in sniff mode and the host stack wants to send
data we need need to explicitly exit sniff mode to work well with
certain devices (For example, A2DP on Plantronics Voyager 855).
However, this causes problems with HID devices.

Hence, moving into active mode when sending data, irrespective
of who set the sniff mode has been made as a socket option. By
default, we will move into active mode. HID devices can set the
L2CAP socket option to prevent this from happening.

Currently, this has been implemented for L2CAP sockets. This has been
tested with incoming and outgoing L2CAP sockets for HID and A2DP.

Based on discussions on linux-bluetooth and patches submitted by
Andrei Emeltchenko.

Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
2010-11-10 15:59:50 -08:00
Colin Cross
82d0935279 Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
	drivers/mmc/host/sdhci-tegra.c

Change-Id: Id44ce43b0c17f1f3e917b8c7ebfd213790e8e0e1
2010-11-09 15:50:14 -08:00
Colin Cross
1b7aeb9825 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-11-09 15:49:46 -08:00
Erik Gilling
15e220587f video: add short video mode decode to fbmon
Change-Id: Ida529e096688c231029628d3d16d6f8569bfe2c9
Signed-off-by: Erik Gilling <konkers@android.com>
2010-11-09 13:54:42 -08:00
Dima Zavin
156efc3e2d Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
	arch/arm/mach-tegra/devices.h
	arch/arm/mach-tegra/include/mach/iomap.h

Change-Id: I4c37389a3ac359b274bf4b45d7a1fb8cfae8c1f9
2010-11-08 00:04:30 -08:00
Dima Zavin
5d47678687 Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36 2010-11-07 23:55:59 -08:00
Dima Zavin
20e830c908 media: video: tegra: add support for the AVP media offload engine
Change-Id: Ia72e022ad1217ffe75915465ca0e886b16d1a64a
Signed-off-by: Dima Zavin <dima@android.com>
2010-11-07 23:34:45 -08:00
Dima Zavin
44729054a5 media: video: tegra: Add Tegra RPC support for tegra multimedia framework
Change-Id: I9233c5d7c678f6a9ba1c23af686137bf4d6a4291
Signed-off-by: Dima Zavin <dima@android.com>
2010-11-07 22:37:40 -08:00
makarand.karvekar
56b5fe87c2 qtouch: suspend/resume touch uC via wake-line
wake-line gpio high puts touch uC in low-power mode.
fixed inconsistent irq disable in suspend when irq_enable
is skipped due to i2c failure.

Change-Id: I6a9fe011abdffad599da0b2897f3a976db10fff5
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
2010-11-05 15:11:49 -07:00
Praveen Bharathi
a5ee9f2338 [ARM] mfd: cpcap-audio: add support for basic analog dock
The audio will now be routed to dock accesory when an accesory connected to
dock is detected.

Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-11-03 14:12:00 -07:00
Dima Zavin
01c2254a40 Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
	drivers/media/video/tegra/Kconfig
	drivers/media/video/tegra/Makefile
2010-11-02 16:30:03 -07:00
Dima Zavin
b3acf97b43 media: video: tegra: remove camera in tegra-moto since it moved to linux-tegra
Change-Id: Ifd25caa7ccd9a09eb7eaedc14786953eae78dce9
Signed-off-by: Dima Zavin <dima@android.com>
2010-11-02 16:23:57 -07:00
Colin Cross
3e759e2c91 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-11-02 16:21:11 -07:00
Colin Cross
02039465df Merge branch 'android-2.6.36' into android-tegra-2.6.36 2010-11-02 16:21:00 -07:00
Rebecca Schultz Zavin
44da1b533e media: video: tegra: add basic camera/isp support
The tegra_camera device includes all clock and regulator
functionality needed to support camera on tegra.

Change-Id: I281f1cb5f360276af832309e35dbe17c98b62bb3
Signed-off-by: Dima Zavin <dima@android.com>
2010-11-02 16:19:11 -07:00
Ravindra Lokhande
53bb435d8d [ARM] tegra: driver for spdif audio
Creates /dev/spdif_out and /dev/spdif_out_ctl for playback and control
settings.  Playback is working.

Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-11-02 14:10:42 -07:00
Theodore Ts'o
ff23269fde ext4: fix kernel oops if the journal superblock has a non-zero j_errno
Commit 84061e0 fixed an accounting bug only to introduce the
possibility of a kernel OOPS if the journal has a non-zero j_errno
field indicating that the file system had detected a fs inconsistency.
After the journal replay, if the journal superblock indicates that the
file system has an error, this indication is transfered to the file
system and then ext4_commit_super() is called to write this to the
disk.

But since the percpu counters are now initialized after the journal
replay, the call to ext4_commit_super() will cause a kernel oops since
it needs to use the percpu counters the ext4 superblock structure.

The fix is to skip setting the ext4 free block and free inode fields
if the percpu counter has not been set.

Thanks to Ken Sumrall for reporting and analyzing the root causes of
this bug.

Addresses-Google-Bug: #3054080

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
2010-10-29 18:23:44 -07:00
Erik Gilling
2afff3d793 Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Conflicts:
	drivers/mmc/host/sdhci-tegra.c

Change-Id: I52c329c835d80d868c731b23ca2d9dfad6e6586e
2010-10-26 18:24:50 -07:00
Erik Gilling
588ff569ea Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I0d4216b0a407e50c029a6c0869d727b188f7da04
2010-10-26 18:22:28 -07:00
Erik Gilling
185ddab215 video: tegra: add IOCTL for querying modes
Change-Id: Ic312271b96a8bb8d8b2696448d3ff7fd73a7a851
Signed-off-by: Erik Gilling <konkers@android.com>
2010-10-26 18:20:13 -07:00
John Kramer
bf7331d28b media: video: tegra: Add features to soc2030
Add user white balance, effects and exposure support
to the soc2030 2MP camera sensor driver

Change-Id: I8f572b9369bbbbab89b49a60046f48dbcb54b33d
Signed-off-by: John Kramer <john.kramer@motorola.com>
2010-10-26 10:52:25 -07:00
Dima Zavin
5ff1b9cdb1 Merge commit 'v2.6.36' into android-2.6.36 2010-10-21 15:00:17 -07:00
Colin Cross
e97de0161a Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 2010-10-21 14:52:49 -07:00
Colin Cross
677151f967 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-10-21 14:52:03 -07:00
Colin Cross
766197150f Merge commit 'v2.6.36' into linux-tegra-2.6.36 2010-10-21 14:48:14 -07:00
Colin Cross
c7f66ad4fa Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 2010-10-15 18:29:44 -07:00
Eric Paris
79b5dc0c64 types.h: define __aligned_u64 and expose to userspace
We currently have a kernel internal type called aligned_u64 which aligns
__u64's on 8 bytes boundaries even on systems which would normally align
them on 4 byte boundaries.  This patch creates a new type __aligned_u64
which does the same thing but which is exposed to userspace rather than
being kernel internal.

[akpm: merge early as both the net and audit trees want this]

[akpm@linux-foundation.org: enhance the comment describing the reasons for using aligned_u64.  Via Andreas and Andi.]
Based-on-patch-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>
Cc: Jan Engelhardt <jengelh@medozas.de>
Cc: David Miller <davem@davemloft.net>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-10-15 14:42:24 -07:00
Chris Fries
b6c6d40578 [ARM] mfd: cpcap-audio: fix typos.
Change-Id: Ic825d2765d6e1c879e4278e2c0212ddf9bf5959f
Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-10-15 13:39:59 -07:00
Colin Cross
9ab3d8b9fc Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-10-15 12:04:05 -07:00
Colin Cross
89c37cce1c Merge commit 'v2.6.36-rc8' into linux-tegra-2.6.36 2010-10-15 12:03:22 -07:00
Colin Cross
bedd07edd3 Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
	arch/arm/mach-tegra/tegra_i2s_audio.c

Change-Id: I9e2892c49d97c63de3a8e5797d6d9a123ae2d161
2010-10-14 17:19:09 -07:00
Colin Cross
5cb18262c7 Merge branch 'android-2.6.36' into android-tegra-2.6.36 2010-10-14 16:22:55 -07:00
Colin Cross
40ab482b69 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-10-14 16:22:51 -07:00
Dmitry Shmidt
a463843644 mmc: Fix pm_notifier obeying deferred resume
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-10-14 15:20:21 -07:00
Linus Torvalds
3aa0ce825a Un-inline the core-dump helper functions
Tony Luck reports that the addition of the access_ok() check in commit
0eead9ab41 ("Don't dump task struct in a.out core-dumps") broke the
ia64 compile due to missing the necessary header file includes.

Rather than add yet another include (<asm/unistd.h>) to make everything
happy, just uninline the silly core dump helper functions and move the
bodies to fs/exec.c where they make a lot more sense.

dump_seek() in particular was too big to be an inline function anyway,
and none of them are in any way performance-critical.  And we really
don't need to mess up our include file headers more than they already
are.

Reported-and-tested-by: Tony Luck <tony.luck@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-10-14 14:32:06 -07:00
Linus Torvalds
0eead9ab41 Don't dump task struct in a.out core-dumps
akiphie points out that a.out core-dumps have that odd task struct
dumping that was never used and was never really a good idea (it goes
back into the mists of history, probably the original core-dumping
code).  Just remove it.

Also do the access_ok() check on dump_write().  It probably doesn't
matter (since normal filesystems all seem to do it anyway), but he
points out that it's normally done by the VFS layer, so ...

[ I suspect that we should possibly do "vfs_write()" instead of
  calling ->write directly.  That also does the whole fsnotify and write
  statistics thing, which may or may not be a good idea. ]

And just to be anal, do this all for the x86-64 32-bit a.out emulation
code too, even though it's not enabled (and won't currently even
compile)

Reported-by: akiphie <akiphie@lavabit.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-10-14 10:57:40 -07:00
Iliyan Malchev
ce3ae8e74b [ARM] tegra_i2s_audio: fixes
-- Ignore kfifo thresholds on recording and playback and adjust the delays.
-- Take out the code from TEGRA_AUDIO_IN_STOP into a separate function
   stop_recording_nosync()
-- Rename stop_recording() to wait_for_recording_to_stop().
-- add ioctl(TEGRA_AUDIO_OUT_FLUSH), which blocks the caller until the output
   fifo is drained.  While the caller is blocked, pending write() calls will
   return immediately with whatever data they had managed to queue up.
-- removed ioctl(TEGRA_AUDIO_OUT_PRELOAD_FIFO)
-- since TEGRA_AUDIO_OUT_FLUSH and TEGRA_AUDIO_IN_STOP act similarly, moved
   audio_driver_state::recording_cancelled to audio_stream::stop and changed
   the code accordingly.  Renamed functions wait_for_recording_to_stop() and
   stop_recording_nosync() to wait_till_stopped() and request_stop_nosync()
   since they handle both playback and recording.
-- print errors on close() if wakelocks are still held
-- Call request_stop_nosync() on close() of a recording file handle
-- Do not use struct audio_stream::active for playback streams.  Instead,
   where applicable, use kfifo_len().  As a consequence, playback kfifo
   underruns are no longer reported.  These were bogus anyway, as we really
   need the DMA engine to tell us if there are underruns.
-- Because of above item, had to rework tx_fifo_atn_store(),
   rx_fifo_atn_store(), and __attr_fifo_atn_write().
-- Set struct audio_stream::active for a recording stream to true when a
   recording starts, and set it to false when recording get stopped.  Do not
   set/clear it within the body of read(), because just being within read()
   does not mean that recording is in progress.
-- In tegra_audio_read(), check for stop == true before calling
   start_recording_if_necessary(); this makes sure that if a user calls read()
   after calling ioctl(TEGRA_AUDIO_IN_STOP), recording will not resume unless
   ioctl(TEGRA_AUDIO_IN_START) gets called, or the file is closed and
   re-opened.
-- Fixed TEGRA_AUDIO_IN_START
-- In PIO mode, enabled FIFOs before enabling interrupts as specified in the
   TRM.
-- Added missing break in tegra_audio_ioctl().
-- Silenced some debug spew

Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-10-13 19:15:43 -07:00
Eric Paris
7c5347733d fanotify: disable fanotify syscalls
This patch disables the fanotify syscalls by just not building them and
letting the cond_syscall() statements in kernel/sys_ni.c redirect them
to sys_ni_syscall().

It was pointed out by Tvrtko Ursulin that the fanotify interface did not
include an explicit prioritization between groups.  This is necessary
for fanotify to be usable for hierarchical storage management software,
as they must get first access to the file, before inotify-like notifiers
see the file.

This feature can be added in an ABI compatible way in the next release
(by using a number of bits in the flags field to carry the info) but it
was suggested by Alan that maybe we should just hold off and do it in
the next cycle, likely with an (new) explicit argument to the syscall.
I don't like this approach best as I know people are already starting to
use the current interface, but Alan is all wise and noone on list backed
me up with just using what we have.  I feel this is needlessly ripping
the rug out from under people at the last minute, but if others think it
needs to be a new argument it might be the best way forward.

Three choices:
Go with what we got (and implement the new feature next cycle).  Add a
new field right now (and implement the new feature next cycle).  Wait
till next cycle to release the ABI (and implement the new feature next
cycle).  This is number 3.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-10-11 18:15:28 -07:00
Linus Torvalds
85a331881d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (27 commits)
  net: clear heap allocation for ETHTOOL_GRXCLSRLALL
  isdn: strcpy() => strlcpy()
  Revert "mac80211: use netif_receive_skb in ieee80211_tx_status callpath"
  mac80211: delete AddBA response timer
  ath9k_hw: fix regression in ANI listen time calculation
  caif: fix two caif_connect() bugs
  bonding: fix WARN_ON when writing to bond_master sysfs file
  skge: add quirk to limit DMA
  MAINTAINERS: update Intel LAN Ethernet info
  e1000e.txt: Add e1000e documentation
  e1000.txt: Update e1000 documentation
  ixgbevf.txt: Update ixgbevf documentation
  cls_u32: signedness bug
  Bluetooth: Disallow to change L2CAP_OPTIONS values when connected
  sctp: Fix out-of-bounds reading in sctp_asoc_get_hmac()
  sctp: prevent reading out-of-bounds memory
  ipv4: correct IGMP behavior on v3 query during v2-compatibility mode
  netdev: Depend on INET before selecting INET_LRO
  Revert "ipv4: Make INET_LRO a bool instead of tristate."
  net: Fix the condition passed to sk_wait_event()
  ...
2010-10-09 12:06:26 -07:00
Rebecca Schultz Zavin
639eb4e282 Merge commit 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36 2010-10-08 16:07:01 -07:00
Gary King
96bbe3e861 tegra: revert a bunch of changes
delete nvmap, nvhost, syncpoint flipping, nvos_page, inner-cacheable
and read-allocate code, so that they can be downmerged cleanly from
linux-tegra-2.6.35

Change-Id: I34793bb75cf359670fc18aaf1fcaf0b22be00d4d
Signed-off-by: Gary King <gking@nvidia.com>
2010-10-08 16:06:17 -07:00
Rebecca Schultz Zavin
fdab09d9f9 Merge commit 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36 2010-10-08 16:04:11 -07:00
Gary King
493f938e0d video: tegra: add host1x support to driver
includes changes by:

Antti Hatala <ahatala@nvidia.com> (1)
Gary King <gking@nvidia.com> (1)
Erik Gilling <konkers@android.com> (2)

Antti Hatala <ahatala@nvidia.com>
video: tegra: dc: use nvhost driver for host1x power management

Gary King <gking@nvidia.com>
video: tegra: fb: add ioctl to flip dc windows to nvmap handles

Erik Gilling <konkers@android.com>
video: tegra: dc: increment syncpoints following window flips
video: tegra: drain syncpt waits on display disable

Original commit messages:
**
video: tegra: dc: use nvhost driver for host1x power management

Incrementing the frame done syncpoint value from the display interrupt
requires that the host module is powered on. As the syncpoint state is
saved and restored automatically by the host driver a cpu increment of
a syncpoint in the powered down state will be lost.

Also adds checks for host module being powered.
**
video: tegra: fb: add ioctl to flip dc windows to nvmap handles

tegra user-space graphics drivers may allocate framebuffers using
nvmap rather than rendering to the common framebuffer, this may
be done to support deeper buffer pipelining, color formats
and pixel layouts other than the initial bootup framebuffer,
etc.

to use this ioctl, a caller must first specify an nvmap fd
which is already open in the calling process so that the
subsequent flip ioctls may be properly validated. flips are performed
asynchronously, with flip completion notifications provided back to
the caller via the host1x syncpoint mechanism

based on earlier changes made by Antti Hatala <ahatala@nvidia.com>
and Erik Gilling <konkers@android.com>

Change-Id: I4e8a8bb92085a485d65fd87d89112b2969ee37ff
Signed-off-by: Gary King <gking@nvidia.com>
2010-10-08 15:59:02 -07:00
Gary King
93fa4f2a2d video: tegra: move nvhost.h to mach-tegra/include/nvhost.h
Change-Id: I3bcc0a91cb379c0bd6ef382a5bf10e2406e55697
Signed-off-by: Gary King <gking@nvidia.com>
2010-10-08 15:59:00 -07:00
Chris Fries
bd3ee16444 [ARM] tegra: i2s: Add I2S ioctl for setting bit format
Added an ioctl to set the bit format for I2S between "DSP"/"PCM" mode and
normal mode (set by board file)

Signed-off-by: Iliyan Malchev <malchev@google.com>
2010-10-08 15:41:54 -07:00
Colin Cross
1f1f738398 Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
	arch/arm/mach-tegra/tegra_i2s_audio.c

Change-Id: Id7a483e1377549529f85a8fea67b76a881e40f87
2010-10-07 17:37:06 -07:00
Colin Cross
ecf1cce25c Merge branch 'android-2.6.36' into android-tegra-2.6.36 2010-10-07 17:35:27 -07:00
Colin Cross
bb3212324f Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2010-10-07 17:35:10 -07:00