Commit Graph

213187 Commits

Author SHA1 Message Date
Colin Cross
17a2400a98 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-31 17:42:16 -07:00
Erik Gilling
0aa722f2fb video: tegra: reset hdcp failure count on hotplug
Change-Id: Iba5041f8428b13791004c96e6e8c2ed4dbcc37b8
Signed-off-by: Erik Gilling <konkers@android.com>
2011-03-31 17:07:46 -07:00
Venkata (Muni) Anda
db8872556e 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>
2011-03-29 17:50:19 -07:00
Colin Cross
9b571241de Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-22 11:42:14 -07:00
Andrei Warkentin
d3c9f78e7e 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>
2011-03-22 11:40:08 -07:00
Chris Johnson
2b3d418209 video: tegra: add HOST1_SYNC regs to nvhost_debug_show dump
Change-Id: I48cccf5b0df768b9cfc774803f3945f4806a62ac
2011-03-22 11:30:02 -07:00
Colin Cross
e75e6b2a2f 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>
2011-03-22 11:25:26 -07:00
Colin Cross
b7f9c567e6 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>
2011-03-22 11:25:25 -07:00
Rebecca Schultz Zavin
6c18f5c4b2 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-21 14:14:12 -07:00
Rebecca Schultz Zavin
34279b4fb5 Revert "[ARM] tegra: Enable pl310 data prefetching and prefetch offset"
This reverts commit 6c77fdda35.

Conflicts:

	arch/arm/mach-tegra/common.c

Change-Id: I35858f63da5cfd00885dd765da45db39be16b8b7
2011-03-21 14:09:44 -07:00
Rebecca Schultz Zavin
ef8a968107 Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-21 13:52:56 -07:00
Chris Johnson
8456f1bcf8 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>
2011-03-21 12:12:54 -07:00
Rebecca Schultz Zavin
c93a3daa85 Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36 2011-03-15 16:51:19 -07:00
Dmitry Shmidt
5c58e03b81 net: wireless: bcm4329: Allocate skb with GFP_KERNEL flag if possible
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-10 10:18:39 -08:00
Dmitry Shmidt
25a87f387f 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>
2011-03-09 20:37:16 -08:00
Rebecca Schultz Zavin
fe7c356123 Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-08 12:22:31 -08:00
Rebecca Schultz Zavin
be7b9ce20d Revert "Revert "tegra: host: move stale wait checking into the kernel""
This reverts commit b3cc1d84d0.
2011-03-08 12:15:30 -08:00
Colin Cross
07a84a1ce6 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-03 18:55:38 -08:00
James Wylder
1bc517b59d 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>
2011-03-03 18:54:12 -08:00
Colin Cross
8e15ee8536 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>
2011-03-03 18:53:08 -08:00
Rebecca Schultz Zavin
492f2efde4 Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-03 14:29:26 -08:00
Rebecca Schultz Zavin
b3cc1d84d0 Revert "tegra: host: move stale wait checking into the kernel"
This reverts commit 2d49bf33f3.
2011-03-03 14:28:07 -08:00
Rebecca Schultz Zavin
85d34d3140 Merge remote branch 'tegra/linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-02 17:31:34 -08:00
Prajakta Gudadhe
2d49bf33f3 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
2011-03-02 17:16:55 -08:00
Colin Cross
4f72bb8edd Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2011-03-01 17:26:56 -08:00
Benoit Goby
58570bc0c4 usb: host: Renamed USB_TEGRA_HCD -> USB_EHCI_TEGRA
Change-Id: I2eec79186d6dc258caa2f3c8f3cd071222d1c5c7
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:34 -08:00
Benoit Goby
e859d82480 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>
2011-03-01 17:13:34 -08:00
Benoit Goby
bca6fceaeb usb: do not force select has_ehci for tegra
Change-Id: If6219a3ba9671a2c4c10b35461e1cc2ffe50ab0a
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:33 -08:00
Benoit Goby
614d2e5a27 ARM: tegra: use generic ulpi operations
Change-Id: I5b56a8a1b10532683accfe885387afb309b26b19
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:33 -08:00
Benoit Goby
406248bb21 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>
2011-03-01 17:13:32 -08:00
Benoit Goby
54463de0ff usb: host: tegra: Cleanup before sending upstream
Change-Id: I846d43b1ecbe6c726f024b6a0fb318d6300a3746
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:31 -08:00
Benoit Goby
27c50127f6 ARM: tegra: usb_phy: Fix return values
Changed frequency table into a struct

Change-Id: I202f808b912ce61e1f804103ea6d1197a57c1e62
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:31 -08:00
Benoit Goby
a0c8749ef1 ARM: tegra: usb_phy: Cleanup before sending upstream
Change-Id: I2548ca931f8ae37757115b7753d520d576bb173d
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:30 -08:00
Benoit Goby
79c37f0193 usb: otg: tegra: Moved tegra_usb.h to include/linux/platform_data
Change-Id: I201b6476979f6e1ef8ffadb4398b99a1728f3083
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:30 -08:00
Benoit Goby
adbe9c4871 usb: host: Moved tegra_usb.h to include/linux/platform_data
Change-Id: Ic093d07858eb6e27aae9cd04d4c59407b5b1d76d
Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01 17:13:29 -08:00
Benoit Goby
730a86cc35 Revert "usb: host: ehci-hcd: add controller_resets_phy quirk"
This reverts commit 2c7d591aa1.

Change-Id: Ic9994dafc424e16d5d8251c287f8be65832b611b
2011-03-01 17:11:56 -08:00
Andrei Warkentin
aaf98d1380 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>
2011-03-01 16:41:59 -08:00
Erik Gilling
557c621d8a Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Change-Id: Ie01fff1ceddfbada480ef2928ac4791853787a49
2011-02-28 15:29:00 -08:00
Erik Gilling
b8fcb1733b video: tegra: hdmi: enable wakeup on hotplug
Change-Id: Idbb3f81c3c2d8a4f7f6b76736e11dd07cdd3a413
Signed-off-by: Erik Gilling <konkers@android.com>
2011-02-28 14:37:01 -08:00
Erik Gilling
e4f0680d21 video: tegra: hdcp: move call to hdcp suspend out of atomic context
Change-Id: I62a9d810637df221862898536f990eda77e50644
Signed-off-by: Erik Gilling <konkers@android.com>
2011-02-28 14:37:00 -08:00
Erik Gilling
1cf032e70d 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>
2011-02-28 14:37:00 -08:00
Erik Gilling
1c7ef350b6 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>
2011-02-28 14:36:59 -08:00
Colin Cross
0fcb985c6a Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 2011-02-26 17:19:19 -08:00
Colin Cross
86714b70a1 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>
2011-02-26 16:47:37 -08:00
Mike Lockwood
29b2c49152 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>
2011-02-25 20:25:14 -08:00
Erik Gilling
01863b94e7 Merge remote branch android-2.6.36 into android-tegra-2.6.36
Change-Id: I1d7f83e8eb433df8076a9d636ff03e174a3ff581
2011-02-24 17:17:21 -08:00
Erik Gilling
56edb8f957 Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36
Conflicts:
	drivers/video/tegra/dc/hdmi.c

Change-Id: I10fd2dbcc07d7961dd75e10a2c4de926457c2912
2011-02-24 17:13:10 -08:00
Jon Mayo
1249163215 [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>
2011-02-24 16:59:41 -08:00
Jon Mayo
241fcb6f2d [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>
2011-02-24 16:59:41 -08:00
Jon Mayo
36c62f5f06 [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>
2011-02-24 16:59:41 -08:00