summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-02-20video: tegra: Change overlay spinlock to mutexDan Willemsen
We call tegra_overlay_put inside the overlay lock, which can do a flip. It's not safe to do a flip in an atomic context. Change-Id: I4b043737a3eede0d47b8269a2d40e7c739f75df3 Reviewed-on: http://git-master/r/20087 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-02-20tegra: harmony: oldconfig + NVMAP_SEARCH_GLOBAL_HANDLESPierre-Loup A. Griffais
Change-Id: I6c192b8276806be7bf4918b3a120cf8137be247e Reviewed-on: http://git-master/r/18635 Tested-by: Pierre-Loup Griffais <pgriffais@nvidia.com> Reviewed-by: Robert Morell <rmorell@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
2011-02-18video: tegra: nvmap: fix potential deadlockKirill Artamonov
Enabled mutex debugging reavealed potential deadlocks introduced with compaction. Handle spin lock replaced with mutex. Heap functions cannot be protected with spinlock because they call kernel slab allocation functions which cannot be called from atomic context. nvmap_client ref_lock is also replaced with mutex. Otherwise we cannot access heap parameters protected by mutex nvmap_handle lock. Extra locking for handle->owner removed. bug 793364 Change-Id: I635ce9ebf259dd7bf8802457567f93b7be5795ea Reviewed-on: http://git-master/r/19850 Reviewed-by: Kirill Artamonov <kartamonov@nvidia.com> Tested-by: Kirill Artamonov <kartamonov@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
2011-02-18alsa: Set restrictions on period sizetegra-11.2.0Sumit Bhattacharya
Restrict period size to be multiple of 8 and period count to be integer. This is required to prevent audio breaks for playback through BT SCO. Bug 771510 Change-Id: If15631512bc5ce5a4358342b523da0a5a020cc2d Reviewed-on: http://git-master/r/19731 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-18arm: tegra: config: enable uid_stat proc interfaceNitin Kumbhar
BUG 769814 Change-Id: I18159aea2de80acdfe7e8c04f9702f1c8a4830a8 Reviewed-on: http://git-master/r/19872 Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-18tegra bluesleep: creating a bluesleep platform device.Anantha Idapalapati
Based on CONFIG_BT_BLUESLEEP configuration variable, a bluesleep device will be created and used to actively manage the BT device power. Bug 791669, 773186 (cherry picked from commit 011a705248274804c80c12af5366693e6662829b) Reviewed-on: http://git-master/r/6851 Change-Id: If5275ecfc920a038ec96928ea7f7f739f5051e33 (cherry picked from commit ae1bf987d38b15d6688cd2152ee4b4624211c113) Reviewed-on: http://git-master/r/19868 Reviewed-by: Anantha Idapalapati <aidapalapati@nvidia.com> Tested-by: Anantha Idapalapati <aidapalapati@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-18usb: Adding USB CDC NCM class driver.Steve Lin
This driver supports devices conforming to the Communication Device Class (CDC) Network Control Model. The CDC specifications are available from <http://www.usb.org/>. This driver is implemented as a minidriver for usbnet driver framework. Bug 776360 Change-Id: If5e900f80edebc742536a59716aad546b714ba4c Reviewed-on: http://git-master/r/14921 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-18arm: tegra: ventana: correcting USB1,USB3 vbus linesRakesh Bodla
Correcting the pinmux table for USB1 and USB3 vbus lines on ventana. Bug 770041 Change-Id: I12266cafd4720959302ccb0fb29e29115e0de114 Reviewed-on: http://git-master/r/20022 Reviewed-by: Rakesh Bodla <rbodla@nvidia.com> Tested-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-17video: tegra: Fix handling non-zero Y offsetTaekhyun Kim
Change-Id: I6ce3f66075856397b394f433a4ee29ff3357b548 Reviewed-on: http://git-master/r/16977 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-17merge: tegra: DVFS: fix 1.2V core volt for USBDan Willemsen
Original commit: 69f118a448d4b8f1309d9acb3b78448444962a94 ARM: tegra: DVFS: set 1.2V core voltage for USB to work was lost during a merge, because the table format changed on our side. Relevant merge that missed this: 8197cb15eaf0640d13c816926f65972ca6cbba84 Change-Id: I1701281f04a658697e4e8f011b18a5c9169cc879 Reviewed-on: http://git-master/r/19668 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com> Tested-by: Nitin Kumbhar <nkumbhar@nvidia.com> Reviewed-by: Cho-Che Cheng <jacheng@nvidia.com> Reviewed-by: Prajakta Gudadhe <pgudadhe@nvidia.com>
2011-02-17media: video: tegra: update ov5650 mode settingsNathan Lord
Switch to 2080x1164 for 1080p resolution. Add a reset to the I2C sequences. Bug 786227 Change-Id: I0514275c87504673a4297679bfa77d0a786f1532 Reviewed-on: http://git-master/r/19649 Reviewed-by: Nathan Lord <nlord@nvidia.com> Tested-by: Nathan Lord <nlord@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-16merge: video: tegra: fix HDMI merge issueDan Willemsen
tegra_hdmi_writel should be _tegra_hdmi_writel in this function Change-Id: I7bbd85b634cd6dbd67637db57b66559cb092c8ba Reviewed-on: http://git-master/r/19664 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-16video: tegra: add modeset switch to trigger ueventsDan Willemsen
Change-Id: I3b060b622a593d48319a442072a21d0c4f9527ae Reviewed-on: http://git-master/r/19049 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-16ARM: tegra: cpufreq: finer values for emc scalingAmit Kamath
Added support for emc frequencies 75,100,25 Mhz scaling Change-Id: Id5f170a380c3acbc7a375ab5e5018628549b992f Reviewed-on: http://git-master/r/18340 Reviewed-by: Amit Kamath <akamath@nvidia.com> Tested-by: Amit Kamath <akamath@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-16[ARM] tegra: ventana: add 25Mhz to emc tableAmit Kamath
add emc register values for 25Mhz frequency Change-Id: I2fc34166ab34429d48422c5927ba3cfdf7b5b3a8 Reviewed-on: http://git-master/r/16694 Reviewed-by: Amit Kamath <akamath@nvidia.com> Tested-by: Amit Kamath <akamath@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-16media: video: tegra: add ov5650 test pattern modeNathan Lord
Change-Id: Ie894d71f45cc08709daff3f258e0c4676b7778b0 Reviewed-on: http://git-master/r/19687 Reviewed-by: Nathan Lord <nlord@nvidia.com> Tested-by: Nathan Lord <nlord@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-16merge: USB: remove duplicated usb_hcd_map_urb_for_dmaDan Willemsen
The original commit went upstream, this is to fix a merge issue from a slightly different version coming back. Change-Id: I69a58a483e58a0ee1a13521a466709f5cad6505f Reviewed-on: http://git-master/r/19663 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Robert Morell <rmorell@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
2011-02-16ARM: ventana: defconfig: enable usb rndisVarun Wadekar
Bug 773058 Change-Id: I52a39c859f15d0b60ef0f39574fb2fc293f2cfcb Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/19060 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-16ARM: ventana: enable usb rndis supportVarun Wadekar
bug 773058 Change-Id: Id46df86adbb169e0bb1c2d4915649061deb95b07 Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/16376 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-16video: tegra: fix max yres in stereo hdmi caseChong Zhang
tegra_fb_set_windowattr() has logic to adjust window y according to yres, however when in stereo mode, the max y allowed should be v_active, which could be larger than yres. bug 784597 Change-Id: I63342be8e2d87396502574f3a8dd0fb2769a47a8 Reviewed-on: http://git-master/r/17537 Reviewed-by: Chong Zhang <chzhang@nvidia.com> Tested-by: Chong Zhang <chzhang@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-16[tegra: HDMI: stereo] fix VIC for 720p stereo modeChong Zhang
VIC for 720p stereo mode should be 4 (60Hz) or 19 (50Hz). bug 792143 Change-Id: I3edb468a992842ed6a3247fbab02970b0c078acb Reviewed-on: http://git-master/r/19468 Reviewed-by: Chong Zhang <chzhang@nvidia.com> Tested-by: Chong Zhang <chzhang@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-16video: tegra: nvmap: replace mutex with spinlockKirill Artamonov
There are places where nvmap_free_handle_id is called when interrupts are disabled and mutex cannot be used as nvmap handle lock. Change-Id: Icc220fe627c08f21c677d936a54f70c818dc8e8c Reviewed-on: http://git-master/r/19489 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-15media: video: tegra: enable ov2710 manual exposureNathan Lord
Change-Id: I2b572a4fdfd83f7f9dc9b3f5b9244072cb240764 Reviewed-on: http://git-master/r/19528 Reviewed-by: Nathan Lord <nlord@nvidia.com> Tested-by: Nathan Lord <nlord@nvidia.com> Reviewed-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com> Reviewed-by: Chien-Yu Chen <chichen@nvidia.com> Reviewed-by: Patrick Shehane <pshehane@nvidia.com> Reviewed-by: Chan Vu Truong <jtruong@nvidia.com> Tested-by: Chan Vu Truong <jtruong@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-15merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: drivers/net/wireless/bcm4329/Makefile Change-Id: I13ed89657bb43ac906c6424372050df5fd681374
2011-02-14Merge branch 'linux-tegra' into android-tegraErik Gilling
2011-02-14video: tegra: add some missing mutex locking to nvhost_cdmaPrajakta Gudadhe
Change-Id: Ie4606d9a5154090274168babc110ea2d79747c05 Signed-off-by: Erik Gilling <konkers@android.com>
2011-02-14Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36Rebecca Schultz Zavin
2011-02-14video: tegra: hdmi stereo mode set fixChong Zhang
Reverting previous hdmi hotplug fix (commit 633a7967cad4454327572f85fbdf5cd88eb68b78). It doesn't seem to fix hotplug problem on ventana, and it is causing tegra_dc_enable() to be called before we set up hdmi mode properly. It's no longer needed when we set ventna_hdmi_enb=1. The 5ms sleep time after tegra_dc_enable() is no longer needed, as the tegra_dc_enable() is removed from tegra_dc_hdmi_detect_worker(). bug 784597 Change-Id: Ibd2ef95f45bec23031e6f839490f06a2832c6931 Reviewed-on: http://git-master/r/17084 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-14[Ventana] hdmi hotplug - leave ventana_hdmi_enb to be 1 alwaysChong Zhang
It seems the "ventana_hdmi_enb" has to stay 1 for hotplug_gpio to work. Setting ventana_hdmi_enb to 0 in ventana_hdmi_disable() will render hotplug_gpio non-functional afterwards. Removing the gpio_set_value(ventana_hdmi_ena..) calls from both ventana_hdmi_enable() and ventana_hdmi_disable() seems to solve the problem. This leave ventana_hdmi_ena at its default value. bug 784597 Change-Id: I3c3d6282e8f17cce1287410dac7d28744cb9f8ba Reviewed-on: http://git-master/r/17083 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-14net: wireless: bcm4329: Update to version 4.218.248-23Greg Goldman
- 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>
2011-02-14Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Rebecca Schultz Zavin
2011-02-14video: tegra: nvmap: Fix broken optimizationkartamonov
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>
2011-02-14Revert "Revert "mmc: fix non-arm build due to eMMC 4.3+ change""Nitin Kumbhar
This reverts commit 5f2e1258ff35f700f5ca9df3047dc5fe19b99017.
2011-02-14Revert "Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ ↵Nitin Kumbhar
devices"" This reverts commit 6b53bad8ac54b3d748c4b0dbe6b0a4ed6e2e60f4.
2011-02-14merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: drivers/usb/host/ehci-tegra.c include/linux/usb.h include/linux/usb/hcd.h Change-Id: I2499459b717e36a2a994af9d7a5ae1ecb5e7ca9c
2011-02-12[ARM] tegra: Enable pl310 data prefetching and prefetch offsetChris Fries
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
2011-02-12Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
2011-02-12Merge branch 'android-2.6.36' into android-tegra-2.6.36Colin Cross
2011-02-12Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"Colin Cross
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>
2011-02-11net: wireless: bcm4329: Fix mem leak in wl_iw_handle_scanresults_iesMike Corrigan
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-11net: wireless: bcm4329: Fix memleak in dev->pAndrei Warkentin
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-11net: wireless: bcm4329: Add sdlock to firmware loadingDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-02-11nvmap: implementing K36 carveout compactorKirill Artamonov
bug 762482 Change-Id: Ifadebc1b0c4eb0df89e179091acca0ff6e527e56 Reviewed-on: http://git-master/r/15743 Reviewed-by: Kirill Artamonov <kartamonov@nvidia.com> Tested-by: Kirill Artamonov <kartamonov@nvidia.com> Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-11PM: Increase dpm suspend timeoutBenoit Goby
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>
2011-02-11fs: partitions: efi: Add force_gpt_sector parameterColin Cross
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>
2011-02-11Revert "mmc: subtract boot sectors from disk size for eMMC 4.3+ devices"Colin Cross
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
2011-02-11Revert "mmc: fix non-arm build due to eMMC 4.3+ change"Colin Cross
This reverts commit 1c119f2c1667ea2747693f7fd2166205e1a10b09.
2011-02-10tegra: Board specific file changes related to USB Phy interfacetegra-10.11.ER1Seshendra Gadagottu
Board files are updated with USB phy inteface info related to USB2 instance BUG: 756184 Change-Id: Ied946e47047b5ab69d4f0e1670ccb7269d50665f Reviewed-on: http://git-master/r/18627 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-02-10ARM: ventana: gpio: Enabled headphone/mic jackChao Jiang
Enabled headphone jack on Ventana board. Set up interrupt pin for mic jack. fixes bug 766757 Change-Id: I3e9cda1b9867bcb117be17719241dac270bf539c Reviewed-on: http://git-master/r/18708 Reviewed-by: Chao Jiang <chaoj@nvidia.com> Tested-by: Chao Jiang <chaoj@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-10[tegra ALSA] Added headphone jack detectionChao Jiang
Headphone jack detection is enabled with this patch. The jack will be reported via /sys/class/switch interface to user space. fixes bug 766757 Change-Id: I58908e7de1025b17cdf37079d5650aa5f503dcdd Reviewed-on: http://git-master/r/18707 Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Chao Jiang <chaoj@nvidia.com> Tested-by: Chao Jiang <chaoj@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>