Chris Fries [Thu, 2 Dec 2010 20:35:42 +0000 (14:35 -0600)]
[ARM] mfd: cpcap-audio: Remove log spam
Remove logs about turning audio paths on/off, they are normally
not interesting.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Mon, 29 Nov 2010 22:57:42 +0000 (14:57 -0800)]
[ARM] tegra: board-stingray: rearrange audio-clock sources
-- Setting pll_a to 11.2896MHz breaks S/PDIF audio. Setting it to
56.448MHz fixes the problem. This was working before because the
pll_a settings were broken and attempting to set pll_a to
11.2896MHz actually set it implcitly to 56.448MHz instead.
-- Reparent i2s.1 and i2s.2 to pll_p so that we can set them to 24MHz
and 2MHz respectively. This allows i2s.2 to talk to the Bluetooth
controller at 8kHz glitch-free.
-- Remove initialization entries for clocks "audio" and "audio_2x";
these clocks are not used by the audio driver any more.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Chris Fries [Mon, 29 Nov 2010 21:45:05 +0000 (15:45 -0600)]
[ARM] mfd: cpcap: Tune the STDAC enable time
Some sounds (Camcorder start, Audible Selections) are quiet
when the hardware is being turned on from an off state.
These sounds have most of their energy in the first 100
msec and it takes this long for STDAC to warm up. Add a
short delay to the Stereo DAC enable for ST Micro devices.
Also, fix a checkpatch complaint.
Change-Id: I71fc9c8be3a6378e4b90613e0f4a3d03941116d1
Signed-off-by: Iliyan Malchev <malchev@google.com>
makarand.karvekar [Mon, 18 Oct 2010 22:54:33 +0000 (17:54 -0500)]
[ARM] tegra: add cap-prox platform data config settings
Change-Id: Ifac36a5eaff5d9c853c89bf0af6adf084e4e25e7
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
makarand.karvekar [Mon, 18 Oct 2010 22:56:47 +0000 (17:56 -0500)]
[ARM] tegra: stingray: Enable cap-prox calibration driver
Change-Id: I88952498560e4f1e919d86caf824f020ec6dc605
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
makarand.karvekar [Thu, 21 Oct 2010 20:23:23 +0000 (15:23 -0500)]
misc: add capacitive proximity calibration driver
capacitive proximity(cap-prox) calibration scheme to rule out
proximity detection due to some light conductive surfaces as device
covers and table-top.
Change-Id: I64d566a168befb82a610de6094044eeca294c6c4
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
Mike Lockwood [Wed, 1 Dec 2010 16:16:05 +0000 (11:16 -0500)]
leds: cpcap: Add "blink" device file to control LED blinking
To avoid permission problems using the LED class trigger files
Signed-off-by: Mike Lockwood <lockwood@android.com>
Colin Cross [Thu, 2 Dec 2010 02:34:00 +0000 (18:34 -0800)]
Revert "leds: cpcap: HACK: turn off led for brightness of 0 and 1."
This reverts commit
d791b66f35e963d6b50d9f6809198d94ddd5bb1c.
Colin Cross [Wed, 1 Dec 2010 00:56:35 +0000 (16:56 -0800)]
ARM: tegra: stingray: Enable core dvfs in defconfig
Change-Id: Icacb9082a63169a7262347a379c4f183ea774e58
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 1 Dec 2010 23:59:27 +0000 (15:59 -0800)]
ARM: tegra: stingray: Disable core dvfs on P1 hardware
Change-Id: I719d2be38d33ee6ed53fc6975f06b0b8bef5bd48
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 1 Dec 2010 02:15:23 +0000 (18:15 -0800)]
ARM: tegra: stingray: Remove suspend voltage on vdd_cpu
Change-Id: I64de81d0ebb29fbe5f48389e4d343f359dfd3ccb
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Fri, 19 Nov 2010 23:30:22 +0000 (15:30 -0800)]
ARM: tegra: stingray: Add vdd_aon regulator
Change-Id: I511bc28da3b82f5a1503c75047c326fdc1f6f7cf
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 2 Dec 2010 02:27:33 +0000 (18:27 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Thu, 2 Dec 2010 02:27:24 +0000 (18:27 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Thu, 2 Dec 2010 02:27:19 +0000 (18:27 -0800)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Wed, 1 Dec 2010 23:45:30 +0000 (15:45 -0800)]
ARM: tegra: dvfs: Allow boot or run time disabling of dvfs rails
Change-Id: Ie56cbf4ade1bbdb5835851f3c09668c1e0941a2c
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Fri, 19 Nov 2010 23:38:32 +0000 (15:38 -0800)]
ARM: tegra: Add dvfs rails
The previous version of dvfs handled requirements between two
different voltage rails by using two sets of dvfs tables, one
for each rail. That method fails for vdd_aon, which must be
within 170 mV of vdd_core.
Instead, have each dvfs clock only set the voltage rail that
it directly depends on, and add a relationship system to the
voltage rails. When the voltage changes on one rail, it calls
update on all the rails that depend on it. The dependent rails
compare the new voltage of the original rail to their own
voltage, and update their own voltage as necessary.
Change-Id: I17b30a61c7c0c01e44702ab486238789abd47330
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 10 Nov 2010 03:44:20 +0000 (19:44 -0800)]
Revert "ARM: tegra: dvfs: Fix locking on external dvfs calls"
This reverts commit
f58886c359db3c5056fea2d1a41d297f19e9f585.
Change-Id: Ie88d8f79db9bf958fc3b9f261d74d031785161d0
Erik Gilling [Thu, 2 Dec 2010 01:55:06 +0000 (17:55 -0800)]
video: tegra: fix vblank detection
Change-Id: Ib74cbbb0d703c782f64f93930cd234359107021c
Signed-off-by: Erik Gilling <konkers@android.com>
Theodore Ts'o [Wed, 3 Nov 2010 16:03:21 +0000 (12:03 -0400)]
ext4: initialize the percpu counters before replaying the journal
We now initialize the percpu counters before replaying the journal,
but after the journal, we recalculate the global counters, to deal
with the possibility of the per-blockgroup counts getting updated by
the journal replay.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Ken Sumrall [Wed, 24 Nov 2010 20:57:00 +0000 (12:57 -0800)]
fuse: fix attributes after open(O_TRUNC)
The attribute cache for a file was not being cleared when a file is opened
with O_TRUNC.
If the filesystem's open operation truncates the file ("atomic_o_trunc"
feature flag is set) then the kernel should invalidate the cached st_mtime
and st_ctime attributes.
Also i_size should be explicitly be set to zero as it is used sometimes
without refreshing the cache.
Signed-off-by: Ken Sumrall <ksumrall@android.com>
Cc: Anfei <anfei.zhou@gmail.com>
Cc: "Anand V. Avati" <avati@gluster.com>
Signed-off-by: Miklos Szeredi <miklos@szeredi.hu>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Amol Bhatkar--NJ05 [Wed, 24 Nov 2010 01:31:13 +0000 (17:31 -0800)]
misc: ts27010: Propogate Error to Userspace on USB disconnect
- Propogate error to userspace on ttyUSB disconnect
- Set Mux open/disconnect retry to 1 to reduce recovery time.
Change-Id: I2b381299d36660480cfc60faffeb710685ccaaf8
Signed-off-by: Amol Bhatkar <amolbhatkar@motorola.com>
Colin Cross [Tue, 23 Nov 2010 02:32:39 +0000 (18:32 -0800)]
ARM: tegra: clock: Allow any clock to be a shared clock
Change-Id: I7e6be30c7870e8b00a165f99655cd95b917fc6db
Signed-off-by: Colin Cross <ccross@android.com>
Mike Chan [Tue, 22 Jun 2010 18:26:45 +0000 (11:26 -0700)]
cpufreq: interactive: New 'interactive' governor
This governor is designed for latency-sensitive workloads, such as
interactive user interfaces. The interactive governor aims to be
significantly more responsive to ramp CPU quickly up when CPU-intensive
activity begins.
Existing governors sample CPU load at a particular rate, typically
every X ms. This can lead to under-powering UI threads for the period of
time during which the user begins interacting with a previously-idle system
until the next sample period happens.
The 'interactive' governor uses a different approach. Instead of sampling
the CPU at a specified rate, the governor will check whether to scale the
CPU frequency up soon after coming out of idle. When the CPU comes out of
idle, a timer is configured to fire within 1-2 ticks. If the CPU is very
busy from exiting idle to when the timer fires then we assume the CPU is
underpowered and ramp to MAX speed.
If the CPU was not sufficiently busy to immediately ramp to MAX speed, then
the governor evaluates the CPU load since the last speed adjustment,
choosing the highest value between that longer-term load or the short-term
load since idle exit to determine the CPU speed to ramp to.
A realtime thread is used for scaling up, giving the remaining tasks the
CPU performance benefit, unlike existing governors which are more likely to
schedule rampup work to occur after your performance starved tasks have
completed.
The tuneables for this governor are:
/sys/devices/system/cpu/cpufreq/interactive/min_sample_time:
The minimum amount of time to spend at the current frequency before
ramping down. This is to ensure that the governor has seen enough
historic CPU load data to determine the appropriate workload.
Default is 80000 uS.
/sys/devices/system/cpu/cpufreq/interactive/go_maxspeed_load
The CPU load at which to ramp to max speed. Default is 85.
Change-Id: Ib2b362607c62f7c56d35f44a9ef3280f98c17585
Signed-off-by: Mike Chan <mike@android.com>
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Bug:
3152864
Erik Gilling [Wed, 1 Dec 2010 21:47:08 +0000 (13:47 -0800)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: I89b84ed867e185ad25c5955f3de946fcbc254b75
Erik Gilling [Wed, 1 Dec 2010 21:45:02 +0000 (13:45 -0800)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I27504990282eccc4dd6edd16768ae32ad3e4380c
Erik Gilling [Wed, 1 Dec 2010 21:31:36 +0000 (13:31 -0800)]
video: tegra: set up high priority on all overlays
this drastically reduces display controller underruns
Change-Id: I7d57c53cf61db4aac5d1baeb0e31b3a5d6fe9e67
Signed-off-by: Erik Gilling <konkers@android.com>
James Wylder [Sat, 20 Nov 2010 00:12:00 +0000 (18:12 -0600)]
ARM: tegra: enable emc clock updates after lp0
Write a dummy value to EMC_MRW_0 to allow
clock frequency changes after lp0.
Change-Id: I2218967eaf9698eef6dcfe2e3edd89fbce2ebf1a
Signed-off-by: James Wylder <james.wylder@motorola.com>
Varun Wadekar [Thu, 25 Nov 2010 11:26:16 +0000 (16:56 +0530)]
[ARM] tegra: ventana: fix volume up gpio
Change-Id: Ie0e25ee8074f4625feb7473f4d5ce759597ed035
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Iliyan Malchev [Mon, 29 Nov 2010 21:38:19 +0000 (13:38 -0800)]
[ARM] tegra2_clocks: remove incorrectly-defined frequencies
Definitions for 11.2896MHz and 12.288MHz were incorrect. These
frequencies can be still requested through pll_a_out0.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Wed, 1 Dec 2010 00:27:17 +0000 (16:27 -0800)]
[ARM] tegra_i2s_audio: remove unnecessary clocks
Signed-off-by: Iliyan Malchev <malchev@google.com>
Greg Meiste [Mon, 29 Nov 2010 21:52:46 +0000 (15:52 -0600)]
mfd: cpcap-3mm5: Fix for missing key event on resume
The key_handler was checking the sense bits to see whether a press
or release occurred. The problem with this is it takes so long to
resume from LP0/LP1, that the key state could have changed again
before the handler has even ran. The driver would see the key was
currently released, which was the same state it last reported, and
not send a new event.
This patch changes the handler so it does not check the sense bits.
It simply sends a press when the MB2 interrupt occurs and a release
when the MACRO_5 interrupt occurs.
This fixes the kernel portion of bug
3225781.
Change-Id: I38a89417a0053315c93dc6c696a34a8974252d2a
Signed-off-by: Greg Meiste <w30289@motorola.com>
Praveen Bharathi [Wed, 24 Nov 2010 03:49:45 +0000 (21:49 -0600)]
[ARM] tegra: stingray: Improve ALS reporting accuracy
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
Praveen Bharathi [Wed, 24 Nov 2010 03:48:09 +0000 (21:48 -0600)]
leds: als: improve ALS reporting accuracy
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
James Wilson [Tue, 23 Nov 2010 21:00:44 +0000 (15:00 -0600)]
[ARM] tegra: stingray: Do not load usb devices in factory and recovery mode
Skips adding USB and gadget devices when both using a factory
cable and in recovery mode.
Change-Id: Ibf47ded70237d83d5b1b49bcfc24e3c976ff03ce
Signed-off-by: James Wilson <james.wilson@motorola.com>
Sergey Kudakov [Sat, 20 Nov 2010 01:14:18 +0000 (19:14 -0600)]
[ARM] tegra: stingray: correct bq24617 resources for m1, p0
Change-Id: I789b489c761f68b23c02a5594e85d30b850572b0
Signed-off-by: Sergey Kudakov <sergey.kudakov@motorola.com>
Jay Cheng [Fri, 26 Nov 2010 17:05:43 +0000 (12:05 -0500)]
ARM: Stingray: Decrease i2c.0 and i2c.3 drive strength.
Change-Id: I9c629d213e451e23ea2a5b3874462d37dddbe282
Signed-off-by: Ken Radtke <kradtke@nvidia.com>
Jay Cheng [Fri, 26 Nov 2010 17:08:39 +0000 (12:08 -0500)]
[tegra i2c] add de-bounce cycles.
Change-Id: I3549105bb1d1a7803a300849ddba9c17dad1efba
Signed-off-by: Ken Radtke <kradtke@nvidia.com>
Dima Zavin [Fri, 19 Nov 2010 21:20:15 +0000 (13:20 -0800)]
media: video: tegra: avp: turn off chatty avp/rpc debug logging
Change-Id: I3f9025285fc5a002dbd436ee76bb6ca757c425ea
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Sat, 13 Nov 2010 00:20:56 +0000 (16:20 -0800)]
media: video: tegra: avp: make avp_svc have separate debug mask
Change-Id: Ib5490a7f7d294760d34a3b9da14281ad96c9b26c
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Mon, 15 Nov 2010 19:22:31 +0000 (11:22 -0800)]
media: video: tegra: properly drop refs to sclk on cleanup
Change-Id: I7af31dc4cd1e2d7a4142f6265665a05ca4f41d15
Signed-off-by: Dima Zavin <dima@android.com>
makarand.karvekar [Mon, 8 Nov 2010 23:11:03 +0000 (17:11 -0600)]
leds: cpcap: HACK: turn off led for brightness of 0 and 1.
brightness 0 triggers delay_on and delay_off device file
removal. setting timer trigger creates new device files
with root permissions. Avoid device file removal by treating
brightness 1 as 0.
Change-Id: Idfc2dd1c43e5962c173f8ed69f61e4b207c80cbb
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
Jay Cheng [Mon, 22 Nov 2010 16:03:52 +0000 (11:03 -0500)]
usb: host: tegra: Reduce busy polling duration
Change-Id: I63e271409818e33b4c19bb99b00e556bc5a2a4b3
Signed-off-by: Jay Cheng <jacheng@nvidia.com>
Colin Cross [Wed, 24 Nov 2010 22:56:34 +0000 (14:56 -0800)]
ARM: tegra: clock: Fix cpu pll table entry for 608MHz
The 608 MHz table entry would incorrectly produce a 760 MHz
clock for input clocks of 12 MHz, 13 MHz, or 26 MHz.
Change-Id: I6755fdde88f0851770490818dc2e5e1e2d512f20
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 24 Nov 2010 22:52:02 +0000 (14:52 -0800)]
ARM: tegra: Rearrange subsystem initialization order
Fuses must be initialized before clocks, so clocks can
determine the maximum cpu frequency. Clocks must be
initialized before DMA, so DMA can enable the clock.
Once DMA is initialized, all fuses accesses must go
through DMA to avoid a hardware bug.
Change-Id: Id1f58e4f43152ec19000e02f2d1ea45abf141f9c
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 24 Nov 2010 22:49:35 +0000 (14:49 -0800)]
ARM: tegra: dma: Add dma initialzation stub when compiled out
Change-Id: Iac01fa701342a5ed0bbbb1c6e5d38adb401f2d79
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 24 Nov 2010 22:44:09 +0000 (14:44 -0800)]
ARM: tegra: fuse: Separate fuse dma initialization
There is a dependency loop between fuses, clocks, and APBDMA.
If dma is enabled, fuse reads must go through APBDMA to avoid
corruption due to a hw bug. APBDMA requires a clock to be
enabled. Clocks must read a fuse to determine allowable cpu
frequencies.
Separate out the fuse DMA initialization, and allow the fuse
read and write functions to be called without using DMA before
the DMA initialization has been completed. Access to the fuses
before APBDMA is initialized won't hit the hardware bug because
nothing else can be using DMA.
Change-Id: Ib5cb0f346488f2869e8314c5f3b24fd86873f4c3
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 24 Nov 2010 22:34:35 +0000 (14:34 -0800)]
ARM: tegra: fuse: Fix warnings
Change-Id: I2793cb8413669dbae8c6ca92572c423e27f46c4e
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 24 Nov 2010 22:28:50 +0000 (14:28 -0800)]
ARM: tegra: fuse: Remove carriage returns in fuse files
Change-Id: If3675c8ee7a0e0a5d3f7bd0c147054bc3796deef
Signed-off-by: Colin Cross <ccross@android.com>
Jaikumar Ganesh [Tue, 23 Nov 2010 23:03:01 +0000 (15:03 -0800)]
[ARM] tegra: olympus: Delete platform data for hsuart.
Use the device defined in devices.c which uses resources.
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Jaikumar Ganesh [Sat, 20 Nov 2010 02:25:18 +0000 (18:25 -0800)]
[ARM] tegra: stingray: Delete platform data for hsuart.
Use resources to feed data to tegra_hsuart instead.
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Colin Cross [Thu, 25 Nov 2010 00:41:53 +0000 (16:41 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Thu, 25 Nov 2010 00:41:30 +0000 (16:41 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Allen Martin [Fri, 19 Nov 2010 23:51:50 +0000 (15:51 -0800)]
ARM: tegra: suspend: protect suspend functions with CONFIG_PM
Protect suspend/resume functions behind #ifdef CONFIG_PM. This
prevents a compile error with CONFIG_PM turned off.
Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
Allen Martin [Fri, 19 Nov 2010 22:50:50 +0000 (14:50 -0800)]
ARM: tegra: irq: protect irq suspend with CONFIG_PM
Protect irq suspend/resume functions behind #ifdef CONFIG_PM.
This prevents a link error if CONFIG_PM is turned off.
Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
Allen Martin [Fri, 19 Nov 2010 22:15:34 +0000 (14:15 -0800)]
usb: host: tegra: protect bus suspend with CONFIG_PM
Protect the bus suspend/resume functions behind #ifdef CONFIG_PM.
This prevents a compile error if CONFIG_PM is turned off.
Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Colin Cross <ccross@android.com>
Jaikumar Ganesh [Sat, 20 Nov 2010 02:23:29 +0000 (18:23 -0800)]
serial: tegra_hsuart: Use resources instead of platform data.
Use resources to pass data to tegra_hsuart to set
mapbase, irq.
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
John Michelau [Mon, 22 Nov 2010 00:23:28 +0000 (18:23 -0600)]
ARM: tegra: stingray: Disable USB detect when BP USB HW Bypass
The bootloader sets up a switch in this mode to reroute the
QCOM BP USB out of stingray's external USB connector. We must
disable the AP-side drivers in this mode, otherwise they
interfere with the BP's usage of the external USB.
Change-Id: Ib6cdd47be930781034f27095baff8c7a229469a6
Signed-off-by: Benoit Goby <benoit@android.com>
Colin Cross [Wed, 24 Nov 2010 05:40:20 +0000 (21:40 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Wed, 24 Nov 2010 05:39:33 +0000 (21:39 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Varun Wadekar [Mon, 25 Oct 2010 04:49:30 +0000 (10:19 +0530)]
[ARM] tegra: support to burn device fuses
Change-Id: Ic12a93d4212b5f9a7802537b8f21e288aa431005
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Mon, 25 Oct 2010 04:31:28 +0000 (10:01 +0530)]
[ARM] tegra: fuse read/write apis for fuse burning
expose fuse register read and write apis for fuse
burning
Change-Id: Id6785f5506fe9293ddb5072240f49470ca5fcd08
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Sun, 24 Oct 2010 10:55:32 +0000 (16:25 +0530)]
[ARM] tegra: use dma to read/write fuse registers
tegra2 hangs if fuse registers are accessed during an apb dma
operation. war is to use apb dma to read/write fuse registers
instead.
Change-Id: I4d99a1ad56115c0d73e9cd0679cf38f70f922f3d
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Jaikumar Ganesh [Mon, 22 Nov 2010 20:05:04 +0000 (12:05 -0800)]
[ARM] tegra: Change size of constants from SZ_64 to 64.
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Iliyan Malchev [Tue, 23 Nov 2010 22:24:25 +0000 (14:24 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Iliyan Malchev [Tue, 23 Nov 2010 21:58:43 +0000 (13:58 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra_spdif_audio.c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Tue, 23 Nov 2010 19:55:27 +0000 (11:55 -0800)]
[ARM] tegra_spdif_audio: support continuous DMA mode
-- Add support for contnuous single-buffered DMA
-- Remove PIO support
-- Added suspend and resume functionality
Signed-off-by: Scott Peterson <speterson@nvidia.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andrei Warkentin [Mon, 22 Nov 2010 21:16:35 +0000 (15:16 -0600)]
media: video: tegra: ov5650: Disable OTP readout on broken hw.
Disabled reading bad OTP data from sensors on known-bad HW.
Change-Id: I08d35ff6ff13bd2c0c0a4a1a50cd92e6e663efc8
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Colin Cross [Tue, 23 Nov 2010 01:44:34 +0000 (17:44 -0800)]
input: touchscreen: qtouch: Update finger id on resume as well
Change-Id: If195ff054e6042c539a3906ae4b46940748b58db
Signed-off-by: Colin Cross <ccross@android.com>
Benoit Goby [Mon, 22 Nov 2010 22:46:05 +0000 (14:46 -0800)]
usb: core: Temporary workaround for usb auto-suspend issue
If a device aborts suspend, usb_resume may be called on a device whose
parent has been auto-suspended. Recursively resume its parents and
change their runtime pm state.
Change-Id: I8f96482bdafae3888a0df9cb30422236a001e17d
Signed-off-by: Benoit Goby <benoit@android.com>
Chris Fries [Tue, 9 Nov 2010 22:20:36 +0000 (16:20 -0600)]
[ARM] tegra: board-stingray: Change SPDIF fifo format
Change-Id: I2be7e6e51945841eaff07ea287ae9fab2b98ad8b
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Tue, 23 Nov 2010 00:44:56 +0000 (16:44 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Iliyan Malchev [Tue, 23 Nov 2010 00:07:44 +0000 (16:07 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra_i2s_audio.c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Iliyan Malchev [Tue, 23 Nov 2010 00:06:23 +0000 (16:06 -0800)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Signed-off-by: Iliyan Malchev <malchev@google.com>
Scott Peterson [Tue, 9 Nov 2010 22:22:27 +0000 (16:22 -0600)]
[ARM] tegra_spdif_audio: Enable 16 bit packed mode
Enable 16 bit packed fifo format mode to work avoid
channel swapping when dma underrun occurs.
Added suspend/resume functionality so spdif registers
are restored.
Change-Id: Id80e7903b81fd3b3b84af08dba40196121eb6cb7
Signed-off-by: Iliyan Malchev <malchev@google.com>
Chris Fries [Thu, 18 Nov 2010 18:42:15 +0000 (12:42 -0600)]
[ARM] tegra: i2s: Continuous DMA support
- Refactor DMA interactions to handle continuous single-buffered DMA
- Remove PIO support (obsolete, conflicts with new buffer management)
- Remove sample rate conversion (obsolete)
- Remove error-reporting logic
- Remove TEGRA_AUDIO_IN/OUT_GET/SET_BUF_CONFIG
- Add TEGRA_AUDIO_IN/OUT_GET/SET_NUM_BUFS
Change-Id: I8f21a0bb314aac3b7d1bb4918bda9141e58db38d
Signed-off-by: Iliyan Malchev <malchev@google.com>
Colin Cross [Mon, 22 Nov 2010 21:48:33 +0000 (13:48 -0800)]
input: touchscreen: qtouch: Report first finger as finger 0
Change-Id: Ie2045b7faf5d80ca5cd02b6e745b6974275baccd
Signed-off-by: Colin Cross <ccross@android.com>
Dmitry Shmidt [Fri, 19 Nov 2010 19:20:35 +0000 (11:20 -0800)]
net: wireless: bcm4329: Add 'setdfschannels' command
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Colin Cross [Mon, 22 Nov 2010 21:23:52 +0000 (13:23 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Mon, 22 Nov 2010 21:23:31 +0000 (13:23 -0800)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Mon, 22 Nov 2010 21:21:49 +0000 (13:21 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Jay Cheng [Mon, 22 Nov 2010 16:03:52 +0000 (11:03 -0500)]
usb: host: tegra: rewrite usb suspend/resume routine.
Tegra host controller will time the resume operation to clear the bit
when the port control state switches to HS or FS Idle. This behavior
is different from EHCI where the host controller driver is required
to set this bit to a zero after the resume duration is timed in the
driver.
Poll PORT_SUSPEND bit till the suspend is completed. Write PORT_RESUME to 0
to clear PORT_SUSPEND bit.
Disable disconnect detection during resume.
Change-Id: I30a45dc7e7a87773a93c128877d0f0827e5d44b7
Signed-off-by: Jay Cheng <jacheng@nvidia.com>
Jay Cheng [Mon, 22 Nov 2010 16:03:52 +0000 (11:03 -0500)]
ARM: tegra: usb_phy: Disable disconnect detection during resume
Change-Id: I30a45dc7e7a87773a93c128877d0f0827e5d44b7
Signed-off-by: Jay Cheng <jacheng@nvidia.com>
Colin Cross [Mon, 22 Nov 2010 18:58:17 +0000 (10:58 -0800)]
ARM: tegra: stingray: HACK: Disable cgroups
Adding a task to cgroups is very slow on SMP because of a
call to synchronize_rcu(). Disable cgroups for now.
Change-Id: I6f3ae0559eead400ffd0d60fb017cbed4e011aaa
Signed-off-by: Colin Cross <ccross@android.com>
Greg Meiste [Tue, 16 Nov 2010 20:05:52 +0000 (14:05 -0600)]
[ARM] tegra: stingray_defconfig: Enable NCT1008 driver
Change-Id: I29e84ee5b1e77254d80d7b43774b6dcf50fa1aed
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Tue, 16 Nov 2010 19:34:09 +0000 (13:34 -0600)]
[ARM] tegra: stingray: Add support for NCT1008
Change-Id: I23f5d15596510904b14b75f0fb79879a54633495
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Tue, 16 Nov 2010 19:33:06 +0000 (13:33 -0600)]
misc: Initial NCT1008 driver
Initial version of the NCT1008 driver to turn off the sensor when the
device is suspended. This improves standby current drain.
Change-Id: Ia64613c33c0052434d5e304c434605611e5ef789
Signed-off-by: Greg Meiste <w30289@motorola.com>
Benoit Goby [Wed, 17 Nov 2010 22:27:51 +0000 (14:27 -0800)]
usb: gadget: rndis: don't use dev_get_stats
Since 2.6.36, spin_lock_bh has been added to dev_txq_stats_fold. So
dev_get_stats cannot be called from atomic context.
Replaced it by netdev_stats_to_stats64 to copy the stats directly. This
will work if the device driver does not need txq tx stats folding.
http://lkml.org/lkml/2010/9/20/250
Change-Id: I715b00892beda56cc369139d6e2bdc9efb6bfe79
Signed-off-by: Benoit Goby <benoit@android.com>
Robert Morell [Sat, 20 Nov 2010 03:17:36 +0000 (19:17 -0800)]
video: tegra: host: Fix bounds-checking
The length of the mod_locks array is NV_HOST1X_NB_MLOCKS, not
NV_HOST1X_SYNCPT_NB_PTS.
Change-Id: Ibce054bb8a168f2b83646745f2b62cd282b8ff9d
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Acked-by: Erik Gilling <konkers@android.com>
Robert Morell [Sat, 20 Nov 2010 02:55:51 +0000 (18:55 -0800)]
video: tegra: Scale colors in pseudopalette
This fixes incorrect colors drawn by clients such as fbconsole. As
described by skeletonfb's fb_setcolreg: "The values supplied have a 16
bit magnitude which needs to be scaled in this function for the
hardware."
Tested with both r8g8b8 and r5g6b5 pixel depths and fbconsole.
Change-Id: Ie3c3579502ddab8843a8a4dc7049c6efaa5d0ac1
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Acked-by: Erik Gilling <konkers@android.com>
Benoit Goby [Sat, 20 Nov 2010 03:18:29 +0000 (19:18 -0800)]
mdm6600: Don't re-enqueue urbs with status -EPROTO
Change-Id: I3cee5d3e6bccb3572d47bd01edfeebc2b3c72937
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Sat, 20 Nov 2010 02:10:58 +0000 (18:10 -0800)]
mdm6600: Enable the wake irq when ttyUSB4 is suspended
Instead of enabling it when the first opened port is suspended. It is
working because the modem only triggers this interrupt when all ttys are
suspended and the bus is suspended.
This fixes an issue when mdm6600_suspended_ports is not reset to 0 after
a disconnect/attach and the irq is never enabled.
Change-Id: I2a1a020ccd510b8c57c9f0b56988cb6de8aaff15
Signed-off-by: Benoit Goby <benoit@android.com>
Todd Poynor [Fri, 19 Nov 2010 04:24:24 +0000 (20:24 -0800)]
tegra: SDHCI: disable clock at suspend
Ensure sdmmc<n> clock is disabled at suspend, and that the subsequent
resume will perform clock enable processing, which is required if LP0
suspend is in effect.
Change-Id: Ia98698f13cc557040e5fdbc523a97effb63ac63b
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Erik Gilling [Fri, 19 Nov 2010 00:40:10 +0000 (16:40 -0800)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: Iacc215c30e5b3cb0634c671a7e14abeddec01a2e
Erik Gilling [Fri, 19 Nov 2010 00:36:48 +0000 (16:36 -0800)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: Iff6fb3eee3b96120f3973ccada4c0b0772dbc2b3
Erik Gilling [Fri, 19 Nov 2010 00:21:02 +0000 (16:21 -0800)]
tegra: video: make tegra_dc_is_yuv_planar return bool
Change-Id: I8adaea9eeb20f1c90b33d41a5b462ab8ee515b49
Signed-off-by: Erik Gilling <konkers@android.com>
Ari Hirvonen [Wed, 17 Nov 2010 12:17:40 +0000 (14:17 +0200)]
video: tegra: YUV overlay support
Change-Id: I4bed4d37bc275cca9ef69390c217498529121db0
Signed-off-by: Erik Gilling <konkers@android.com>
Rebecca Schultz Zavin [Thu, 18 Nov 2010 23:51:13 +0000 (15:51 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Thu, 18 Nov 2010 23:49:06 +0000 (15:49 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Rebecca Schultz Zavin [Thu, 18 Nov 2010 23:48:39 +0000 (15:48 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36