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
Nathan Connell [Thu, 18 Nov 2010 17:12:37 +0000 (11:12 -0600)]
ARM: tegra: usb_phy: Disable HS disconnect detect for USB2 port
Signed-off-by: Nathan Connell <w14185@motorola.com>
Change-Id: Ia0c24128af0f1def38d0902b15a274582c302ce2
Dmitry Shmidt [Thu, 18 Nov 2010 22:31:18 +0000 (14:31 -0800)]
net: wireless: bcm4329: Use non-DFS channels only for US
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Greg Goldman [Thu, 18 Nov 2010 22:08:58 +0000 (14:08 -0800)]
net: wireless: bcm4329: Improve way to detect BT SCO connection for BT-coex
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Greg Goldman [Thu, 18 Nov 2010 21:49:25 +0000 (13:49 -0800)]
net: wireless: bcm4329: Update to Version 4.218.248-15
- Increase default Listen Interval to 20 Beacons
- Add logic to adjust SKIP_DTIM if Listen Interval < DTIM * DTIM_SKIP to
avoid data lost due to fact that packet maybe not retrieved during Listen
Interval and AP may toss it
- Fix problem with Hidden AP setting after AP reconfigure
- Add new SoftAP optional parameter as COUNTRY to pass country code to SoftAP
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Chris Fries [Thu, 11 Nov 2010 23:39:06 +0000 (17:39 -0600)]
[ARM] tegra: dma: Single buffered continuous DMA
- Added "single buffer continuous DMA" mode in addition to the
"double buffer continuous DMA" mode that is already implemented
- Changed the queuing of next buffer to be more flexible for
continuous DMA. It can now get in-flight right after a transfer
starts, or whenever the client enqueues a buffer.
Signed-off-by: Iliyan Malchev <malchev@google.com>
Dmitry Shmidt [Thu, 18 Nov 2010 00:20:48 +0000 (16:20 -0800)]
net: wireless: bcm4329: Set first channel passive scan to 30 ms
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Tue, 16 Nov 2010 23:40:13 +0000 (15:40 -0800)]
ARM: fiq_debugger: Add help command
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Rebecca Schultz Zavin [Wed, 17 Nov 2010 22:20:01 +0000 (14:20 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Wed, 17 Nov 2010 22:18:29 +0000 (14:18 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Erik Gilling [Wed, 17 Nov 2010 22:11:59 +0000 (14:11 -0800)]
video: tegra: fill in transparency info in 32bpp FB mode
also remove incorrect support for 24bpp
Change-Id: Ic6528760bf2585ca5e7a2a68a200e3346694505e
Signed-off-by: Erik Gilling <konkers@android.com>
Rebecca Schultz Zavin [Wed, 17 Nov 2010 21:22:58 +0000 (13:22 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Wed, 17 Nov 2010 21:20:43 +0000 (13:20 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Mike Lockwood [Wed, 17 Nov 2010 16:16:35 +0000 (11:16 -0500)]
USB: gadget: f_mtp: Zero length packet fixes
Send zero length packets at end of transfers that are a multiple of the
bulk max packet size as required by MTP.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Dmitry Shmidt [Tue, 16 Nov 2010 23:39:43 +0000 (15:39 -0800)]
misc: kernel_debugger: Add help command
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Mike Lockwood [Tue, 16 Nov 2010 22:14:32 +0000 (17:14 -0500)]
USB: gadget: f_mtp: Support for file transfer length greater than 4 gigabytes
For backward compatibility with PTP, MTP is limited to a 32-bit file size.
When transferring files greater than 4 gig, MTP uses 0xFFFFFFFF as the file size
and the receiver reads until it receives a short packet.
Expanded size of mtp_file_range.length to 64 bits and added support for
writing zero length packets.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Rebecca Schultz Zavin [Tue, 16 Nov 2010 22:34:28 +0000 (14:34 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Change-Id: Ie3ee3a63df7ba098c3480a2f4f5c669a74909688
Rebecca Schultz Zavin [Tue, 16 Nov 2010 22:32:19 +0000 (14:32 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Change-Id: Ia027b838f8971f49b3f8cd276e2bc74f050210a7
Andrei Warkentin [Fri, 5 Nov 2010 20:58:27 +0000 (15:58 -0500)]
media: video: tegra: ov5650: Fix OTP readout.
Fixes OTP readout.
Change-Id: I3308ca40e551babfe040bbc59e75edafa8147f5e
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Sergey Kudakov [Wed, 10 Nov 2010 21:50:11 +0000 (15:50 -0600)]
ARM: tegra: stingray: do not hardcode bootloader fb location
Signed-off-by: Sergey Kudakov <sergey.kudakov@motorola.com>
Rebecca Schultz Zavin [Tue, 16 Nov 2010 02:49:41 +0000 (18:49 -0800)]
[ARM] tegra: stingray: Set carveout size to 256M
Expand the memory put aside for the carveout to 256M
Change-Id: I0413df9603f860c8c66874c49620b9e556a63a4a
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
makarand.karvekar [Tue, 2 Nov 2010 16:06:22 +0000 (11:06 -0500)]
misc: als: initialize max9635_misc_data, enable als from HAL
fixed unintialized max9635_misc_data in
function max9635_misc_ioctl.
enable als from sensor HAL.
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
Greg Meiste [Wed, 3 Nov 2010 20:49:04 +0000 (15:49 -0500)]
power: ds2781: Only report full on charge complete
Only report full when the charge IC says charge is complete. It is
likely that the DS2781 will report 100% before the charge IC reaches
charge complete. This change will cause full to be reported at the
same time the charge LED turns green on Stingray.
Change-Id: I4c3be724470b15fb848d284f8786f0458fe463d4
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Wed, 20 Oct 2010 19:32:27 +0000 (14:32 -0500)]
[ARM] tegra: stingray: Increase I2C bus speeds
Hardware team wants the I2C bus speeds set to 400 kHz instead of 100 kHz
for better performance.
Change-Id: I95ec0f3eb2f474065badd445f81bc0bf2b402c2d
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Fri, 5 Nov 2010 19:18:30 +0000 (14:18 -0500)]
firmware: cpcap: Turn off led sink after fade
After the fade completes, turn off the led sink and SW5 to save
current.
Change-Id: I3c9482e7c88bc19041eaafd76ab0587e241d3fe8
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Fri, 5 Nov 2010 19:17:39 +0000 (14:17 -0500)]
[ARM] tegra: stingray: Reduce notification led duty cycle
The notification led was drawing too much current. Reduce the duty cycle.
Change-Id: I2caa35182275374167b492e8e3ec6d3207a23c71
Signed-off-by: Greg Meiste <w30289@motorola.com>
Benoit Goby [Fri, 12 Nov 2010 23:00:52 +0000 (15:00 -0800)]
mdm6600: Use anchor instead of array to manage urbs
Change-Id: I240a4f341f44dcf69d03d0f8ad8a9daa399222ef
Signed-off-by: Benoit Goby <benoit@android.com>
Mike Lockwood [Mon, 15 Nov 2010 20:22:21 +0000 (15:22 -0500)]
USB: gadget: f_mtp: Return zero result for successful file transfer.
Returning number of bytes transfered does not work for files > 2 gig
since ioctl() result is a signed integer.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jay Cheng [Wed, 10 Nov 2010 23:40:46 +0000 (18:40 -0500)]
usb: host: tegra: Remove programing PTC bits based on bus speed.
Program PTC bits as NORMAL_OP is enough when resume.
Change-Id: I229eb3ef2ebaff72d023179502ec7a8904e87682
Signed-off-by: Jay Cheng <jacheng@nvidia.com>
Benoit Goby [Sat, 13 Nov 2010 00:11:02 +0000 (16:11 -0800)]
usb: serial: Remove mdm6600_modem driver
Replaced by mdm6600 driver
Change-Id: I04fed22901055da6fb3e296d62a9452aa93225f2
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Thu, 11 Nov 2010 20:37:01 +0000 (12:37 -0800)]
mdm6600: Fix urb ref count and error conditions
Fix possible use after free and a memory leak on disconnect
Change-Id: I7a867ac0bfcb68f9e2f21d72990d3c5662dbc882
Signed-off-by: Benoit Goby <benoit@android.com>
Mike Dodd [Fri, 12 Nov 2010 20:56:47 +0000 (12:56 -0800)]
[ARM] configs: Enable hardware counters in stingray defconfig
Change-Id: If28da17b8b8059f31d8b199e6ce22082a4363898
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Mike Dodd [Wed, 22 Sep 2010 03:14:15 +0000 (20:14 -0700)]
[ARM] tegra: stingray: Enable the arm-pmu driver
Change-Id: I8cfe2683665e78d584b5df19818cd4dc3c64cf1f
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Erik Gilling [Fri, 12 Nov 2010 01:40:10 +0000 (17:40 -0800)]
[ARM] tegra: enable FB bit depth autodetection on main panel
Change-Id: If4188b38e1964981bb58823c5fb575cb92a1a448
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Fri, 12 Nov 2010 02:14:54 +0000 (18:14 -0800)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: I46be67ca4c30a76b03f59c155628c7fc1ea990f4
Erik Gilling [Fri, 12 Nov 2010 02:12:08 +0000 (18:12 -0800)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I15e4d0a951e48c27e8f155e94c19f8fbe37131a0
Erik Gilling [Fri, 12 Nov 2010 01:39:04 +0000 (17:39 -0800)]
video: tegra: add option to autodetect bitdepth from bootloader
Change-Id: I5f17ab96323b3d313473622f572006d01b4716f7
Signed-off-by: Erik Gilling <konkers@android.com>
James Wylder [Thu, 11 Nov 2010 22:52:32 +0000 (16:52 -0600)]
video: tegra: call disable with interrupts disabled.
Change-Id: Idb126c14f6e18efcb64f3f613772640b8bd3fca0
Signed-off-by: Erik Gilling <konkers@android.com>
Dima Zavin [Thu, 11 Nov 2010 23:28:46 +0000 (15:28 -0800)]
ARM: tegra: flush console before reboot
If the console_sem was held while the system was rebooted, the messages
in the temporary logbuffer would not have propogated to all the console
drivers.
This force releases the console sem if it failed to be acquired.
Change-Id: I6eba9d744ef41209d26328a17c7ae19c32d6e8cb
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Thu, 11 Nov 2010 23:35:21 +0000 (15:35 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
arch/arm/common/fiq_debugger.c
Change-Id: If8de163f3e1e41b35f87a5c8e9370f1cc28ed358
Dima Zavin [Thu, 11 Nov 2010 23:31:45 +0000 (15:31 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Dima Zavin [Thu, 11 Nov 2010 23:31:26 +0000 (15:31 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
drivers/video/tegra/dc/hdmi.c
Change-Id: Ia2bd5c56238b9ef0a1eaba3c184c00ea33368263
James Wylder [Thu, 11 Nov 2010 18:55:59 +0000 (12:55 -0600)]
video: add rgb disable handler
Adjust pinmux on disable in order to save power/leakage
Change-Id: I65b642c128a780aa8932205052ccee199e4c41bf
Signed-off-by: James Wylder <james.wylder@motorola.com>
Signed-off-by: Erik Gilling <konkers@android.com>
Dmitry Shmidt [Thu, 11 Nov 2010 01:56:37 +0000 (17:56 -0800)]
net: wireless: bcm4329: Fix Softap start/stop race conditions
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dima Zavin [Wed, 10 Nov 2010 18:18:04 +0000 (10:18 -0800)]
media: tegra: avp: fix a mutex leak on an err path in lib load
Also hold the mutex for longer on cleanup, while deleting
the libs nvmap client. Not strictly necessary...
Change-Id: I4dfdb065211571338053a16bacc2e5412c26ae77
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Wed, 10 Nov 2010 23:39:07 +0000 (15:39 -0800)]
ARM: fiq_debugger: make fiq_debugger be in debug mode by default
Adds a config option that controls whether or not the console is on at
boot, defaulting to no.
Change-Id: Id4a3cad1c9dd4fb3c2b8c2298ca5d385a8bd0f8d
Signed-off-by: Dima Zavin <dima@android.com>
Erik Gilling [Wed, 10 Nov 2010 23:32:58 +0000 (15:32 -0800)]
video: tegra: delay HDMI hotplug detection until after resume
Change-Id: I87c35dc3e1287fc1d936e554013deb2f92cbd6f4
Signed-off-by: Erik Gilling <konkers@android.com>
Mike Lockwood [Mon, 8 Nov 2010 15:41:31 +0000 (10:41 -0500)]
USB: gadget: f_mtp: MTP driver cleanup:
Use a work queue instead of a separate thread for file transfer ioctls
(note: the file transfer must be done on a kernel thread rather than in
process context so vfs_read and vfs_write will use the correct address space
for the buffers)
Enforce requirement that only one ioctl call may be active at a time,
and remove mutex in mtp_send_event that is now no longer necessary.
Synchronize around use of shared variables to avoid SMP issues
Fix mismatched calls to fget and fput
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jaikumar Ganesh [Wed, 10 Nov 2010 03:07:45 +0000 (19:07 -0800)]
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>
Jaikumar Ganesh [Wed, 10 Nov 2010 23:45:07 +0000 (15:45 -0800)]
Revert "Bluetooth: Hack: Do not use power_save feature."
This reverts commit
3b02c046c3dfef5b5c4fa0c45b69654c107c7403.
Signed-off-by: Jaikumar Ganesh<jaikumar@google.com>
Erik Gilling [Wed, 10 Nov 2010 23:29:35 +0000 (15:29 -0800)]
video: tegra: mark a window's handle as unused when it is
Change-Id: Iedc9a26f62e14c0263f0f315e589a672762ab31a
Signed-off-by: Erik Gilling <konkers@android.com>
Dima Zavin [Wed, 10 Nov 2010 19:45:09 +0000 (11:45 -0800)]
ARM: tegra: stingray: force no_console_suspend in stingray_init
Change-Id: I91e8c528ca5326d84b1e98e1828add461030ab36
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 9 Nov 2010 00:59:22 +0000 (16:59 -0800)]
media: video: tegra: add avp port transport info to debug dump
Change-Id: I7ade4469609ecf87663e6a6733842889b27f7ce5
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Mon, 8 Nov 2010 21:58:04 +0000 (13:58 -0800)]
media: video: tegra: add debugfs entry for tegra_rpc
For now just includes the existing ports, the peer owners,
and the port and peer state.
Change-Id: I2c6b603ca02dc48acc1c763380ff0f1cb66f482b
Signed-off-by: Dima Zavin <dima@android.com>
makarand.karvekar [Tue, 9 Nov 2010 15:39:13 +0000 (09:39 -0600)]
ARM: tegra: stingray: noise suppression tuning in touch file
Noise Threshold value updated to reduce occurance
rate of frequency hopping.
This helps with idle mode current drain and reduces
occurance of cycle overruns.
Active to idle scan mode time out is changed to
2 seconds as opposed to 5 seconds to lower current
drain.
T22 - NOISESUPPRESSION OBJECT
NOISETHR = 0x20 (32d)
T7 - POWER CONFIG OBJECT
ACTV2IDLETO = 0x0A
Change-Id: Icdb98258ca72548291a782c398156445c0006dd1
Signed-off-by: makarand.karvekar <makarand.karvekar@motorola.com>
Dima Zavin [Tue, 9 Nov 2010 18:27:18 +0000 (10:27 -0800)]
media: video: tegra: wait for remote ack on disconnect
Change-Id: I42bf507b7d644184bd27be6ff53e5974dcfa3797
Signed-off-by: Dima Zavin <dima@android.com>
Jay Cheng [Tue, 9 Nov 2010 05:22:28 +0000 (00:22 -0500)]
ARM: tegra: usb_phy: Correct utmi power off sequence
USB_WAKE_ON_CNNT_EN_DEV is only valid when USB controller is in device mode.
Also only one of USB_WAKE_ON_CNNT_EN_DEV and USB_WAKE_ON_DISCON_EN_DEV bits
can be set at any one time.
Change-Id: I76d7fcf73e6ab8fa1610ec4264060c44b221775c
Signed-off-by: Jay Cheng <jacheng@nvidia.com>
Colin Cross [Tue, 9 Nov 2010 23:55:15 +0000 (15:55 -0800)]
ARM: tegra: stingray: Disable core dvfs in defconfig
Change-Id: I632d9682476e4fc4859cac097e563c1e0ff25feb
Signed-off-by: Colin Cross <ccross@android.com>