Erik Gilling [Tue, 24 May 2011 22:41:54 +0000 (15:41 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Change-Id: I80fdbf17c2e3a77be3ea63350191c8eab235ed94
Michael I. Gold [Thu, 31 Mar 2011 02:07:07 +0000 (19:07 -0700)]
video: tegra: add support for tiled surfaces
Change-Id: I82497fc756552740836eaa2f608fecaea409cfeb
Signed-off-by: Michael I. Gold <gold@nvidia.com>
Ari Hirvonen [Wed, 2 Mar 2011 00:06:27 +0000 (02:06 +0200)]
video: tegra: add display inversion support
Change-Id: Ied3851e0cb801f607499493f1e552f42daa97e6b
Signed-off-by: Ari Hirvonen <ahirvonen@nvidia.com>
Colin Cross [Thu, 12 May 2011 21:08:42 +0000 (14:08 -0700)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Dmitry ORNATSKYY [Wed, 11 May 2011 16:44:21 +0000 (09:44 -0700)]
net: wireless: bcm4329: Reduce listen interval to 10 (from 20)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Colin Cross [Wed, 11 May 2011 02:20:23 +0000 (19:20 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Dmitry Shmidt [Tue, 10 May 2011 23:29:51 +0000 (16:29 -0700)]
net: wireless: bcm4329: Add new and default wifi locale support
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Nathan Connell [Mon, 2 May 2011 19:32:36 +0000 (14:32 -0500)]
usb: ehci: tegra: Correctly handle GetPortStatus during Resume
Multiple GetPortStatus requests can be made while the
USB bus is resuming. All requests must be handled
properly to prevent incorrect disconnect detection
during Resume and improper indentification of
Resume signaling as a remote wakeup event.
Change-Id: Ib07f83a2bab5699b2d95533d26d0a6bf541c697d
Signed-off-by: Nathan Connell <w14185@motorola.com>
James Wylder [Fri, 11 Mar 2011 22:39:43 +0000 (16:39 -0600)]
usb: host: tegra: update memory frequency requests to 150 MHz
With the previous change in memory frequency (200 MHz
to 150 MHz) requests of 200 MHz will round up to full
speed. This negatively impacts current drain.
Change-Id: Ib67d8eaff57836a2f1756d84cce6533539911178
Signed-off-by: James Wylder <james.wylder@motorola.com>
James Wylder [Fri, 11 Mar 2011 22:39:43 +0000 (16:39 -0600)]
usb: gadget: tegra: update memory frequency requests to 150 MHz
With the previous change in memory frequency (200 MHz
to 150 MHz) requests of 200 MHz will round up to full
speed. This negatively impacts current drain.
Change-Id: Iefdb3a50aff338b44daa8311218400e4b4586152
Signed-off-by: James Wylder <james.wylder@motorola.com>
Andrei Warkentin [Tue, 3 May 2011 21:41:08 +0000 (16:41 -0500)]
video: tegra: dc: Fix introduced regression.
Removes changes to DC reset flow.
Change-Id: I491b6771c205bec7e19d4c661bb6d376ea8e25e4
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Rebecca Schultz Zavin [Mon, 2 May 2011 19:29:23 +0000 (12:29 -0700)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Rebecca Schultz Zavin [Mon, 2 May 2011 19:29:14 +0000 (12:29 -0700)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Dmitry Shmidt [Tue, 26 Apr 2011 18:36:07 +0000 (11:36 -0700)]
net: wireless: bcm4329: Prevent working thread to run during suspend path
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Nathan Connell [Mon, 25 Apr 2011 19:17:13 +0000 (14:17 -0500)]
ARM: tegra: Verify PHY clock valid before clearing USB_SUSP_CLR bit
When enabling the external ULPI PHY, the clock from the PHY must be
valid before the USB_SUSP_CLR bit is cleared in the USB2 controller
interface register. If the clock from the PHY is not valid when
this bit is cleared, the AHB clock to the host controller may be
stopped, preventing any access to the host controller.
Replace hard-coded delay with poll for USB_PHY_CLK_VALID bit.
Signed-off-by: Nathan Connell <w14185@motorola.com>
Change-Id: I24fa7575641f20ffdba7737776a81ba453f54395
Signed-off-by: Nathan Connell <w14185@motorola.com>
James Wylder [Thu, 7 Apr 2011 21:02:19 +0000 (16:02 -0500)]
ARM: tegra: usb_phy: Resolve ulpi disconnect issue
Correct phy start-up sequence.
Put the phy in low power mode.
Tristate ulpi interface when USB controller is resuming
Change-Id: I1b326c16b56b9fd2d424afb8cf0888da6c9e245e
Signed-off-by: James Wylder <james.wylder@motorola.com>
Rebecca Schultz Zavin [Fri, 22 Apr 2011 22:54:34 +0000 (15:54 -0700)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Rebecca Schultz Zavin [Fri, 22 Apr 2011 00:36:15 +0000 (17:36 -0700)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Andrei Warkentin [Thu, 21 Apr 2011 16:57:57 +0000 (11:57 -0500)]
video: tegra: dc: Fix several problems
Resolve potential race between resume and reset
Fix wmb after return
Change-Id: I98ad1e713b9781d780bf93561496011bf62b86d1
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Greg Goldman [Wed, 20 Apr 2011 18:23:06 +0000 (11:23 -0700)]
net: wireless: bcm4329: Clean ARP offload table on IP update
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Chia-chi Yeh [Fri, 15 Apr 2011 22:22:09 +0000 (15:22 -0700)]
net: Reorder incoming packets in PPPoLAC and PPPoPNS.
PPP handles packet loss but does not work with out of order packets.
This change performs reordering of incoming data packets within a
sliding window of one second. Since sequence number is optional,
receiving a packet without it will drop all queued packets.
Currently the logic is triggered by incoming packets, so queued
packets have to wait till another packet is arrived. It is done for
simplicity since no additional locks or threads are required. For
reliable protocols, a retransmission will kick it. For unreliable
protocols, queued packets just seem like packet loss. Time-critical
protocols might be broken, but they never work with queueing anyway.
Signed-off-by: Chia-chi Yeh <chiachi@android.com>
Erik Gilling [Tue, 19 Apr 2011 20:36:37 +0000 (13:36 -0700)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I023482f230dc4f413647f47b3c7c36fd4c98b97d
Andrei Warkentin [Tue, 19 Apr 2011 19:20:48 +0000 (14:20 -0500)]
video: tegra: prevent double disable in suspend
Prevents HDMI detect worker from re-disabling DC during
suspend (after tegra_dc_suspend has disabled DC itself)/
Change-Id: I90016fb709934ab8fb5135443980898069f8071f
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Signed-off-by: Erik Gilling <konkers@android.com>
Peter Zu [Thu, 7 Apr 2011 04:42:33 +0000 (21:42 -0700)]
video: tegra: dc: hdcp: handle the case of DEVICE_COUNT = 0 properly
When HDCP repeater has no device attached, DEVICE_COUNT reports back as 0.
HDCP driver should handle this case as a good case and continue downstream
authentication, other than fail it.
Change-Id: Ied2e46428c0247f14fbd96016cd4fdbf358f6587
Erik Gilling [Fri, 15 Apr 2011 22:56:26 +0000 (15:56 -0700)]
Merge branch 'linux-tegra' into android-tegra
Erik Gilling [Fri, 15 Apr 2011 21:49:53 +0000 (14:49 -0700)]
video: tegra: fix more unplug/suspend timeout in nvhdcp
Change-Id: I30dfa03324eb5c4c344c62578eb808a150c80deb
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Wed, 13 Apr 2011 15:12:28 +0000 (08:12 -0700)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I016b27ad8ada8ec6214b1ed2b6096c294d2e81b8
Erik Gilling [Wed, 13 Apr 2011 15:03:41 +0000 (08:03 -0700)]
video: tegra: fix unplug/suspend timeout in nvhdcp
If HDCP was turned off (either by unplug or suspend) the work funciton
would wait the full timeout 5 * l.75s before exiting. This
causes suspend to timeout and crash.
Change-Id: I8eb185452ad09e34f4573874e9766c0e1cec15de
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Wed, 13 Apr 2011 00:57:10 +0000 (17:57 -0700)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I4305576b867fb062db791b0e18a8f0215bbc5705
Erik Gilling [Wed, 13 Apr 2011 00:36:04 +0000 (17:36 -0700)]
video: tegra: zero out var before calling fb_videomode_to_var
Change-Id: I23f01da0a7dcd62594faa828676ffb7a4bc72d9f
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Mon, 11 Apr 2011 22:15:15 +0000 (15:15 -0700)]
video: tegra: add debouncing to hdmi hotplug
Change-Id: Ic998e183e79faabc36d96720dcbae2640e8cf419
Signed-off-by: Erik Gilling <konkers@android.com>
Andrei Warkentin [Wed, 6 Apr 2011 21:30:00 +0000 (16:30 -0500)]
MMC: Fix erase/trim for certain SanDisk cards.
CMD38 argument is passed through EXT_CSD[113].
Change-Id: I47e9d5e2cf44d9274a65a3b1955026185cb8f2b8
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Andrei Warkentin [Wed, 6 Apr 2011 21:33:44 +0000 (16:33 -0500)]
MMC: Expose mmc_switch to higher drivers.
Needed for Sandisk workaround (manipulate EXT_CSD).
Change-Id: I7bfe50a1503ac73ae072db718b60c27526521e41
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Andrei Warkentin [Wed, 9 Mar 2011 21:35:04 +0000 (15:35 -0600)]
MMC: Support for block quirks.
Block quirks implemented using core/quirks.c support.
Change-Id: I81d9ad57a7ae95c60ee8026f090c8df7c75fd069
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Andrei Warkentin [Sun, 13 Mar 2011 13:48:37 +0000 (08:48 -0500)]
MMC: Extends card quicks with MMC/SD quirks matching the CID.
The current mechanism is SDIO-only. This allows us to create
function-specific quirks, without creating messy Kconfig dependencies,
or polluting core/ with function-specific code.
Change-Id: If31a151c20a8a1fddb0774674821e9fdc4aa61a0
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Pierre Tardy [Sun, 6 Feb 2011 18:03:46 +0000 (19:03 +0100)]
mmc: add per device quirk placeholder
Some cards have quirks valid for every platforms using current
platform quirk hooks leads to a lot of code and debug duplication.
So we inspire a bit from what exists in PCI subsystem and do our own
per vendorid/deviceid quirk. We still drop the complexity of the pci
quirk system (with special section tables, and so on).
That can be added later if needed.
Change-Id: Ib67a3e97486023267f5ea3e7c6ef8fc99b13a704
Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Ohad Ben-Cohen <ohad@wizery.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Erik Gilling [Thu, 7 Apr 2011 23:54:01 +0000 (16:54 -0700)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: I0dea4f256442d7391808de8456fe35d3879682fe
Jon Mayo [Wed, 6 Apr 2011 20:20:15 +0000 (13:20 -0700)]
video: tegra: reset hdcp failure count on hotplug
use tegra_nvhdcp_on/tegra_nvhdcp_off in hotplug handler to clean up
state machine.
Change-Id: I62fe503f0628ad4b49d5d7d66fe1702122179877
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Thu, 7 Apr 2011 21:33:20 +0000 (14:33 -0700)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: If54be4c2e106e24beb0ae3063156a0659fcbb943
Jon Mayo [Wed, 6 Apr 2011 20:15:20 +0000 (13:15 -0700)]
video: tegra: use longer retries for hdcp
use 3 seconds for i2c/ddc failures on hdcp (15 attempts at 250mS each)
Change-Id: Ia755c9b42d5a0d8467b68c9d334638bcb015eabd
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Thu, 7 Apr 2011 17:33:55 +0000 (10:33 -0700)]
video: tegra: attempt HDCP on DVI
Change-Id: If9efc63de3427f263b121e102cd0168883a236a3
Signed-off-by: Erik Gilling <konkers@android.com>
Colin Cross [Fri, 1 Apr 2011 00:42:16 +0000 (17:42 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Erik Gilling [Thu, 31 Mar 2011 23:26:59 +0000 (16:26 -0700)]
video: tegra: reset hdcp failure count on hotplug
Change-Id: Iba5041f8428b13791004c96e6e8c2ed4dbcc37b8
Signed-off-by: Erik Gilling <konkers@android.com>
Venkata (Muni) Anda [Tue, 29 Mar 2011 06:15:40 +0000 (23:15 -0700)]
usb: host: ehci-tegra: Wait for SOF before resume
Wait for Start Of Frame interrupt, then wait 20 us, before starting
port resume. Workaround for hardware issue that can cause the SOF to
be sent out at the same time as the phy speed change.
Change-Id: I91ccbd2902448e87aa3cdf1970305de22efa1c10
Signed-off-by: Colin Cross <ccross@android.com>
Jaikumar Ganesh [Tue, 22 Mar 2011 19:27:11 +0000 (12:27 -0700)]
Use BT POWER force_active parameter for rx data.
We were going to active mode during rx processing which
defeats the purpose of force_active parameter for HID devices.
Based on a report and discussion with Leijun Tao <L.J.Tao@motorola.com>
Change-Id: I0dc5ccae131e8a2245328eba5cc35159e7656e8a
Signed-off-by: Jaikumar Ganesh <jaikumar@google.com>
Colin Cross [Tue, 22 Mar 2011 18:42:14 +0000 (11:42 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Andrei Warkentin [Tue, 22 Mar 2011 18:37:47 +0000 (11:37 -0700)]
serial: tegra_hsuart: Make sure current byte rx complete in suspend
Make sure that the last byte has been received by the uart during
suspend after RTS is deasserted.
Change-Id: I3517ec058fdca912ff5ad8770d2b1c5015385385
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Signed-off-by: Colin Cross <ccross@android.com>
Chris Johnson [Tue, 22 Mar 2011 01:20:51 +0000 (18:20 -0700)]
video: tegra: add HOST1_SYNC regs to nvhost_debug_show dump
Change-Id: I48cccf5b0df768b9cfc774803f3945f4806a62ac
Colin Cross [Wed, 16 Mar 2011 23:56:23 +0000 (16:56 -0700)]
serial: tegra_hsuart: Call complete callbacks when cancelling reqs
Updates the tegra_hsuart driver to match the changes in the Tegra
dma engine.
Change-Id: Iaaf8770166156c1a6d889a6a11bae517626781ee
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Wed, 16 Mar 2011 23:53:24 +0000 (16:53 -0700)]
ARM: tegra: dma: Do not call complete callback on canceled requests
Calling the complete callback when a request is cancelled leads to
locking problems in the callback, which could be called from an IRQ
with no locks held, or from whatever context called
tegra_dma_dequeue_req. Instead, expect the caller to handle the
now-cancelled request as needed.
Also removes tegra_dma_dequeue, since all users can be trivially
converted to tegra_dma_dequeue_req.
Change-Id: If699239c09c78d1cd3afa0eaad46535b1d401a24
Signed-off-by: Colin Cross <ccross@android.com>
Rebecca Schultz Zavin [Tue, 22 Mar 2011 18:04:55 +0000 (11:04 -0700)]
Revert "ARM: Cortex-A9: Enable dynamic clock gating"
This reverts commit
91406b03fa4add49db13e55c3220911be55d9883.
Rebecca Schultz Zavin [Mon, 21 Mar 2011 21:14:12 +0000 (14:14 -0700)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Rebecca Schultz Zavin [Mon, 21 Mar 2011 21:09:44 +0000 (14:09 -0700)]
Revert "[ARM] tegra: Enable pl310 data prefetching and prefetch offset"
This reverts commit
6c77fdda35688ae3c9d9029a9824f7cf941f348d.
Conflicts:
arch/arm/mach-tegra/common.c
Change-Id: I35858f63da5cfd00885dd765da45db39be16b8b7
Rebecca Schultz Zavin [Mon, 21 Mar 2011 20:52:56 +0000 (13:52 -0700)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Chris Johnson [Wed, 16 Mar 2011 21:25:22 +0000 (14:25 -0700)]
video: tegra: cleanup debug syncpt output
In debug prints for stuck WAITs differentiate WAIT_SYNCPT
vs. WAIT_SYNCPT_BASE and fix some build warnings.
Change-Id: Ia47375614c676a9f93216fbfaaf6856c3df42e2e
Signed-off-by: Chris Johnson <cwj@nvidia.com>
Rebecca Schultz Zavin [Tue, 15 Mar 2011 23:51:19 +0000 (16:51 -0700)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Lorenzo Colitti [Fri, 11 Mar 2011 04:24:12 +0000 (20:24 -0800)]
net: Support nuking IPv6 sockets as well as IPv4.
On Linux, when an interface goes down all its IPv6
addresses are deleted, so relying on knowing the previous
IPv6 addresses on the interface is brittle. Instead,
support nuking all sockets that are bound to IP addresses
that are not configured and up on the system. This
behaviour is triggered by specifying the unspecified
address (:: or 0.0.0.0). If an IP address is specified, the
behaviour is unchanged, except the ioctl now supports IPv6
as well as IPv4.
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
Dmitry Shmidt [Thu, 10 Mar 2011 18:18:39 +0000 (10:18 -0800)]
net: wireless: bcm4329: Allocate skb with GFP_KERNEL flag if possible
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Thu, 10 Mar 2011 00:52:08 +0000 (16:52 -0800)]
net: wireless: bcm4329: Disable wake irq at driver stop
Previously at driver stop interrupts were not disabled and
might cause never-ending waking up
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Rebecca Schultz Zavin [Tue, 8 Mar 2011 20:22:31 +0000 (12:22 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Rebecca Schultz Zavin [Tue, 8 Mar 2011 20:15:30 +0000 (12:15 -0800)]
Revert "Revert "tegra: host: move stale wait checking into the kernel""
This reverts commit
b3cc1d84d0b962fe80fc297d2e2417c3157508b6.
Colin Cross [Fri, 4 Mar 2011 02:55:38 +0000 (18:55 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
James Wylder [Tue, 1 Mar 2011 15:25:06 +0000 (09:25 -0600)]
ARM: tegra: add generic memory vendor matching
Update tegra_init_emc to provide generic memory
vendor matching. Read values from EMC_MRR_0, to
uniquely identify memory types and compare them
to table of memory passed in.
Change-Id: Ie116fa6f497076149c87ff6c0ae0621309bac65f
Signed-off-by: James Wylder <james.wylder@motorola.com>
Colin Cross [Wed, 2 Mar 2011 20:34:38 +0000 (12:34 -0800)]
ARM: tegra: Use readl/writel_relaxed for reset
tegra_assert_system_reset is called after the cache is disabled.
Calling writel will cause the PL310 store buffers to be drained,
which requires taking a spinlock. Taking a spinlock is not safe
after the caches are disabled. Convert to readl_relaxed and
writel_relaxed.
Change-Id: I6850179b931ca865580c0fd3fe003b46bdfa43ae
Signed-off-by: Colin Cross <ccross@android.com>
Rebecca Schultz Zavin [Thu, 3 Mar 2011 22:29:26 +0000 (14:29 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Rebecca Schultz Zavin [Thu, 3 Mar 2011 22:28:07 +0000 (14:28 -0800)]
Revert "tegra: host: move stale wait checking into the kernel"
This reverts commit
2d49bf33f3885aab293f12d54447f66e911e3226.
Rebecca Schultz Zavin [Thu, 3 Mar 2011 01:31:34 +0000 (17:31 -0800)]
Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36
Prajakta Gudadhe [Sat, 5 Feb 2011 09:37:38 +0000 (01:37 -0800)]
tegra: host: move stale wait checking into the kernel
The kernel now receives wait tracking data (similar to gathers and
relocs) and compares the current syncpt with the threshold value.
If it's old, it gets a kernel mapping and rewrites the method data
to use a kernel reserved syncpt that is always 0 (so trivially pops
when seen by the HW).
Patch has dependency to the user-space patches
Submitted on behalf of: Chris Johnson <cjohnson@nvidia.com>
original work by: Chris Johnson <cjohnson@nvidia.com>
Change-Id: I4d4e5d3b49cab860485c4172f87247f5b4f5ea6e
Colin Cross [Wed, 2 Mar 2011 01:26:56 +0000 (17:26 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Benoit Goby [Tue, 1 Mar 2011 01:45:34 +0000 (17:45 -0800)]
usb: host: Renamed USB_TEGRA_HCD -> USB_EHCI_TEGRA
Change-Id: I2eec79186d6dc258caa2f3c8f3cd071222d1c5c7
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Fri, 11 Feb 2011 02:47:46 +0000 (18:47 -0800)]
ARM: tegra: select USB_ARCH_HAS_EHCI
usb_phy now depends on USB_ULPI_VIEWPORT
Change-Id: I5f3c996b41b50e74aa2b53eb246e100926108bff
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Fri, 11 Feb 2011 02:47:20 +0000 (18:47 -0800)]
usb: do not force select has_ehci for tegra
Change-Id: If6219a3ba9671a2c4c10b35461e1cc2ffe50ab0a
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Fri, 11 Feb 2011 23:55:38 +0000 (15:55 -0800)]
ARM: tegra: use generic ulpi operations
Change-Id: I5b56a8a1b10532683accfe885387afb309b26b19
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Fri, 11 Feb 2011 23:20:43 +0000 (15:20 -0800)]
usb: otg: Add ulpi viewport access ops
Add generic access ops for controllers with a ulpi viewport register
(e.g. Chipidea based controller).
Change-Id: I53d50857d4716f8df708af199ad1def1ff9d4beb
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Tue, 8 Feb 2011 02:40:47 +0000 (18:40 -0800)]
usb: host: tegra: Cleanup before sending upstream
Change-Id: I846d43b1ecbe6c726f024b6a0fb318d6300a3746
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Fri, 11 Feb 2011 01:41:00 +0000 (17:41 -0800)]
ARM: tegra: usb_phy: Fix return values
Changed frequency table into a struct
Change-Id: I202f808b912ce61e1f804103ea6d1197a57c1e62
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Tue, 8 Feb 2011 03:23:25 +0000 (19:23 -0800)]
ARM: tegra: usb_phy: Cleanup before sending upstream
Change-Id: I2548ca931f8ae37757115b7753d520d576bb173d
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Wed, 2 Mar 2011 01:03:51 +0000 (17:03 -0800)]
usb: otg: tegra: Moved tegra_usb.h to include/linux/platform_data
Change-Id: I201b6476979f6e1ef8ffadb4398b99a1728f3083
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Wed, 2 Mar 2011 00:58:44 +0000 (16:58 -0800)]
usb: host: Moved tegra_usb.h to include/linux/platform_data
Change-Id: Ic093d07858eb6e27aae9cd04d4c59407b5b1d76d
Signed-off-by: Benoit Goby <benoit@android.com>
Benoit Goby [Tue, 1 Mar 2011 01:40:54 +0000 (17:40 -0800)]
Revert "usb: host: ehci-hcd: add controller_resets_phy quirk"
This reverts commit
2c7d591aa11086ba841f8712b7cee33e245b62f6.
Change-Id: Ic9994dafc424e16d5d8251c287f8be65832b611b
Andrei Warkentin [Tue, 15 Feb 2011 22:18:59 +0000 (16:18 -0600)]
serial: tegra_hsuart: Clean-up FIFO flush and set baudrate operations.
Do necessary waits and fifo clear according to NV. Also use 115200
as the rate set while bringing-up rx dma during init, to decrease
start-up time.
Change-Id: I5211c75607cf2880ab2b1c22ab30f2c265534a1c
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Erik Gilling [Mon, 28 Feb 2011 23:28:49 +0000 (15:28 -0800)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: Ie01fff1ceddfbada480ef2928ac4791853787a49
Erik Gilling [Mon, 28 Feb 2011 21:25:44 +0000 (13:25 -0800)]
video: tegra: hdmi: enable wakeup on hotplug
Change-Id: Idbb3f81c3c2d8a4f7f6b76736e11dd07cdd3a413
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Mon, 28 Feb 2011 21:24:30 +0000 (13:24 -0800)]
video: tegra: hdcp: move call to hdcp suspend out of atomic context
Change-Id: I62a9d810637df221862898536f990eda77e50644
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Mon, 28 Feb 2011 21:13:09 +0000 (13:13 -0800)]
video: tegra: hdmi: fix vic detection for avi infoframe
typeo was causing 1080p VICs to never be populated
Change-Id: Idde037cf0d4b71370cff7e65a2135b8c60a91fa0
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Sat, 19 Feb 2011 00:24:37 +0000 (16:24 -0800)]
video: tegra: de-assert reset after clocks are turned on
In underflow recovery, if the clocks are not enabled when the dc is brought
out of reset writes to the DC will sometimes hang.
Change-Id: If37de79f755196550018f94080ab2beed84ca326
Signed-off-by: Erik Gilling <konkers@android.com>
Colin Cross [Sun, 27 Feb 2011 01:19:19 +0000 (17:19 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Sun, 27 Feb 2011 00:45:47 +0000 (16:45 -0800)]
ARM: tegra: fuse: Fix bug in get_spare_fuse
get_spare_fuse was calling tegra_apb_readl and passing an
offset, but tegra_apb_readl requires a physical address.
Fix it by calling tegra_fuse_readl instead, which takes
an offset.
Fixes a crash booting on A03 parts, where get_spare_fuse
is used to determine the difference between A03 and A03
prime.
Change-Id: Ie386dc099e1c14eeb36262bfcc882e29a40a8da6
Signed-off-by: Colin Cross <ccross@android.com>
Mike Lockwood [Sat, 19 Feb 2011 20:33:17 +0000 (15:33 -0500)]
USB: gadget: f_mtp: dequeue request on error in mtp_read
In mtp_read(), if wait_event_interruptible() returns an error, we need to
remove the request from the EP queue. Else, on the next call to mtp_read(), we
will attempt to enqueue the request again, potentially corrupting the
queue. This is what happens with musb_gadget_queue(), which does not check for
duplicate requests.
Based on a similar change to f_adb.c
Signed-off-by: Mike Lockwood <lockwood@android.com>
Erik Gilling [Fri, 25 Feb 2011 01:17:15 +0000 (17:17 -0800)]
Merge remote branch android-2.6.36 into android-tegra-2.6.36
Change-Id: I1d7f83e8eb433df8076a9d636ff03e174a3ff581
Erik Gilling [Fri, 25 Feb 2011 01:13:10 +0000 (17:13 -0800)]
Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Conflicts:
drivers/video/tegra/dc/hdmi.c
Change-Id: I10fd2dbcc07d7961dd75e10a2c4de926457c2912
Jon Mayo [Tue, 21 Dec 2010 23:09:33 +0000 (15:09 -0800)]
[ARM] tegra: use APB DMA for accessing APB devices
Change-Id: I165411a14342666cbac02fb8cb171580ab0826aa
Reviewed-on: http://git-master/r/14464
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Jon Mayo [Wed, 5 Jan 2011 19:15:21 +0000 (11:15 -0800)]
[ARM] tegra: add kfuse peripherial clk entry
Change-Id: I89fc144428b140288126790065902ea9e49b41e4
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Jon Mayo [Wed, 5 Jan 2011 19:17:30 +0000 (11:17 -0800)]
[ARM] tegra: enable kfuse clock on boot
Change-Id: I7e8d9b5fa275af738fe22be2082a709a3902bdee
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Jon Mayo [Wed, 5 Jan 2011 19:18:46 +0000 (11:18 -0800)]
[ARM] tegra: kfuse driver
factory programmed encrypted key fuses held in kfuse module.
use APB DMA for accessing kfuse registers, reading directly can hang if any
other DMA is active.
Change-Id: I85e44cc169607bc22116075e28938014aa299d75
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Jon Mayo [Fri, 7 Jan 2011 03:05:38 +0000 (19:05 -0800)]
[ARM] tegra: edid modes uninitialized on i2c fail
fix unhandled i2c errors in tegra_edid_get_monspecs() that resulted in
truncated mode lists(stale data).
Change-Id: Iec7878f2a3071c5297d0569d4f1cce1c9ed48979
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Peter Zu <pzu@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Signed-off-by: Jon Mayo <jmayo@nvidia.com>
Jon Mayo [Tue, 4 Jan 2011 01:26:25 +0000 (17:26 -0800)]
[ARM] tegra: hdmi nvhdcp driver
Device /dev/nvhdcpX is used to manage NVHDCP on framebuffer /dev/fbX.
These devices are created on hdmi driver initialition when it is
attached to dc. Currently only one nvhdcp device may be created. An ioctl
interface is in video/nvhdcp.h
Check for repeaters and store repeater info. userspace application
queries this status to authenticate the connection. When authentication
fails, auto-renegotiate every 1.75 seconds. Give up after 5 failed attempts,
reset after hotplug or policy change.
use TEGRA_DC_OUT_NVHDCP_POLICY_ON_DEMAND in tegra_dc_out.flags in board
panel configuration to select a different default policy at probe. Currently
only TEGRA_DC_OUT_NVHDCP_POLICY_ALWAYS_ON is supported.
Change-Id: I0db66fc86096b98d2604544061721d291523de75
Reviewed-by: Jon Mayo <jmayo@nvidia.com>
Tested-by: Jon Mayo <jmayo@nvidia.com>
Reviewed-by: Phillip Smith <psmith@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Signed-off-by: Erik Gilling <konkers@android.com>
Todd Poynor [Fri, 25 Feb 2011 00:24:37 +0000 (16:24 -0800)]
ARM: tegra: PL310 restore dynamic clock gating on resume
Tegra 2.6.36 code needs to restore PL310 dynamic clock gating upon
resume from a power event.
As of 2.6.39 the PL310 is re-init'ed from scratch upon resume,
and this patch can be dropped.
Change-Id: I8c1fb1add3c3cfcffff58fab642b84d8d5a7a90a
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Rebecca Schultz Zavin [Thu, 24 Feb 2011 19:47:42 +0000 (11:47 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Todd Poynor [Tue, 15 Feb 2011 19:48:42 +0000 (11:48 -0800)]
ARM: Cortex-A9: Enable dynamic clock gating
Enable dynamic high level clock gating for Cortex-A9 CPUs, as
described in 2.3.3 "Dynamic high level clock gating" of the
Cortex-A9 TRM. This may cut the clock of the integer core,
system control block, and Data Engine in certain conditions.
Add ARM errata 720791 to avoid corrupting the Jazelle
instruction stream on earlier Cortex-A9 revisions.
Change-Id: I48e51d907e593f26982ea91b0a811553f68e3c86
Signed-off-by: Todd Poynor <toddpoynor@google.com>
projects / firefly-linux-kernel-4.4.55.git / log