Colin Cross [Wed, 2 Mar 2011 01:27:10 +0000 (17:27 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
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>
Mike Lockwood [Tue, 1 Mar 2011 19:39:27 +0000 (11:39 -0800)]
[ARM] tegra: stingray: Fix RNDIS support
The RNDIS driver must be the first interface on the list
Signed-off-by: Mike Lockwood <lockwood@android.com>
Greg Meiste [Mon, 28 Feb 2011 19:45:20 +0000 (13:45 -0600)]
[ARM] tegra: stingray: Add ehci3 for all devices
Even though the wifi-only model has nothing attached to ehci3, the
driver still needs to be probed. This is because the USB register
settings are lost in LP0. So currently after the device resumes from
LP0 the first time, the current drain is 12mA higher! When the
ehci3 driver is present, its resume code runs and restores the
registers to a known good state, which solves the power management
issue.
Change-Id: I6329704f7a1161eb139b62002a50085eb05d2fdc
Signed-off-by: Greg Meiste <w30289@motorola.com>
John Michelau [Tue, 11 Jan 2011 22:52:25 +0000 (16:52 -0600)]
Add dump_log cmd to mdm6600_ctrl
This command triggers a dump of the MDM6600 RAM log buffers
into non-volatile memory, so that they can be retrieved by
bugreport or the RIL when submitting error reports. It
provides a simple path for this which does not rely on the
typical (and more error-prone) IPC mechanism.
Change-Id: I17708704b94426b1541533978478192d3f4dab89
John Kramer [Fri, 4 Feb 2011 17:32:19 +0000 (11:32 -0600)]
media: video: tegra: Correct mclk settings for ov5650
Change-Id: I6d18b25fd88927c7ac4311fa73504badede54dd3
Signed-off-by: John Kramer <john.kramer@motorola.com>
Erik Gilling [Mon, 28 Feb 2011 23:29:58 +0000 (15:29 -0800)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: I7e6c38730fba12e9d60910da5df8470a9584f29b
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:39 +0000 (17:19 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
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>
John Michelau [Tue, 30 Nov 2010 22:27:09 +0000 (16:27 -0600)]
ARM: tegra: stingray: Add CONFIG_USB_ANDROID_ACM
Change-Id: I894ba0bc1bcca72277aa65e19e8e91e790c2238c
John Michelau [Tue, 30 Nov 2010 22:27:09 +0000 (16:27 -0600)]
ARM: tegra: stingray: BP tools mode gadget config
Create a new Android USB Gadget mode for allowing BP ports
to passthrough the AP and out the gadget device, for use
by host-side tools. This will be used for carrier testing, as
well as for general development and debugging. It is enabled
by selecting "BP Tools" mode from the bootloader menu.
Change-Id: I7acca9b1189b5684439736440123c40e35310fe4
Greg Meiste [Fri, 18 Feb 2011 22:04:27 +0000 (16:04 -0600)]
[ARM] tegra: stingray: Update pinmux config for wifi-only model
Change-Id: If20d390afc27eeef8c90b28984467e4808b3187a
Signed-off-by: Greg Meiste <w30289@motorola.com>
Erik Gilling [Fri, 25 Feb 2011 01:18:22 +0000 (17:18 -0800)]
Merge branch 'android-tegra' into android-tegra-moto
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>
Praveen Bharathi [Wed, 23 Feb 2011 11:08:33 +0000 (05:08 -0600)]
[ARM] tegra_i2s_audio: turn off main speaker and headset amps in dock mode
This should have always been there but was somehow missed. Turning off
the main speaker and headset amps in the dock mode eliminates the
unpleasant hiss that is heard from the main speakers.
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
Rebecca Schultz Zavin [Thu, 24 Feb 2011 19:49:50 +0000 (11:49 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
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
Mike Lockwood [Wed, 9 Feb 2011 14:41:48 +0000 (09:41 -0500)]
[ARM] tegra: stingray: Enable USB accessory gadget driver
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 9 Feb 2011 14:40:52 +0000 (09:40 -0500)]
[ARM] tegra: stingray: board file support for USB accessory gadget function
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 2 Feb 2011 16:52:56 +0000 (11:52 -0500)]
USB: gadget: f_accessory: New gadget driver for android USB accesories
Signed-off-by: Mike Lockwood <lockwood@android.com>
Sergey Kudakov [Fri, 4 Feb 2011 20:10:17 +0000 (14:10 -0600)]
ARM: tegra: stingray: undefine invalid GPIO assignments for emmc port
Change-Id: Ic3ce1ba2ff47f4035b2181583886510d2e5c078b
Signed-off-by: Sergey Kudakov <sergey.kudakov@motorola.com>
James Wylder [Sun, 13 Feb 2011 21:54:19 +0000 (15:54 -0600)]
usb: serial: Add Wrigley Datacard as flash device
Change-Id: I98b0ea2c4ede061a30d9761301dd136d8c8847fc
Signed-off-by: James Wylder <james.wylder@motorola.com>
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>
Mike Lockwood [Mon, 14 Feb 2011 18:32:05 +0000 (13:32 -0500)]
USB: gadget: android: Fix problem switching vendor IDs
We need to update the vendor ID in the composite driver as well
Signed-off-by: Mike Lockwood <lockwood@android.com>
James Wylder [Thu, 10 Feb 2011 17:18:42 +0000 (11:18 -0600)]
ARM: tegra: stingray: Enable wrigley (LTE) in defconfig
Change-Id: I990c4b27c7f190c5522309e32578085ff393a658
Signed-off-by: James Wylder <james.wylder@motorola.com>
James Wylder [Thu, 10 Feb 2011 17:17:59 +0000 (11:17 -0600)]
ARM: tegra: stingray: Add wrigley (LTE) to boardfile
Initialize the Wrigley control device if present.
Change-Id: I78ea018d0f1a71def2e2c56299386ea0cdaeb2c3
Signed-off-by: James Wylder <james.wylder@motorola.com>
James Wylder [Thu, 10 Feb 2011 17:16:05 +0000 (11:16 -0600)]
misc: radio_ctrl: Add Wrigley Driver to support LTE
Add driver to support control operations power-up,
power-down, incoming wakeup and reset for the Motorola
Wrigley Modem.
Change-Id: I6955759b7bbfd48a9756c07886aa8b3f34dd2762
Signed-off-by: James Wylder <james.wylder@motorola.com>
Rebecca Schultz Zavin [Sat, 19 Feb 2011 01:26:42 +0000 (17:26 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Sat, 19 Feb 2011 01:23:59 +0000 (17:23 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Greg Goldman [Sat, 19 Feb 2011 01:12:19 +0000 (17:12 -0800)]
net: wireless: bcm4329: Fix disable pno call
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
James Wylder [Thu, 10 Feb 2011 17:06:59 +0000 (11:06 -0600)]
ARM: tegra: stingray: Update include path for mdm6x00 header
Change-Id: I94ef86e617c384a6270bd605796109a503b7d847
Signed-off-by: James Wylder <james.wylder@motorola.com>
James Wylder [Thu, 10 Feb 2011 17:03:22 +0000 (11:03 -0600)]
misc: radio_ctrl: Create radio control interface
Migrate the mdm6x00 sysfs interface to its own
driver so that additional drivers can be added.
Change-Id: Ia647f298adaba75ac296b2b33e632ba55e4dd55a
Signed-off-by: James Wylder <james.wylder@motorola.com>
Benoit Goby [Thu, 10 Feb 2011 01:12:46 +0000 (17:12 -0800)]
ARM: tegra: stingray: Add support for wifi-only model
Change-Id: Ia165295d00577474e03f8c28d74f7346a9eeed44
Signed-off-by: Benoit Goby <benoit@android.com>
Greg Meiste [Wed, 16 Feb 2011 16:52:47 +0000 (10:52 -0600)]
[ARM] tegra: stingray: Add support for product_type
Stingray bootloader 1036 adds product_type to the kernel command
line to tell the kernel what hardware is present. For example, if
a CDMA modem and wifi were both present, the bootloader would pass
product_type=cw. If a LTE datacard was added, it would change to
product_type=clw.
Change-Id: I1f5663bb1a72e0b6cc7d0dcb65b6036140fbf777
Signed-off-by: Greg Meiste <w30289@motorola.com>
srinivas gowrishetty [Thu, 9 Dec 2010 23:56:57 +0000 (15:56 -0800)]
Qualcomm's QMI USB Net Driver
Merging original Qualcomm GPL driver for supporting QMI/RmNet USB interface.
Original patch can be found at http://patchwork.ozlabs.org/patch/66006/
Change-Id: I0016d89471ad504d41a1862c007da2e41b1c3ed8
Signed-off-by: Srinivas Gowrishetty <srinivas.gowrishetty@motorola.com>
Rebecca Schultz Zavin [Thu, 17 Feb 2011 21:29:20 +0000 (13:29 -0800)]
ARM: configs: Disable PERF_COUNTERS and PERF_EVENTS in stingray defconfig
This will put oprofile into timer mode. Performance counter based
profiling does not appear to be working correctly.
Change-Id: I960faccdc82f39f853ec05ba7ea0d315349d57df
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Todd Poynor [Wed, 16 Feb 2011 20:25:36 +0000 (12:25 -0800)]
ARM: tegra: Enable PL310 dynamic clock gating
The cache controller will stop its clock when idle after several
clock cycles.
Change-Id: Ifc9997d4e7fd4f1e3c6129bac2fd42f8995a069e
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Todd Poynor [Wed, 16 Feb 2011 04:41:45 +0000 (20:41 -0800)]
ARM: PL310: Add power control register definition
Change-Id: Ia1f759aab15a241e8e29447622cd1e2998fa745c
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Dmitry Shmidt [Tue, 15 Feb 2011 23:58:46 +0000 (15:58 -0800)]
ARM: tegra: stingray: Add source-based routing options to defconfig
CONFIG_IP_ADVANCED_ROUTER and CONFIG_IP_MULTIPLE_TABLES
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Tue, 15 Feb 2011 01:43:11 +0000 (17:43 -0800)]
ARM: tegra: stingray: Add platform-dependent wifi country code translation
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Rebecca Schultz Zavin [Wed, 16 Feb 2011 17:59:39 +0000 (09:59 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Wed, 16 Feb 2011 17:56:33 +0000 (09:56 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Dmitry Shmidt [Tue, 15 Feb 2011 01:48:56 +0000 (17:48 -0800)]
net: wireless: bcm4329: Get country translation from platform data
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Erik Gilling [Tue, 15 Feb 2011 02:07:58 +0000 (18:07 -0800)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: Icb97546afa6da84601ce59c1ad00998196b43df6
Erik Gilling [Tue, 15 Feb 2011 02:07:02 +0000 (18:07 -0800)]
Merge branch 'linux-tegra' into android-tegra
Prajakta Gudadhe [Tue, 1 Feb 2011 22:56:00 +0000 (14:56 -0800)]
video: tegra: add some missing mutex locking to nvhost_cdma
Change-Id: Ie4606d9a5154090274168babc110ea2d79747c05
Signed-off-by: Erik Gilling <konkers@android.com>
Erik Gilling [Tue, 15 Feb 2011 01:18:37 +0000 (17:18 -0800)]
HACK: dump clock tree on nvhost suspend hang
Change-Id: Iaf3075535fa6a100389a0b02508a0b7bc45e8ff9
Signed-off-by: Erik Gilling <konkers@android.com>
Dmitry Shmidt [Tue, 15 Feb 2011 00:58:48 +0000 (16:58 -0800)]
net: wireless: Add get_country_code functionality to platform
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Rebecca Schultz Zavin [Tue, 15 Feb 2011 00:12:25 +0000 (16:12 -0800)]
Merge remote branch 'tegra/android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Tue, 15 Feb 2011 00:11:42 +0000 (16:11 -0800)]
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
Greg Goldman [Mon, 14 Feb 2011 23:54:42 +0000 (15:54 -0800)]
net: wireless: bcm4329: Update to version 4.218.248-23
- Add support to PNO with adaptive scan time
- Remove logic to generate Link Down based on Roaming Event
- Improve sco/esco detection method for BT COEX
- Add new function TXPOWER to reduce power if needed
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Rebecca Schultz Zavin [Mon, 14 Feb 2011 23:32:54 +0000 (15:32 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Rebecca Schultz Zavin [Mon, 14 Feb 2011 23:32:12 +0000 (15:32 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
kartamonov [Mon, 14 Feb 2011 12:22:46 +0000 (14:22 +0200)]
video: tegra: nvmap: Fix broken optimization
An attempt had been made to reduce the number of pte operations
while patching relocs. The optimization was incorrectly coded
and was not providing the expected speedup.
Credit for the find goes to Peter Pipkorn.
Change-Id: Ic83b20ee470e54d5053f747dbcbdf7b038b7c7c4
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Chris Fries [Fri, 11 Feb 2011 20:26:20 +0000 (14:26 -0600)]
[ARM] tegra: Enable pl310 data prefetching and prefetch offset
Enable data prefetching in the L2 cache controller, and set
the prefetch offset to 7.
Memcpy performance measured copying 16 MB buffers 78 times:
Data prefetch disabled, prefetch offset 0: 440 MB/s
Enabling data prefetching, prefetch offset 0: 430 MB/s
Enabling data prefetching, prefetch offset 7: 502 MB/s
Overall, this patch gives a 14% improvement in memcpy performance.
Prefetch offset of 8 causes prefetches to cross 4k boundaries
and cannot be used.
Original-author: Gary King <gking@nvidia.com>
Signed-off-by: Chris Fries <C.Fries@motorola.com>
Signed-off-by: Colin Cross <ccross@android.com>
Change-Id: I7ce0810b3f94edc2640df3f643cf81357052f2f1
Colin Cross [Sat, 12 Feb 2011 22:23:33 +0000 (14:23 -0800)]
Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
Colin Cross [Sat, 12 Feb 2011 22:13:29 +0000 (14:13 -0800)]
Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36
Colin Cross [Sat, 12 Feb 2011 22:13:19 +0000 (14:13 -0800)]
Merge branch 'android-2.6.36' into android-tegra-2.6.36
Colin Cross [Sat, 12 Feb 2011 21:21:32 +0000 (13:21 -0800)]
Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
This reverts commit
f0b0e4bec1e89014f3dcef4da8bcf95428cc771c.
The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.
This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.
Change-Id: Ib006acf9e517b3b8f7570220c28e19c91e7b5f25
Signed-off-by: Colin Cross <ccross@android.com>
Mike Corrigan [Sat, 12 Feb 2011 01:05:54 +0000 (17:05 -0800)]
net: wireless: bcm4329: Fix mem leak in wl_iw_handle_scanresults_ies
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Andrei Warkentin [Sat, 12 Feb 2011 01:01:28 +0000 (17:01 -0800)]
net: wireless: bcm4329: Fix memleak in dev->p
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Sat, 12 Feb 2011 00:54:39 +0000 (16:54 -0800)]
net: wireless: bcm4329: Add sdlock to firmware loading
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Benoit Goby [Mon, 7 Feb 2011 21:55:26 +0000 (13:55 -0800)]
PM: Increase dpm suspend timeout
usbhid devices have a 10s timeout waiting for the out queue to clear.
Increased the watchdog to 12s.
Change-Id: I96368fca6dff98e4eba8aedb09c23be964c8f4b4
Signed-off-by: Benoit Goby <benoit@android.com>
Colin Cross [Fri, 28 Jan 2011 21:45:06 +0000 (13:45 -0800)]
fs: partitions: efi: Add force_gpt_sector parameter
force_gpt_sector=<sector> causes the GPT partition search to
look at the specified sector for a valid GPT header if the
GPT is not found at the beginning or the end of the block
device.
Change-Id: I9b5f85ce24719c0538d42ec5a94344c7f6556b2b
Signed-off-by: Colin Cross <ccross@android.com>
Colin Cross [Fri, 28 Jan 2011 00:12:58 +0000 (16:12 -0800)]
Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"
This reverts commit
2cdc235bbeb09b2b78cd02a94ab79c265861aea9.
The reverted commit incorrectly calculates the size of eMMC
devices in some (all?) cases.
This revert may cause problems in cases where the bootloader was
bug-compatible and puts a GPT partition at the incorrect end of
the eMMC device.
Change-Id: Icc9ddb3d294aa2a1caeddfe8fedd2e12aa7691e1
Colin Cross [Fri, 28 Jan 2011 00:12:55 +0000 (16:12 -0800)]
Revert "mmc: fix non-arm build due to eMMC 4.3+ change"
This reverts commit
1c119f2c1667ea2747693f7fd2166205e1a10b09.
Mike Lockwood [Thu, 10 Feb 2011 16:54:53 +0000 (11:54 -0500)]
USB: gadget: f_mtp: Don't block in mtp_send_event
We used to wait for the previous interrupt packet to complete before sending
the next packet. But unfortunately the previous packet will not complete
until USB is disconnected if the host is not listening on the interrupt
endpoint (which is the case with libmtp on Linux and Mac).
To avoid hanging indefinitely in this case, we now simply return -EBUSY
if the previous interrupt packet has not completed yet.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Mike Lockwood [Wed, 9 Feb 2011 14:38:26 +0000 (09:38 -0500)]
USB: gadget: android: Support switching vendor ID when configuration changes
Based on the list of enabled USB functions, we can now switch the vendor ID
as well as the product ID.
Signed-off-by: Mike Lockwood <lockwood@android.com>
prabhu annabathula [Thu, 27 Jan 2011 02:56:13 +0000 (20:56 -0600)]
misc: gps_brcm4750: Adding wake up timer support for Brcm gps v17 library
broadcom gps library will schedule the wake up timer in two cases
- when a fix interval longer than 5 seconds is requested
- when integrating long for very weak gps signals
In these two cases brcm library will release the wakelock and schedule
timer to wake up if the system goes in to deep sleep.
Signed-off-by: prabhu annabathula <prabhu.annabathula@motorola.com>
Signed-off-by: Mike Lockwood <lockwood@android.com>
Todd Poynor [Mon, 7 Feb 2011 21:42:34 +0000 (13:42 -0800)]
ARM: tegra: Handle timers during LP2 idle ticks
Timer ticks aren't properly serviced while a CPU is in LP2 idle.
Although the Tegra LP2 idle code calls hrtimer_peek_ahead_timers,
because no IRQ regs have been saved, update_process_times is not
called, and thus the timer list is not serviced (and neither is
SMP rebalancing, etc.) This can cause significant delays
scheduling timer-based activity, especially on CPU 1 (which is
not servicing most other IRQs).
Colin Cross suggested a patch based on upstream review feedback
that uses clock notifiers to switch to the "broadcast" clock event
source ("timer0" Tegra timer 3) during LP2, which has a real
interrupt handler defined that calls the clock event handler in
IRQ context, allowing timers to be checked.
Change-Id: Ifa3f4ec662f07dc9636e433f278358f75b65d10c
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Robert Morell [Thu, 27 Jan 2011 03:06:49 +0000 (19:06 -0800)]
USB: ehci: tegra: Align DMA transfers to 32 bytes
The Tegra2 USB controller doesn't properly deal with misaligned DMA
buffers, causing corruption. This is especially prevalent with USB
network adapters, where skbuff alignment is often in the middle of a
4-byte dword.
To avoid this, allocate a temporary buffer for the DMA if the provided
buffer isn't sufficiently aligned.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Robert Morell [Thu, 27 Jan 2011 03:06:48 +0000 (19:06 -0800)]
USB: HCD: Add driver hooks for (un)?map_urb_for_dma
Provide optional hooks for the host controller driver to override the
default DMA mapping and unmapping routines. In general, these shouldn't
be necessary unless the host controller has special DMA requirements,
such as alignment contraints. If these are not specified, the
general usb_hcd_(un)?map_urb_for_dma functions will be used instead.
Also, pass the status to unmap_urb_for_dma so it can know whether the
DMA buffer has been overwritten.
Finally, add a flag to be used by these implementations if they
allocated a temporary buffer so it can be freed properly when unmapping.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Robert Morell [Thu, 27 Jan 2011 03:06:47 +0000 (19:06 -0800)]
USB: HCD: Add usb_hcd prefix to exported functions
The convention is to prefix symbols exported from the USB HCD core with
"usb_hcd". This change makes unmap_urb_setup_for_dma() and
unmap_urb_for_dma() consistent with that.
Signed-off-by: Robert Morell <rmorell@nvidia.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Erik Gilling [Mon, 7 Feb 2011 23:20:30 +0000 (15:20 -0800)]
Merge branch android-tegra-2.6.36 into android-tegra-moto-2.6.36
Change-Id: I7647524dbf346987bcd1dcc1c19479d74470b308
projects / firefly-linux-kernel-4.4.55.git / log