Chris Fries [Thu, 21 Oct 2010 04:20:49 +0000 (23:20 -0500)]
[ARM] mfd: cpcap-audio: disable unused audio hardware
Disable unused audio hardware, and decouple the STDAC and CODEC states.
- While controlling output, don't touch CODEC state/mute
- While controlling input, don't touch STDAC state/mute
- Don't enable external input gains, it's not connected.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Greg Goldman [Thu, 21 Oct 2010 21:04:41 +0000 (14:04 -0700)]
net: wireless: bcm4329: Improve BT-coex for eSCO
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
John Michelau [Fri, 22 Oct 2010 01:07:34 +0000 (20:07 -0500)]
[ARM] tegra: stingray: Enable CONFIG_USB_ANDROID_RNDIS_WCEIS
This makes RNDIS enumerate the same as prior devices
Change-Id: I2dcdf41e25ff669958d34319b6fe0752c70da732
Signed-off-by: Mike Lockwood <lockwood@google.com>
Colin Cross [Thu, 9 Sep 2010 02:45:30 +0000 (19:45 -0700)]
[ARM] tegra: common: Enable clocks that should always be on
Change-Id: Ic2cb51d54b0a75081672acf0bccbc859d817cd88
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 16 Sep 2010 21:59:49 +0000 (14:59 -0700)]
[ARM] tegra: clock: Don't use PLL lock bits
The PLL lock bits are not reliable, use per-PLL timeouts instead.
Change-Id: I2749e0d8bcfb0b60dbbcf6378b38307f77ff8d4d
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Sep 2010 03:01:04 +0000 (20:01 -0700)]
[ARM] tegra: clock: Drop debugging
Change-Id: Ic707eb111856eb9bdb165776d011c35d04502a9a
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Sep 2010 02:41:58 +0000 (19:41 -0700)]
[ARM] tegra: clock: Don't BUG on changing an enabled PLL
Change-Id: Id213fd4ad8ae1e4429e31625c8b61d6be3fe708f
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 21 Oct 2010 02:30:48 +0000 (19:30 -0700)]
[ARM] tegra: clock: Add host and avp clocks
Change-Id: Icde28cb63ecb7c210a05d25fbc6be96337f96a17
Signed-off-by: Colin Cross <ccross@android.com>
Dima Zavin [Thu, 21 Oct 2010 22:00:17 +0000 (15:00 -0700)]
Merge commit 'v2.6.36' into android-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:52:49 +0000 (14:52 -0700)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:52:07 +0000 (14:52 -0700)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:52:03 +0000 (14:52 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Thu, 21 Oct 2010 21:48:14 +0000 (14:48 -0700)]
Merge commit 'v2.6.36' into linux-tegra-2.6.36
Benoit Goby [Thu, 21 Oct 2010 20:57:57 +0000 (13:57 -0700)]
mdm6600: Request irq after wakelocks have been initialized
Change-Id: Iaf316e96818a0c728be57d57a992e072e4c7e4a5
Signed-off-by: Benoit Goby <benoit@android.com>
Brian Swetland [Thu, 21 Oct 2010 21:19:31 +0000 (14:19 -0700)]
staging: remove Greg's TODO, now obsolete.
Signed-off-by: Brian Swetland <swetland@google.com>
Colin Cross [Thu, 21 Oct 2010 00:43:34 +0000 (17:43 -0700)]
[ARM] tegra: stingray: Add vdd_core regulator consumer
Change-Id: I0fa5ec3281322ba42f5a517bbd2974527a4b04fb
Signed-off-by: Colin Cross <ccross@android.com>
Erik Gilling [Thu, 21 Oct 2010 01:28:16 +0000 (18:28 -0700)]
Merge branch 'android-tegra' into android-tegra-moto
Erik Gilling [Thu, 21 Oct 2010 01:27:16 +0000 (18:27 -0700)]
Merge branch 'linux-tegra' into android-tegra
Erik Gilling [Tue, 19 Oct 2010 21:51:09 +0000 (14:51 -0700)]
video: tegra: clear video modes on hdmi unplug
Change-Id: If9aabc5efa1b934c94e71e0210f38979f6f7e58e
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 19 Oct 2010 21:49:05 +0000 (14:49 -0700)]
video: tegra: allow clearing of video modes in fb driver
Change-Id: Ibec4fd2ef7136843b68c52b60862b2c5c3e795fc
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 19 Oct 2010 21:48:26 +0000 (14:48 -0700)]
video: tegra: don't enable display when mode is invalid
Change-Id: I84a494f7c125ceadbe39a681a8ed7cfa244a6a2b
Signed-off-by: Erik Gilling <konkers@android.com>
Iliyan Malchev [Wed, 20 Oct 2010 22:18:12 +0000 (15:18 -0700)]
[ARM] tegra: stingray: configure tx/rx for i2s.0 and i2s.1
-- configure i2s.0 only for playback
-- configure i2s.1 for both playback and recording
Signed-off-by: Iliyan Malchev <malchev@google.com>
Colin Cross [Wed, 20 Oct 2010 05:10:29 +0000 (22:10 -0700)]
[ARM] tegra: stingray: Set fb depth to 16, flip fb at probe
Change-Id: Iec30406b433379c1cc06cc70015605e1d43f67d8
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 23:18:22 +0000 (16:18 -0700)]
[ARM] tegra: stingray: Move framebuffer, enable protected aperture
Change-Id: I5aa3cb2e3d735d2c5dede35ec8870f948cf176c5
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 20 Oct 2010 05:09:32 +0000 (22:09 -0700)]
[ARM] tegra: stingray: Update defconfig for nvmap
Turns on NVMAP_RECLAIM_UNPINNED_VM and NVMAP_HIGHMEM_ONLY
Turns off NVMAP_ALLOW_SYSMEM
Change-Id: I428b9336933a113696866809a796b442beef90d1
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 21:49:56 +0000 (14:49 -0700)]
[ARM] tegra: stingray: HACK: Reserve old bootloader framebuffer
In bootloader 1021, the address of the framebuffer is not reported
correctly. Manually reserve the location it is actually at.
Change-Id: Ie989ea0c5d8d7c34893585431228e274c623372f
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 21:48:20 +0000 (14:48 -0700)]
[ARM] tegra: stingray: Use memblock for fb, carveout, and ramconsole
Calls tegra_reserve to reserve memory for the carveout and framebuffer
at the end of memory, and uses memblock_remove on the ram console
memory to allow it to be iomapped later by the ram console driver.
Change-Id: I05cf7c852e3a2260a84e980b2bfb6ae1927168d6
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 20 Oct 2010 21:44:20 +0000 (14:44 -0700)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Wed, 20 Oct 2010 21:39:20 +0000 (14:39 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c
Change-Id: I3e05a70e3fb8fdaa8ca4c5ed78ca020c75ed0caa
Colin Cross [Wed, 20 Oct 2010 21:35:05 +0000 (14:35 -0700)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Wed, 20 Oct 2010 05:11:37 +0000 (22:11 -0700)]
video: tegra: fb: Add flag to flip fb during probe
Change-Id: Ibe65175392fe2fe491cb88b5df0771a17bc0c706
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 01:01:45 +0000 (18:01 -0700)]
video: tegra: dc: Move init to module_init
Move dc init to the device init level so that all clocks are
initialized before the late init level. This depends on I2C
being initialized in the subsys init level.
Change-Id: Iafe759d943b6cc90d5c6718b69e872e14d6acd4e
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 14 Oct 2010 01:00:21 +0000 (18:00 -0700)]
i2c: busses: i2c-tegra: Move init to subsys_initcall
Some drivers (like hdmi) need to communicate over i2c during probe.
Move the i2c bus init to the subsys init level so that i2c is ready
for the start of the device init level.
Change-Id: I81234d42aa26b657ffc619099e47df09e12083bb
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 20 Oct 2010 04:09:29 +0000 (21:09 -0700)]
[ARM] tegra: Add function to copy framebuffer contents
Due to conflicting restrictions on the location of the framebuffer
between the bootloader and the protected aperture, the framebuffer
is likely to need to be moved during boot. This patch provides
tegra_move_framebuffer, which can handle move the framebuffer from
lowmem, highmem, or unmapped memory into unmapped memory.
Change-Id: Ic37e5e337cd3129065fe56fd7777a86d06ad69ac
Colin Cross [Wed, 20 Oct 2010 01:33:52 +0000 (18:33 -0700)]
video: tegra: nvmap: Prevent reverting to sysmem for small allocations
Change-Id: Icfe552ad4a968329a1a2959d5b438062587a83b6
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 23:08:48 +0000 (16:08 -0700)]
[ARM] tegra: suspend: Save protected aperture across LP0
Change-Id: Iab66c566957cfbac8ddab615ec92e57c2164ab68
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 23:12:33 +0000 (16:12 -0700)]
[ARM] tegra: Add function to enable protected aperture
Change-Id: I699cee3bc9a131259b330655126146f5d1f92043
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 21:45:50 +0000 (14:45 -0700)]
[ARM] tegra: Use memblock_remove to allocate carveout and framebuffer
This uses the patch by rmk to allow memblock_remove to be used to
remove areas of memory from the 1:1 mapping, allowing them to be
remapped later using iomap or, for Tegra, nvmap.
Also uses memblock_reserve to reserve the lp0 boot vector, so it
doesn't need to be copied later in tegra_init_suspend.
tegra_reserve should be called from the machine reserve callback
after any board-specific memory areas are reserved.
Change-Id: I26be8544a03b6da74fe66dc53a77681d431c303c
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Tue, 19 Oct 2010 19:42:34 +0000 (12:42 -0700)]
[ARM] mm: init: Use memblock to set up memory map
Based on patch by rmk on lkml at http://lkml.org/lkml/2010/10/11/179
Reverts changes to find_limits to fix crash when using memblock_remove
on the end of memory.
Original-author: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Colin Cross <ccross@android.com>
Change-Id: I6137a7939329381e4ed34bfcdc8b713dc50ebcc8
Rebecca Schultz Zavin [Tue, 19 Oct 2010 22:57:40 +0000 (15:57 -0700)]
video: tegra: nvmap: Remove warning from nvmap_pin
The framebuffer driver needs to be able to arbitrarily pin whatever
gets handed to it. Regardless of the interface used, functions need
to unpin as soon as they finish using the gart anyway.
Change-Id: Ida8aea2fb6eaca8bcbf3ae72f8dfa849dc198542
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Chris Fries [Wed, 20 Oct 2010 18:10:29 +0000 (13:10 -0500)]
[ARM] tegra_i2s_audio: support mono capture
Support mono data formats such as DSP PCM Mode with 16 bit mono capture.
This patch also disables the in-driver downsampler.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Linus Torvalds [Wed, 20 Oct 2010 20:30:22 +0000 (13:30 -0700)]
Linux 2.6.36
Linus Torvalds [Wed, 20 Oct 2010 20:18:21 +0000 (13:18 -0700)]
Merge branch 'upstream' of git://git.linux-mips.org/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
MAINTAINERS: Change list for ioc_serial to linux-serial.
SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
MIPS: jz4740: Fix Kbuild Platform file.
MIPS: Repair Kbuild make clean breakage.
Amit Shah [Wed, 20 Oct 2010 03:15:43 +0000 (13:45 +1030)]
virtio: console: Don't block entire guest if host doesn't read data
If the host is slow in reading data or doesn't read data at all,
blocking write calls not only blocked the program that called write()
but the entire guest itself.
To overcome this, let's not block till the host signals it has given
back the virtio ring element we passed it. Instead, send the buffer to
the host and return to userspace. This operation then becomes similar
to how non-blocking writes work, so let's use the existing code for this
path as well.
This code change also ensures blocking write calls do get blocked if
there's not enough room in the virtio ring as well as they don't return
-EAGAIN to userspace.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Acked-by: Hans de Goede <hdegoede@redhat.com>
CC: stable@kernel.org
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Wed, 20 Oct 2010 20:13:09 +0000 (13:13 -0700)]
Merge git://git./linux/kernel/git/jejb/scsi-rc-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
[SCSI] bsg: fix incorrect device_status value
[SCSI] Fix VPD inquiry page wrapper
Chris Fries [Wed, 20 Oct 2010 18:06:23 +0000 (13:06 -0500)]
[ARM] mfd: cpcap-audio: Switch CODEC into network mode
CODEC can support I2S or Network data modes. Switch to Network mode to cleanly
support single-channel capture.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Chris Fries [Wed, 20 Oct 2010 18:08:29 +0000 (13:08 -0500)]
[ARM]: tegra: stingray: Use CPCAP CODEC in Network (PCM) mode
Change the data format for I2S2 to be DSP mode, to support mono capture from
the microphone.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Wed, 20 Oct 2010 00:50:32 +0000 (17:50 -0700)]
[ARM] tegra_i2s_audio: add support for selecting tx/rx channels separately
Signed-off-by: Iliyan Malchev <malchev@google.com>
Greg Goldman [Mon, 18 Oct 2010 22:12:55 +0000 (15:12 -0700)]
net: wireless: bcm4329: Update to Version 4.218.248-10
Add KEEP_ALIVE feature, fix 'driver rssi' processing, fix roaming processing
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
makarand.karvekar [Wed, 20 Oct 2010 15:30:48 +0000 (10:30 -0500)]
tegra: general touch tuning in stingray board file
FW settings for general tuning.
updated objects:
T7-POWER CONFIG
T9-Multitouch Object
cte_config_cfg
acquire_cfg
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
Rebecca Schultz Zavin [Wed, 20 Oct 2010 16:26:30 +0000 (09:26 -0700)]
[ARM] tegra: Enable panic on softlockup in stingray defconfig
Change-Id: Ic7b866f7ffc817a8ee694b74ce4dc3e5cbf9fd54
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Salman Qazi [Tue, 12 Oct 2010 14:25:19 +0000 (07:25 -0700)]
hrtimer: Preserve timer state in remove_hrtimer()
The race is described as follows:
CPU X CPU Y
remove_hrtimer
// state & QUEUED == 0
timer->state = CALLBACK
unlock timer base
timer->f(n) //very long
hrtimer_start
lock timer base
remove_hrtimer // no effect
hrtimer_enqueue
timer->state = CALLBACK |
QUEUED
unlock timer base
hrtimer_start
lock timer base
remove_hrtimer
mode = INACTIVE
// CALLBACK bit lost!
switch_hrtimer_base
CALLBACK bit not set:
timer->base
changes to a
different CPU.
lock this CPU's timer base
The bug was introduced with commit
ca109491f (hrtimer: removing all ur
callback modes) in 2.6.29
[ tglx: Feed new state via local variable and add a comment. ]
Signed-off-by: Salman Qazi <sqazi@google.com>
Cc: akpm@linux-foundation.org
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <
20101012142351.8485.21823.stgit@dungbeetle.mtv.corp.google.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: stable@kernel.org
Linus Torvalds [Wed, 20 Oct 2010 16:00:44 +0000 (09:00 -0700)]
Merge branch 'kvm-updates/2.6.36' of git://git./virt/kvm/kvm
* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
KVM: Fix fs/gs reload oops with invalid ldt
Benoit Goby [Tue, 19 Oct 2010 03:01:26 +0000 (20:01 -0700)]
mdm6600: Suspend the bus immediately after the modem
Since the modem is the only device connected to the bus, the bus may be
suspended immediately after the modem.
Change-Id: I3ce209d84c3920b34543a65f9ac079c07d45572a
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Thu, 14 Oct 2010 21:36:29 +0000 (14:36 -0700)]
mdm6600: Increase the write pool size
Change-Id: I351c1d03a0796d763ae6dc9aefbb838e9d0afb08
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Wed, 13 Oct 2010 21:52:44 +0000 (14:52 -0700)]
mdm6600: Fix mdm6600_close
Some urbs might succeed while running mdm6600_close, don't re-enqueue
them.
Add autopm_get_interface to balance the put_interface in open.
Change-Id: I947e6223d06d523169b458f4c324eff6f1fd24fe
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Mon, 11 Oct 2010 23:54:48 +0000 (16:54 -0700)]
mdm6600: Add write_room and chars_in_buffer
Change-Id: I119e88938a06c4abfc0ad4da19fdb7b75a8329de
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Tue, 12 Oct 2010 00:00:24 +0000 (17:00 -0700)]
mdm6600: Fix spinlock usage to avoid GFP_ATOMIC allocations
usb_serial holds an autopm reference before calling open, so the
modem is always resumed when open is called.
Change-Id: Ica2f4e69620fd1d80f4bfc43dd3453313c1be185
Signed-off-by: Benoit Goby <benoit@android.com>
Dmitry Shmidt [Tue, 19 Oct 2010 23:06:36 +0000 (16:06 -0700)]
mmc: sdhci: Enable MMC_CAP_ERASE
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Todd Poynor [Tue, 12 Oct 2010 00:27:00 +0000 (17:27 -0700)]
[ARM] tegra android: Remove PMEM driver from tegra_defconfig
Change-Id: Idf2cd0db1c66d3c55a1e7d87ba2378fade1584ff
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Todd Poynor [Wed, 13 Oct 2010 01:38:51 +0000 (18:38 -0700)]
Temporary I2C debugging code
To help diagnose repeated transfer timeouts and interrupt storms on
Stingray.
Change-Id: I55366d269c6bc4ffdb4468a614442f2dad87ace1
Todd Poynor [Fri, 27 Aug 2010 01:10:54 +0000 (18:10 -0700)]
[ARM] Tegra: Stingray: Switch from CMDLINE partitions to GPT.
Depends on:
- MMC > 8 partitions per card
- EFI/GPT named partitions
Change-Id: I026f879a05b95b3b65c5a334e4a3aca75be6984f
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Rebecca Schultz Zavin [Tue, 19 Oct 2010 19:50:25 +0000 (12:50 -0700)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Tue, 19 Oct 2010 19:48:52 +0000 (12:48 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Gary King [Wed, 13 Oct 2010 01:10:31 +0000 (18:10 -0700)]
Revert "[ARM] mm: add page allocator for modifying cache attributes"
This reverts commit
54d414570432ce07fa1a14b657f53bed752e3d7e.
Change-Id: I8e5cf6ef3555129da9741ef52a1e6a3a772ad588
Signed-off-by: Gary King <gking@nvidia.com>
Gary King [Wed, 13 Oct 2010 00:40:18 +0000 (17:40 -0700)]
video: tegra: nvmap: eliminate arm_attrib_allocator dependency
remove the dependency that nvmap has on the arm_attrib_allocator
and the lowmem in PTEs change by adding a private page allocator
utility function and calling vm_map_ram unconditionally for all
sysmem handles.
also, add Kconfig variables to allow platforms to disallow the
SYSMEM heap, and to optionally restrict the SYSMEM and IOVMM
heaps to just HIGHMEM.
Change-Id: I3dab1c7323f54a8ab3994dc672b27fd79a9057d7
Signed-off-by: Gary King <gking@nvidia.com>
Chris Fries [Thu, 14 Oct 2010 21:30:05 +0000 (16:30 -0500)]
[ARM] tegra: stingray: set bus with on i2s playback to 32 bits
-- Change Stingray STDAC's I2S to be 32 bits, packed, to avoid left/right audio
swaps.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Greg Meiste [Fri, 15 Oct 2010 19:22:00 +0000 (14:22 -0500)]
power: ds2781: Reduce wakeups from suspend
Increase SLOW_POLL to 20 minutes to improve current drain. However,
if temperature is over TEMP_HOT, remain at fast poll rate.
Change-Id: I9361a98b1a57f415cacf05008444e47adca13dc8
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Fri, 15 Oct 2010 16:28:02 +0000 (11:28 -0500)]
power: ds2781: Fix alarm
The driver was waking the system from LP0 every minute, instead of
every ten minutes like desired.
Change-Id: Iac38b02c7239e20eb1b9ea7e390b61c065a31d70
Signed-off-by: Greg Meiste <w30289@motorola.com>
Michel Thebeau [Tue, 28 Sep 2010 18:15:37 +0000 (14:15 -0400)]
MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
[Ralf: Michel's original patch only fixed N32; I replicated the same fix
for O32.]
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
Cc: paul.gortmaker@windriver.com
Cc: bruce.ashfield@windriver.com
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Ralf Baechle [Tue, 19 Oct 2010 17:32:41 +0000 (18:32 +0100)]
MAINTAINERS: Change list for ioc_serial to linux-serial.
IOC3 is also being used on SGI MIPS systems but this particular driver is
only being used on IA64 systems so linux-mips made no sense as a list. Pat
also thinks linux-serial@vger.kernel.org is the better list.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Julia Lawall [Fri, 15 Oct 2010 13:00:09 +0000 (15:00 +0200)]
SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
In this code, 0 is returned on memory allocation failure, even though other
failures return -ENOMEM or other similar values.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
expression ret;
expression x,e1,e2,e3;
@@
ret = 0
... when != ret = e1
*x = \(kmalloc\|kcalloc\|kzalloc\)(...)
... when != ret = e2
if (x == NULL) { ... when != ret = e3
return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
To: Pat Gefre <pfg@sgi.com>
Cc: kernel-janitors@vger.kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/1704/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
David Daney [Tue, 19 Oct 2010 01:05:49 +0000 (18:05 -0700)]
MIPS: jz4740: Fix Kbuild Platform file.
The platform specific files should be included via the platform-y
variable.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Patchwork: https://patchwork.linux-mips.org/patch/1719/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
David Daney [Tue, 19 Oct 2010 00:51:26 +0000 (17:51 -0700)]
MIPS: Repair Kbuild make clean breakage.
When running make clean, Kbuild doesn't process the .config file, so nothing
generates a platform-y variable. We can get it to descend into the platform
directories by setting $(obj-).
The dec Platform file was unconditionally setting platform-, obliterating
its previous contents and preventing some directories from being cleaned.
This is change to an append operation '+=' to allow cavium-octeon to be
cleaned.
Signed-off-by: David Daney <ddaney@caviumnetworks.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Patchwork: https://patchwork.linux-mips.org/patch/1718/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Linus Torvalds [Tue, 19 Oct 2010 17:10:20 +0000 (10:10 -0700)]
Merge branch 'drm-fixes' of git://git./linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/radeon/kms: avivo cursor workaround applies to evergreen as well
Avi Kivity [Tue, 19 Oct 2010 14:46:55 +0000 (16:46 +0200)]
KVM: Fix fs/gs reload oops with invalid ldt
kvm reloads the host's fs and gs blindly, however the underlying segment
descriptors may be invalid due to the user modifying the ldt after loading
them.
Fix by using the safe accessors (loadsegment() and load_gs_index()) instead
of home grown unsafe versions.
This is CVE-2010-3698.
KVM-Stable-Tag.
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Colin Cross [Mon, 18 Oct 2010 23:20:49 +0000 (16:20 -0700)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Mon, 18 Oct 2010 23:19:27 +0000 (16:19 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Change-Id: I200eea8eecc5afb9eb1595f2b5357315b0b14808
Gary King [Wed, 13 Oct 2010 01:55:07 +0000 (18:55 -0700)]
[ARM] tegra: Set bit 22 in the PL310 AuxCtrl
Duplicate Catalin Marinas' <catalin.marinas@arm.com> ARM change
6395/1 for VExpress to tegra
Clearing bit 22 in the PL310 Auxiliary Control register (shared
attribute override enable) has the side effect of transforming Normal
Shared Non-cacheable reads into Cacheable no-allocate reads.
Coherent DMA buffers in Linux always have a Cacheable alias via the
kernel linear mapping and the processor can speculatively load cache
lines into the PL310 controller. With bit 22 cleared, Non-cacheable
reads would unexpectedly hit such cache lines leading to buffer
corruption.
Change-Id: I37232041c035f5153a7ad73257c6333634a5f4b8
Signed-off-by: Gary King <gking@nvidia.com>
Colin Cross [Mon, 18 Oct 2010 22:07:30 +0000 (15:07 -0700)]
spi: tegra: Use shared DMA channel
To avoid running out of DMA channels, use the shared DMA channel
for all four Tegra spi controllers.
Change-Id: Iff644253cf7fae36aa2e42321a1ded35a728da4f
Signed-off-by: Colin Cross <ccross@android.com>
Jay Cheng [Mon, 18 Oct 2010 05:41:04 +0000 (01:41 -0400)]
[arm/tegra]serial:rewrite interrupt handler
rewrite interrupt handler to prevent race condition between dma operation
and serial isr.
Change-Id: I4464ba882f39ff1dc2423241f6582df687057420
Signed-off-by: Jay Cheng <jacheng@nvidia.com>
Jay Cheng [Sat, 16 Oct 2010 03:55:02 +0000 (23:55 -0400)]
[ARM/tegra] dma: add transfer count query. Checking interrupt pending status.
Stopping Dma after last req transfer.
add an API to return the completed transfer count of a pending, active
or finished DMA request
originally fixed by Gary King <gking@nvidia.com>
It is observed that the dma interrupt has the lower priority then
its client interupt priority. When client's isr calls dma get transfer,
the dma status has not been upated as dma isr have not been served yet.
So before reading the status, explicitly checking the interrupt status and
handling accordingly.
The another issue which is observed is that if dma has transferred the data
of amount = requested -4 and if it moves to invalid requestor before stopping
then status got reset and tarnsfered bytes becomes 0. This seems the apb dma
hw behavior. Following is the suggestion to overcome this issue:
- Disable global enable bit.
- Read status.
- Stop dma.
- Enable global status bit.
Added this workaround and it worked fine.
originally fixed by Laxman Dewangan <ldewangan@nvidia.com>
In continous mode, dma should stop after last transfer completed and
if there is no more req pending.
If there is pending req then it should check whether it has updated
in hw for next transfer or not and if it has not started then stop dma
and start new req immediatley.
originally fixed by Laxman Dewangan <ldewangan@nvidia.com>
Change-Id: I49c97c96eacdf4060de6b21cec0e71d940d33f00
Erik Gilling [Mon, 18 Oct 2010 22:38:22 +0000 (15:38 -0700)]
video: tegra: add hdmi switch_dev for hotplug notifications
Change-Id: I0454179633835d35367bc5c28513319e3aa6a069
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Mon, 18 Oct 2010 22:22:05 +0000 (15:22 -0700)]
video: tegra: disable display on hotunplug
Also tighents up the hotplug detect timing
Change-Id: I2d48c38250b5aaef2d30895fe44806e7d133a823
Signed-off-by: Erik Gilling <konkers@android.com>
Benoit Goby [Fri, 15 Oct 2010 21:32:21 +0000 (14:32 -0700)]
usb: host: ehci-tegra: Don't power down the phy on shutdown
There is no need to poweroff the phy and disable the clocks on shutdown.
This interferes with autopm that may try to disable the clocks after
shutdown.
Change-Id: I3aee19abe6dd11685b3be348e25fc3e195a2a416
Signed-off-by: Benoit Goby <benoit@android.com>
Erik Gilling [Mon, 18 Oct 2010 22:20:42 +0000 (15:20 -0700)]
i2c: tegra: fix repeated start handling
A repeated start should be used for all but the last msg in an xfer. The
NOSTART flag is for skipping the START frame (addr/rw)
Change-Id: If4bc88478521a8c4e1ec761bd42a84d3e398fa26
Signed-off-by: Erik Gilling <konkers@android.com>
Kazuhiro Ondo [Mon, 18 Oct 2010 21:07:44 +0000 (16:07 -0500)]
misc: mdm6600_ctrl: Revert recent changes for AP & BP status defs.
Change-Id: If8010e934d55af3770e8ebc78e59b93886eb50f6
Linus Torvalds [Mon, 18 Oct 2010 20:10:36 +0000 (13:10 -0700)]
Merge branch 'upstream' of git://git.linux-mips.org/upstream-linus
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: Enable ISA_DMA_API config to fix build failure
MIPS: 32-bit: Fix build failure in asm/fcntl.h
MIPS: Remove all generated vmlinuz* files on "make clean"
MIPS: do_sigaltstack() expects userland pointers
MIPS: Fix error values in case of bad_stack
MIPS: Sanitize restart logics
MIPS: secure_computing, syscall audit: syscall number should in r2, not r0.
MIPS: Don't block signals if we'd failed to setup a sigframe
Linus Torvalds [Mon, 18 Oct 2010 20:10:08 +0000 (13:10 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: evdev - fix EVIOCSABS regression
Input: evdev - fix Ooops in EVIOCGABS/EVIOCSABS
Linus Torvalds [Mon, 18 Oct 2010 20:09:26 +0000 (13:09 -0700)]
Merge branch 'for-linus' of git://git./linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: ohci: fix TI TSB82AA2 regression since 2.6.35
Sascha Hauer [Mon, 18 Oct 2010 08:16:26 +0000 (10:16 +0200)]
mxc_nand: do not depend on disabling the irq in the interrupt handler
This patch reverts the driver to enabling/disabling the NFC interrupt
mask rather than enabling/disabling the system interrupt. This cleans
up the driver so that it doesn't rely on interrupts being disabled
within the interrupt handler.
For i.MX21 we keep the current behaviour, that is calling
enable_irq/disable_irq_nosync to enable/disable interrupts. This patch
is based on earlier work by John Ogness.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: John Ogness <john.ogness@linutronix.de>
Tested-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Linus Torvalds [Mon, 18 Oct 2010 20:05:10 +0000 (13:05 -0700)]
Merge branch 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux
* 'for-linus/i2c/2636-rc8' of git://git.fluff.org/bjdooks/linux:
i2c-imx: do not allow interruptions when waiting for I2C to complete
i2c-davinci: Fix TX setup for more SoCs
Linus Torvalds [Mon, 18 Oct 2010 20:04:33 +0000 (13:04 -0700)]
Merge branch 'fixes'
* fixes:
v4l1: fix 32-bit compat microcode loading translation
De-pessimize rds_page_copy_user
Erik Gilling [Fri, 15 Oct 2010 01:28:21 +0000 (18:28 -0700)]
[ARM] tegra: remove hdmi enable/disable function in board-stingray
The functions toggled the depricated vwlan2 regulator
Change-Id: I55b1dda27ffcc44b50ec45795d4607e4713f9ef3
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Mon, 18 Oct 2010 19:13:36 +0000 (12:13 -0700)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: Iafbbd226a23d555ad198180d5e17c13a4bb14cf0
Erik Gilling [Mon, 18 Oct 2010 19:12:20 +0000 (12:12 -0700)]
Merge branch 'linux-tegra' into android-tegra
Erik Gilling [Fri, 15 Oct 2010 00:18:31 +0000 (17:18 -0700)]
video: tegra: don't assert/deassert reset in dc
There seems to be some interdependency between the two display controllers'
resets and HDMI. If dc0 is put into reset while HDMI is connected to dc1,
HDMI will blank.
Change-Id: I978814628609ebe3d78e7809fccef6a3d19c0f7f
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Thu, 14 Oct 2010 21:56:05 +0000 (14:56 -0700)]
video: tegra: fb var info on monspecs change
activates the default mode
Change-Id: I34d27d2947377771e8f1c89f3933204d7e65364f
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Thu, 14 Oct 2010 19:46:57 +0000 (12:46 -0700)]
video: tegra: ensure first video mode is marked with FB_MODE_IS_FIRST
Change-Id: If3c417c670962e4ca6ff92c3bd1a388c189f11ab
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Thu, 14 Oct 2010 19:44:10 +0000 (12:44 -0700)]
video: modedb: make fb_add_videomode keep modelist in order added
This makes the default case in fb_find_best_display ("last resort, use
the very first mode") actually use the first mode added.
Change-Id: Ia43ac4a4251522cd30c0da514da23e47b2906e2c
Signed-off-by: Erik Gilling <konkers@android.com>