Commit Graph

39260 Commits

Author SHA1 Message Date
Erik Gilling
0fe8d7bf98 Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: Id806720fee83d7515a38dc601a7570a3da55fec3
2010-12-14 18:12:15 -08:00
Erik Gilling
8afb3d3409 Merge remote branch android-2.6.36 into android-tegra-2.6.36
Change-Id: Ice30bc601132f829abd664c68ddc61cbcdb8668c
2010-12-14 18:10:32 -08:00
Mike Lockwood
a05f03bf6e USB: gadget: composite: Use separate switches for connected and config state
Also remove disconnect debouncing, which didn't actually work on some platforms

Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-14 09:24:54 -08:00
Iliyan Malchev
63727fdcba Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 2010-12-06 18:31:10 -08:00
Iliyan Malchev
8df654ec26 Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36 2010-12-06 18:22:59 -08:00
John Michelau
10a8f4d52e usb: gadget: Multiple ACM gadget instances
- Added multiple ACM instance support in Android gadget
- Fixed multiple instance naming issue in ACM function
- Increased max instances from 4 to 8

Change-Id: I65f1b0be94da859bab7ec0ad7cd804b896c7c4c5
Signed-off-by: John Michelau <john.michelau@motorola.com>
2010-12-03 16:31:43 -08:00
makarand.karvekar
cf2439b6ab 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>
2010-12-01 21:00:16 -08:00
Colin Cross
fded4ab27f Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 2010-12-01 18:27:33 -08:00
Colin Cross
0a11e95053 Merge branch 'android-2.6.36' into android-tegra-2.6.36 2010-12-01 18:27:19 -08:00
Mike Chan
5316236c8d 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
2010-12-01 15:10:04 -08:00
Praveen Bharathi
88f695fd31 leds: als: improve ALS reporting accuracy
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
2010-11-30 16:25:27 -08:00
Andrei Warkentin
bd680338eb 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>
2010-11-23 13:04:11 -08:00
Iliyan Malchev
6c3960a399 Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36 2010-11-22 16:44:56 -08:00
Iliyan Malchev
b4d50aa63c 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>
2010-11-22 16:07:44 -08:00
Chris Fries
230015ed6a [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>
2010-11-22 15:41:10 -08:00
Greg Meiste
b0ec3b13a0 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>
2010-11-19 20:21:28 -08:00
Erik Gilling
e757da91b5 Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: Iacc215c30e5b3cb0634c671a7e14abeddec01a2e
2010-11-18 16:40:14 -08:00
Erik Gilling
899ac49afa Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: Iff6fb3eee3b96120f3973ccada4c0b0772dbc2b3
2010-11-18 16:36:54 -08:00
Ari Hirvonen
9a3e1502d5 video: tegra: YUV overlay support
Change-Id: I4bed4d37bc275cca9ef69390c217498529121db0
Signed-off-by: Erik Gilling <konkers@android.com>
2010-11-18 16:06:46 -08:00
Rebecca Schultz Zavin
44a883b43a Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36 2010-11-17 13:22:58 -08:00
Rebecca Schultz Zavin
71cf8afb3c Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36 2010-11-17 13:20:43 -08:00
Mike Lockwood
3482be62e4 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>
2010-11-17 09:29:20 -05:00
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