Colin Cross [Thu, 30 Dec 2010 00:16:20 +0000 (16:16 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Thu, 30 Dec 2010 00:15:17 +0000 (16:15 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Tue, 28 Dec 2010 22:54:10 +0000 (14:54 -0800)]
ARM: tegra: clock: Add function to set SDMMC tap delay
The SDMMC controllers have extra bits in the clock source
register that adjust the delay between the clock and data
to compenstate for delays on the PCB. The values need to
be set from the clock code so the clock can be locked
during the read-modify-write on the clock source register.
Change-Id: Id25b7cc01fa4ec48478b60aefdf5e59bb040fbf2
Signed-off-by: Colin Cross <ccross@android.com>
Varun Wadekar [Mon, 27 Dec 2010 12:47:35 +0000 (18:17 +0530)]
crypto: tegra-aes: reduce ivsize to 16 bytes and priority to 100
Change-Id: I6f5a7107d1140cf67f6029111cb4df312ac1183c
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Mon, 27 Dec 2010 06:53:47 +0000 (12:23 +0530)]
crypto: tegra-aes: initialise bsev/vde clocks per operation
Change-Id: Iaddea9ba9d3bee9c987776f37225dee483684274
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Mon, 27 Dec 2010 10:04:59 +0000 (15:34 +0530)]
[ARM] tegra: clocks: add clock entry for bsev
Change-Id: I7ec657c30b84c65705b38a390bdc44b64cd5ea36
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Benoit Goby [Tue, 28 Dec 2010 23:33:49 +0000 (15:33 -0800)]
usb: ehci: tegra: Don't change the hcd state on restart
usbcore will change it once the bus has been resumed. This fixes
the "hub 3-0:1.0: activate --> -22" error on resume.
Change-Id: Icff283a60634b4d003e77aafb5a5127d415cbd3f
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Sat, 18 Dec 2010 01:25:12 +0000 (17:25 -0800)]
ARM: tegra: usb_phy: Use utmi_phy_preresume for usb1 too
This prevents disconnects on resume.
Change-Id: I16a9e826df0d6c992e0e4480d38badba6cc9dfec
Signed-off-by: Benoit Goby <benoit@android.com>
Todd Poynor [Thu, 23 Dec 2010 20:55:08 +0000 (12:55 -0800)]
tegra SDHCI: Make debugging printk properly a debugging printk
Tegra SDMMC clock enable/disable seems to be working well enough,
don't need this extra spew.
Change-Id: I8bce2a6b26a72b9b3af2eec873bca0177f149ca3
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Andrei Warkentin [Sat, 4 Dec 2010 03:20:24 +0000 (21:20 -0600)]
ARM: tegra: stingray: usbnet: Make work be queued on non-reentrant queue
Didn't see any synchro in worker.
Change-Id: I047bea31653a2856859ab1e5f28d7b01191f0b2b
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Greg Meiste [Fri, 17 Dec 2010 17:41:19 +0000 (11:41 -0600)]
mfd: cpcap-whisper: Only hold wake lock during debouncing
Only need to hold the wake lock during debouncing. This change allows
the device to suspend when docks are attached, resulting in better
current drain.
Change-Id: Ieb72bacc5da3678a25a70a34620faa0c8620cbd2
Signed-off-by: Greg Meiste <w30289@motorola.com>
Benoit Goby [Wed, 22 Dec 2010 02:34:15 +0000 (18:34 -0800)]
ARM: tegra: stingray: Enable Linsys USB Ethernet Adapters
Change-Id: I7e7a5557c839e834e54ba0b923530d1ca3c0b9ce
Signed-off-by: Benoit Goby <benoit@android.com>
Colin Cross [Wed, 22 Dec 2010 02:38:24 +0000 (18:38 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Wed, 22 Dec 2010 02:38:13 +0000 (18:38 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Conflicts:
drivers/usb/gadget/composite.c
Change-Id: I1a332ec21da62aea98912df9a01cf0282ed50ee1
Colin Cross [Wed, 22 Dec 2010 02:34:37 +0000 (18:34 -0800)]
Merge commit 'v2.6.36.2' into linux-tegra-2.6.36
prabhu annabathula [Tue, 21 Dec 2010 18:35:28 +0000 (12:35 -0600)]
ARM: tegra: stingray: Enable USB ACM in defconfig
Signed-off-by: prabhu annabathula <prabhu.annabathula@motorola.com>
Colin Cross [Tue, 21 Dec 2010 20:25:34 +0000 (12:25 -0800)]
ARM: tegra: stingray: Enable soft reset
Makes the cpcap treat POWER + VOL UP as a soft reset, preserving
memory contents in /proc/last_kmsg
Change-Id: Idabbe725620b1e587b6310a5de8dc9bebabb4979
Signed-off-by: Colin Cross <ccross@android.com>
Erik Gilling [Wed, 22 Dec 2010 00:07:05 +0000 (16:07 -0800)]
[ARM] tegra: adjust panel timings to match upcoming bootloader
Change-Id: I907cae119dfeb5c97c713bd9e0b307b462f7f104
Signed-off-by: Erik Gilling <konkers@android.com>
Greg Meiste [Thu, 16 Dec 2010 23:11:57 +0000 (17:11 -0600)]
[ARM] tegra: stingray: Support for PWR + VOL_UP soft reset
Currently PWR + VOL_UP setup for hard reset to match current
behavior.
Change-Id: I725215eaf2af884bf33d7e6fe3975a60740c8337
Signed-off-by: Greg Meiste <w30289@motorola.com>
Greg Meiste [Thu, 16 Dec 2010 23:09:59 +0000 (17:09 -0600)]
firmware: cpcap: Add option to soft reset host
Change-Id: I25c6d2d93105c2dc59de81b0955d3a63ef7144b9
Signed-off-by: Greg Meiste <w30289@motorola.com>
Rebecca Schultz Zavin [Tue, 21 Dec 2010 19:58:04 +0000 (11:58 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Tue, 21 Dec 2010 19:51:19 +0000 (11:51 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Rebecca Schultz Zavin [Tue, 21 Dec 2010 19:51:15 +0000 (11:51 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Arve Hjønnevåg [Wed, 24 Nov 2010 01:29:04 +0000 (17:29 -0800)]
staging: android: lowmemorykiller: Ignore shmem pages in page-cache
Change-Id: Ia54fc50b7dcabfeb71eb487c652803f83e2f3d8e
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Arve Hjønnevåg [Wed, 24 Nov 2010 02:20:28 +0000 (18:20 -0800)]
staging: android: lowmemorykiller: Don't wait more than one second for a process to die
If a process forked and the child process was killed by the
lowmemorykiller, the lowmemory killer would be disabled until
the parent process reaped the child or it died itself.
Change-Id: I709b1a4e1b1a1970e51d26a39fcbee57977bbc7f
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Rabin Vincent [Thu, 9 Sep 2010 05:18:21 +0000 (10:48 +0530)]
lowmemorykiller: don't unregister notifier from atomic context
The lowmemorykiller registers an atomic notifier for notfication of when
the task is freed. From this atomic notifier callback, it removes the
atomic notifier via task_free_unregister(). This is incorrect because
atomic_notifier_chain_unregister() calls syncronize_rcu(), which can
sleep, which shouldn't be done from an atomic notifier.
Fix this by registering the notifier during init, and only unregister it
if the lowmemorykiller is unloaded.
Change-Id: I1577b04e617bc2b2e39dcb490fcfc9ce660eb7ec
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Christian Bejram <christian.bejram@stericsson.com>
Rebecca Schultz Zavin [Tue, 21 Dec 2010 19:36:14 +0000 (11:36 -0800)]
Revert "Revert "sched: Add a generic notifier when a task struct is about to be freed""
This reverts commit
d534322cb6066ae0db4790ceacba3e1a95b1ee7c.
Varun Wadekar [Wed, 8 Dec 2010 12:51:59 +0000 (18:21 +0530)]
[ARM] tegra: ventana: remove pda-power device
pda-power is only needed on pdas and phones.
Change-Id: I46a668cc0ee3f4b23c63de48251591cf4a8f99e8
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Rebecca Schultz Zavin [Tue, 21 Dec 2010 19:28:18 +0000 (11:28 -0800)]
Revert "Revert "staging: android: lowmemorykiller: Remove bitrotted codepath""
This reverts commit
abe997b06f4da33416b20bed5784abd9ea97c7c9.
Rebecca Schultz Zavin [Tue, 21 Dec 2010 19:28:07 +0000 (11:28 -0800)]
Revert "Revert "staging: android: lowmemorykiller: Fix task_struct leak""
This reverts commit
83dd90a8d9b866caca7da58805fdbb5e61d23e57.
Rebecca Schultz Zavin [Tue, 21 Dec 2010 19:27:57 +0000 (11:27 -0800)]
Revert "Revert "staging: android: lowmemkiller: Substantially reduce overhead during reclaim""
This reverts commit
54a1c40c991e35c31e7413d9bf24e828c3cab6b7.
Greg Goldman [Tue, 21 Dec 2010 19:14:17 +0000 (11:14 -0800)]
net: wireless: bcm4329: Update to version 4.218.248-18
- Improve BT-coex to differentiate HID and SCO device during DHCP session
- Enforce DTIM=1 for any SoftAP settings to optimize internal memory logic
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Todd Poynor [Mon, 20 Dec 2010 23:53:54 +0000 (15:53 -0800)]
ARM: tegra: cpufreq: Change function signature for CPU speed throttling
The NCT1008 driver is now passed a function pointer from the board
file's platform data to be called when alarms are asserted or
deasserted. Switch to a single function for throttling
enable/disable suitable for calling via the temperature alarm
callback.
Change-Id: Ic0eb1566a68e151216e26dfb6ed6f4bc7a273ddb
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Todd Poynor [Sat, 18 Dec 2010 03:36:23 +0000 (19:36 -0800)]
ARM: tegra: Make CPU thermal throttling configurable
Based on work by Dmitriy Gruzman and Varun Wadekar.
Change-Id: I64d765628223b7ef1ec493b9e409ea11e9391b94
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Stephen Warren [Thu, 9 Dec 2010 17:30:11 +0000 (10:30 -0700)]
mfd: Remove tps6586x device ID check
... and convert it to a dev_info print at probe time.
There are many variants of this chip with different values of VERSIONCRC.
The set of values is large, and not useful to enumerate. All are SW
compatible. The difference lies in default settings of the various power
rails, and other similar differences. The driver, or clients of the
driver, shouldn't be affected by this, since all rails should be
programmed into the desired state in all cases for correct operation.
Derived-from-code-by: Andrew Chew <achew@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Andrew Chew [Tue, 19 Oct 2010 09:08:36 +0000 (11:08 +0200)]
mfd: Add TPS658621C device ID
The interface for this device should be identical to that of the
TPS658521A.
Signed-off-by: Andrew Chew <achew@nvidia.com>
Acked-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Mike Corrigan [Fri, 17 Dec 2010 18:04:18 +0000 (12:04 -0600)]
misc: moto_bmp085: Disable debug messages
Change-Id: I3bdcafa3b1cba636ce8cd2a6d0d87990db677b84
Signed-off-by: Mike Corrigan <michael.corrigan@motorola.com>
Paul Eastham [Mon, 20 Dec 2010 19:53:36 +0000 (11:53 -0800)]
Revert "ARM: tegra: stingray: Enable core dvfs in defconfig"
This reverts commit
92ead7c3a8b5789368df3b5a1e65f367c96c5cf9.
Ken Sumrall [Sun, 19 Dec 2010 05:08:44 +0000 (21:08 -0800)]
[ARM] configs: Turn off the Tegra AES engine.
The Tegra AES engine is crashing when trying to write an
encrypted filesystem. Revert to the software AES engine
untill we get this debugged.
Signed-off-by: Ken Sumrall <ksumrall@android.com>
Colin Cross [Sat, 18 Dec 2010 01:25:26 +0000 (17:25 -0800)]
ARM: tegra: stingray: Add cgroups back to defconfig
Change-Id: I85bc0442252ffca282d3ae015ff6208723a9664d
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sat, 18 Dec 2010 01:24:24 +0000 (17:24 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Sat, 18 Dec 2010 01:23:38 +0000 (17:23 -0800)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Wed, 24 Nov 2010 05:37:04 +0000 (21:37 -0800)]
cgroup: Remove call to synchronize_rcu in cgroup_attach_task
synchronize_rcu can be very expensive, averaging 100 ms in
some cases. In cgroup_attach_task, it is used to prevent
a task->cgroups pointer dereferenced in an RCU read side
critical section from being invalidated, by delaying the
call to put_css_set until after an RCU grace period.
To avoid the call to synchronize_rcu, make the put_css_set
call rcu-safe by moving the deletion of the css_set links
into free_css_set_work, scheduled by the rcu callback
free_css_set_rcu.
The decrement of the cgroup refcount is no longer
synchronous with the call to put_css_set, which can result
in the cgroup refcount staying positive after the last call
to cgroup_attach_task returns. To allow the cgroup to be
deleted with cgroup_rmdir synchronously after
cgroup_attach_task, have rmdir check the refcount of all
associated css_sets. If cgroup_rmdir is called on a cgroup
for which the css_sets all have refcount zero but the
cgroup refcount is nonzero, reuse the rmdir waitqueue to
block the rmdir until free_css_set_work is called.
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 24 Nov 2010 05:37:03 +0000 (21:37 -0800)]
cgroup: Set CGRP_RELEASABLE when adding to a cgroup
Changes the meaning of CGRP_RELEASABLE to be set on any cgroup
that has ever had a task or cgroup in it, or had css_get called
on it. The bit is set in cgroup_attach_task, cgroup_create,
and __css_get. It is not necessary to set the bit in
cgroup_fork, as the task is either in the root cgroup, in
which can never be released, or the task it was forked from
already set the bit in croup_attach_task.
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Sat, 18 Dec 2010 00:45:49 +0000 (16:45 -0800)]
ARM: tegra: stingray: Update memory scaling tables
Adds separate tables for Samsung vs. Elpida memory parts
Changes the scaling frequencies to 60 MHz, 120 MHz, 200 MHz,
and 300 MHz
Change-Id: I6c490d337bbbd119704a690a9d0f5db66b1243d7
Signed-off-by: Colin Cross <ccross@android.com>
Rebecca Schultz Zavin [Fri, 17 Dec 2010 23:32:37 +0000 (15:32 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Fri, 17 Dec 2010 23:29:50 +0000 (15:29 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Greg Meiste [Fri, 17 Dec 2010 17:39:12 +0000 (11:39 -0600)]
usb: cpcap-otg: Take wake lock when USB connected
Driver was previously relying on accessory detection driver to hold a
wake lock when USB was attached.
Change-Id: I07542b87fcdc82e87f36d03133e8e5f6acf231a8
Signed-off-by: Greg Meiste <w30289@motorola.com>
Rebecca Schultz Zavin [Fri, 17 Dec 2010 23:06:38 +0000 (15:06 -0800)]
video: tegra: nvmap: Add logging to some error conditions
Change-Id: I1ec34fd4a6bb21a6d84912a7228c209f459261be
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Andrei Warkentin [Fri, 17 Dec 2010 22:14:22 +0000 (16:14 -0600)]
media: video: tegra: soc2030: Prevent concurrent ioctls from multiple threads.
Protects with a mutex. Also cleans up the error handling a bit.
Change-Id: Ib7b04890d86dd3890033b06e2ea7201c20178909
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Colin Cross [Fri, 17 Dec 2010 07:10:41 +0000 (23:10 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Fri, 17 Dec 2010 07:09:45 +0000 (23:09 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Thu, 16 Dec 2010 20:51:22 +0000 (12:51 -0800)]
crypto: tegra-aes: Disable clock at end of probe
Change-Id: Ie5b98b705a7ec70782df5dc0aec69438b699661c
Signed-off-by: Colin Cross <ccross@android.com>
Rebecca Schultz Zavin [Thu, 16 Dec 2010 02:58:37 +0000 (18:58 -0800)]
[ARM] stingray: Enable fixed voltage regulator in stingray defconfig
Change-Id: I9380ed5ea070bc2498d69fa8834632a6f9bf92ec
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Rebecca Schultz Zavin [Thu, 16 Dec 2010 02:36:22 +0000 (18:36 -0800)]
leds: lp8550: Fix regulator enable/disable in lp8550 driver
Change-Id: I6ec17f20b92eb4f02489be82d5943882e2266633
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Greg Meiste [Fri, 10 Dec 2010 21:35:52 +0000 (15:35 -0600)]
mfd: cpcap: Improve ST DAC enable time
Workaround provided by ST to improve ST DAC enable time.
Change-Id: I246ef7af1e9b5c2d21f9ec311d35fc704b4589bd
Signed-off-by: Greg Meiste <w30289@motorola.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Colin Cross [Wed, 1 Dec 2010 00:56:35 +0000 (16:56 -0800)]
ARM: tegra: stingray: Enable core dvfs in defconfig
Change-Id: I9c60cc97d7410308cbecfb9a2a46f5685481bad0
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Thu, 9 Dec 2010 04:25:50 +0000 (20:25 -0800)]
ARM: tegra: stingray: Enable EMC scaling in defconfig
Change-Id: Iaba7e0699692f4efd66dc0bcdc81624c7fd4b29e
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 8 Dec 2010 02:27:28 +0000 (18:27 -0800)]
ARM: tegra: stingray: Add emc tables
Change-Id: I2fb991478c527fc3fc4355110c524037b4e4d372
Signed-off-by: Colin Cross <ccross@android.com>
Jaikumar Ganesh [Tue, 14 Dec 2010 22:56:59 +0000 (14:56 -0800)]
serial: tegra_hsuart: Call rx_done callback with lock held.
Similar to the exit_lpm callback which is called with the lock
held, call the rx_done callback with lock held.
Change-Id: I307d5191669ef6816d8406bb421b2c10c902f6a8
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Jaikumar Ganesh [Thu, 9 Dec 2010 21:22:15 +0000 (13:22 -0800)]
[ARM] tegra: stingray: Rework Bluetooth rfkill driver.
Convert Bluetooth rfkill driver to both power up/down
the chipset as well as enable low power mode.
Add wake lock to lpm and gpio fixes.
Change-Id: I9232cacdc68a603903e22c883e8a1531998d3a77
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Jaikumar Ganesh [Wed, 15 Dec 2010 00:46:05 +0000 (16:46 -0800)]
[ARM] tegra: stingray: Rename rfkill driver to stingray-bluetooth.
This rename is being done with the future addition of low power
driver to rfkill driver.
Change-Id: I678a579af60aea8c72cee43c36cc292260350033
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Rebecca Schultz Zavin [Wed, 15 Dec 2010 00:53:56 +0000 (16:53 -0800)]
misc: moto_bmp085: Add vio regulator to barometer driver
Change-Id: I31a28fefa55e9d0391c0fa431305356977d19703
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Rebecca Schultz Zavin [Tue, 14 Dec 2010 22:29:57 +0000 (14:29 -0800)]
input: touchscreen: Add regulator to qtouch driver
Change-Id: Ic2461309a9c7b6a6162c4e5fb9b67b6828369938
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Rebecca Schultz Zavin [Tue, 14 Dec 2010 21:57:09 +0000 (13:57 -0800)]
leds: lp8550: Add regulator to lp8550 lighting driver
Change-Id: I9e57aec4fca3352ce2e689ca44b5a4b3bdfe2ed2
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Rebecca Schultz Zavin [Tue, 14 Dec 2010 20:19:43 +0000 (12:19 -0800)]
misc: max9635: Add regulator to als driver
Change-Id: I5fe58e698011024cb0f6d8d9c090b430e31b8fd2
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Rebecca Schultz Zavin [Tue, 14 Dec 2010 20:02:54 +0000 (12:02 -0800)]
[ARM] tegra: stingray: Add fixed regulator for panel enable
Due to a problem with the hardware design, a voltage divider
is created on the i2c bus when the panel is turned off. This
can cause problems with other devices on that bus. To work
around, a fixed regulator has been created representing the panel
power. This regulator must be enabled when devices on that i2c
bus are in use, even if the panel is otherwise off.
Change-Id: I78d9a3b29e69c1cffd5e8df23025b186527f31b3
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Erik Gilling [Wed, 15 Dec 2010 02:11:59 +0000 (18:11 -0800)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: Id806720fee83d7515a38dc601a7570a3da55fec3
Erik Gilling [Wed, 15 Dec 2010 02:10:08 +0000 (18:10 -0800)]
Merge remote branch android-2.6.36 into android-tegra-2.6.36
Change-Id: Ice30bc601132f829abd664c68ddc61cbcdb8668c
Dima Zavin [Tue, 14 Dec 2010 22:34:22 +0000 (14:34 -0800)]
ARM: tegra: enable tegra aes in stingray defconfig
Change-Id: I8f7fd5f72637f8c8e31be08fefe9ab9d9a89b072
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 14 Dec 2010 22:25:59 +0000 (14:25 -0800)]
ARM: tegra: stingray: add AES device
Change-Id: I97245f9266e69b2c7d0af6c22f8ac7a1a1e7fc13
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Tue, 14 Dec 2010 22:25:27 +0000 (14:25 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Conflicts:
arch/arm/mach-tegra/tegra2_clocks.c
Change-Id: Ia10990fca6221d4d7d0236073910d8c48bf6762b
Dima Zavin [Tue, 14 Dec 2010 22:12:05 +0000 (14:12 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Varun Wadekar [Sun, 17 Oct 2010 00:44:37 +0000 (06:14 +0530)]
[ARM] tegra: ventana: register AES device
Change-Id: I5badd8d4967d7a98439b6f4b5d1329b28ee0c2d4
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Sun, 17 Oct 2010 00:40:43 +0000 (06:10 +0530)]
[ARM] tegra: add aes to devices.c
Change-Id: Id13075009d785e784ae6bd0feb9b29f3fa7184df
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Mon, 18 Oct 2010 11:29:31 +0000 (16:59 +0530)]
crypto: driver for tegra AES hardware
driver supports ecb/cbc/ansi_x9.31rng modes, 128, 192 and 256-bit key sizes
and encrypt/decrypt using ssk.
Change-Id: I63e03ead5b53adc5e44cf5b60f9f700dea2a2e61
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Fri, 15 Oct 2010 17:12:14 +0000 (22:42 +0530)]
ARM: tegra: hardware arbitration semaphore support
add apis to use the hardware arbitration semaphores in order
to share hardware modules between kernel drivers and AVP
firmware (e.g., the BSEA (audio bitstream) engine and
AES block)
Change-Id: I500ef0797223bc702151ad14e0e2156f50644a2a
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Wed, 10 Nov 2010 12:51:21 +0000 (18:21 +0530)]
ARM: tegra: duplicate vde clock for aes in tegra2_clocks
Change-Id: If5ad2bfe767c7c43e83fd78ac1cb3d9c62fe785d
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Varun Wadekar [Fri, 15 Oct 2010 17:04:33 +0000 (22:34 +0530)]
ARM: tegra: add VDE and arb semaphores to iomap.h
Change-Id: Ic47b80d1c7fdf04305afbea4b34d6c9e9c9304ad
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Mike Lockwood [Sat, 11 Dec 2010 00:30:15 +0000 (16:30 -0800)]
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>
Erik Gilling [Tue, 14 Dec 2010 02:39:29 +0000 (18:39 -0800)]
leds: lp8550: add early suspend/late resume handlers
Change-Id: I5b26a404fa855b111176177258e31a65d308b6ba
Signed-off-by: Erik Gilling <konkers@android.com>
Benoit Goby [Tue, 14 Dec 2010 04:42:16 +0000 (20:42 -0800)]
Revert "Revert "usb: core: Temporary workaround for usb auto-suspend issue""
This reverts commit
b26b14ee87f00806ef24a0d7442d5ef9c7fd8531.
Erik Gilling [Tue, 14 Dec 2010 07:12:46 +0000 (23:12 -0800)]
Revert "[ARM] tegra: stingray: Rework Bluetooth rfkill driver."
This reverts commit
bdc9c8c04726fd6a5a22194e79df7140667c8c20.
Erik Gilling [Tue, 14 Dec 2010 05:16:23 +0000 (21:16 -0800)]
Merge remote branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: Ib347f9de55fa0c6492f5a39585eff54cc661d819
Erik Gilling [Tue, 14 Dec 2010 05:12:12 +0000 (21:12 -0800)]
Merge remote branch android-2.6.36 into android-tegra-2.6.36
Change-Id: Ifd4c8ddc62f0c6e213d203498891d151d9b06442
Erik Gilling [Tue, 14 Dec 2010 05:11:04 +0000 (21:11 -0800)]
Merge remote branch linux-tegra-2.6.36 into android-tegra
Change-Id: I90cac044708a1b51ed15374b20709180ed92270a
Erik Gilling [Tue, 14 Dec 2010 04:51:43 +0000 (20:51 -0800)]
video: tegra: fix HDMI audio programming
This was causing the Onkyo TXNR708 to drop out audio.
Change-Id: I9b9fd782d39d60c3207ea140a94d074b1338c7fa
Signed-off-by: Erik Gilling <konkers@android.com>
Jaikumar Ganesh [Thu, 9 Dec 2010 21:22:15 +0000 (13:22 -0800)]
[ARM] tegra: stingray: Rework Bluetooth rfkill driver.
Convert Bluetooth rfkill driver to both power up/down
the chipset as well as enable low power mode.
Add wake lock to lpm and gpio fixes.
Change-Id: Ib7474e25a1c4e5d07423abd6e820c011fa80b134
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Benoit Goby [Mon, 13 Dec 2010 23:27:06 +0000 (15:27 -0800)]
PM: Wait for completion of the parent resume before resuming
If the parent device is in the DPM_RESUMING state, resume might get called
before the parent's resume has completed, because dpm_wait won't get
called. This issue was introduced by:
3d46a3c PM: Prevent waiting forever on asynchronous resume after abort
Wait for completion of the parent resume if the parent state is >= DPM_OFF
or == DPM_RESUMING
Change-Id: I14a4e16426f61efceaefedc7e772f53b7522b5dd
Signed-off-by: Benoit Goby <benoit@android.com>
Greg Meiste [Wed, 8 Dec 2010 19:33:56 +0000 (13:33 -0600)]
power: ds2781: Lower capacity threshold for sanity check
The HW team was seeing the capacity reset occur in a few situations where
the reset was not desired, so they have requested the capacity threshold
be lowered from 5% to 3% to prevent the reset from occuring.
Change-Id: Id512224bbd8440eef6503ad72fce5e08f7195c2a
Signed-off-by: Greg Meiste <w30289@motorola.com>
Sergey Kudakov [Wed, 8 Dec 2010 01:39:23 +0000 (19:39 -0600)]
leds: lp8550: correction for pwm
turn off the backlight properly
scale the brightness
Change-Id: I51d9d36c4b5bff4ddda3c2c4273b12368447c7c5
Signed-off-by: Sergey Kudakov <sergey.kudakov@motorola.com>
Rebecca Schultz Zavin [Mon, 13 Dec 2010 19:44:29 +0000 (11:44 -0800)]
Revert "media: video: tegra: ov5650: adding group hold"
This reverts commit
79b6dbe9a8b2f05c6fc1d315f150eba05f2a3171.
Greg Goldman [Mon, 13 Dec 2010 17:57:24 +0000 (09:57 -0800)]
net: wireless: bcm4329: Update to Version 4.218.248-17
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Paul Eastham [Sun, 12 Dec 2010 17:23:27 +0000 (09:23 -0800)]
Revert "usb: core: Temporary workaround for usb auto-suspend issue"
This reverts commit
463100c1cedd5684188c8d5ece84c4af6dd42090.
Signed-off-by: Paul Eastham <eastham@google.com>
John Michelau [Fri, 10 Dec 2010 19:51:19 +0000 (13:51 -0600)]
USB: gadget: acm,rndis: IAD class, subclass & prot should match 1st iface
Microsoft recommends that the class and subclass fields of
an IAD match the same fields from the first interface in the
collection that the IAD is grouping. In practice, we are also
finding that the protocol fields should also match. Without
this change, the default Microsoft composite driver may not
group interfaces properly, which is what allows child
function drivers with IAD's to load correctly.
Signed-off-by: Mike Lockwood <lockwood@android.com>
John Michelau [Fri, 10 Dec 2010 18:09:53 +0000 (12:09 -0600)]
USB: gadget: composite: Dynamically set IAD bFirstInterface
bFirstInterface should be set equal to bInterfaceNumber of
the first interface in a grouping. It's currently being set
only when a composite device is bound, and it does not get
updated when functions are enabled or disabled.
Signed-off-by: Mike Lockwood <lockwood@android.com>
John Michelau [Fri, 10 Dec 2010 17:33:54 +0000 (11:33 -0600)]
USB: gadget: android Fix gadget descriptor compliance for IAD's
USB-IF core team mandates that composite devices containing
IAD's must use bDeviceClass=0xEF, bDeviceSubClass=0x02, &
bDeviceProtocol=0x01 instead of the usual 0x00 in all fields.
This is not a problem currently on Linux hosts, but it is a
problem when connecting to Windows hosts. Without this change
the default Microsoft composite driver will not group
interfaces properly, which is what allows child function
drivers with IAD's to load correctly.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Ken Sumrall [Sat, 11 Dec 2010 00:48:33 +0000 (16:48 -0800)]
[ARM] configs: Turn on SHA256 hashing.
Encrypting /data requires the SHA256 hash.
Signed-off-by: Ken Sumrall <ksumrall@android.com>
Ken Sumrall [Sat, 11 Dec 2010 00:38:30 +0000 (16:38 -0800)]
[ARM] configs: Change stingray_defconfig to a proper minimal defconfig
This defconfig was made like this:
make mrproper; make stingray_defconfig; make savedefconfig
Change-Id: Iaef4f82a37fd9a9c91ea8aea7ab10e868b00b8d2
Signed-off-by: Ken Sumrall <ksumrall@android.com>
Jay Cheng [Tue, 7 Dec 2010 15:15:32 +0000 (10:15 -0500)]
usb: host: tegra: Remove clear PORT_RESUME to clear PORT_SUSPEND
PORT_SUSPEND bit will be cleared by the host controller when PORT_RESUME
change to 0.
Change-Id: I94a72f51be1cebee414f11ace89a7e8b3249278d
Signed-off-by: Jay Cheng <jacheng@nvidia.com>
projects / firefly-linux-kernel-4.4.55.git / log