summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2011-04-14media: video: tegra: ov5650: add stereo camera supportPritesh Raithatha
-Removed unused sensor mode mode_1920x1088 -Added ov5650_write_reg_helper function to do write_reg() according to camera_mode. -ov5650_get_status function is removed as it is reading reg 2 value and there is not any definition of reg 2 in datasheet and even user space is not using it's value at all. -Added ov5650_set_power function to on/off camera sensors power according to camera_mode. -Added ioctl OV5650_IOCTL_SET_CAMERA_MODE to set camera_mode from user space. -Added i2c driver for right ov5650. Bug 809921 Change-Id: Ib3cf43d0a064c18c218d0850e849fff84e18e661 Reviewed-on: http://git-master/r/26857 Tested-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-by: George Bauernschmidt <georgeb@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-04-14tegra_mediaserver: Adding kernel media driverS. Holmes
This kernel driver will replace the functionality that was previously in the NVRM daemon root process and allow multiple instances of OpenMAX to function and AVP resource tracking and cleanup. Bug 772210 Change-Id: Ia5eb559cde4644bae5fd8b23a1de57cd65f3fdd8 Reviewed-on: http://git-master/r/25115 Tested-by: Stephen Holmes <sholmes@nvidia.com> Reviewed-by: Stephen Holmes <sholmes@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-04-14net: caif: added tegra specific caif for rainbow modem.Sheshagiri Shenoy
- added the tegra dependent layer of the caif protocol. - integrated with the open source rainbow caif. - verified the functionality using latest rainbow RIL. bug 785523 Change-Id: I75be8d2ef6e5562facf902a3f963f34d241bb6c3 Reviewed-on: http://git-master/r/23421 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-04-11ALSA: jack: Adds a deafult case in jack types.Manjula Gupta
Adds SND_JACK_NO_TYPE_SPECIFIED to handle the cases where jack type is not known. Change-Id: Ifd604694602fa22a497aff209e621f5cc00d0871 Reviewed-on: http://git-master/r/27179 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Manjula Gupta <magupta@nvidia.com> Reviewed-by: Boris Suvorov <bsuvorov@nvidia.com>
2011-04-06arm: tegra: Remove executable bit from source filesRobert Morell
Generated with the script: find \( -name "*.c" -or -name "*.h" -or -name "*akefile" -or \ -name "*\.mk" \) -type f -perm /+x | xargs chmod -x Change-Id: Iabae1aa20fd49a1c8db439fc132182d0f629deab Reviewed-on: http://git-master/r/26806 Reviewed-by: Robert Morell <rmorell@nvidia.com> Tested-by: Robert Morell <rmorell@nvidia.com> Reviewed-by: Janne Hellsten <jhellsten@nvidia.com>
2011-04-04i2c: buses: tegra: assign unused address to i2c slaveNitin Kumbhar
New i2c slave should be configured with a non-zero i2c address. Configure i2c slave with an i2c address assigned by platform data for an i2c dev. BUG 788286 Reviewed-on: http://git-master/r/25100 (cherry picked from commit e6e0610c72ffce3b734e079faf88fad3f0468d07) Change-Id: I440aa2cc72007d2835b2027c0b26089d0aad9263 Reviewed-on: http://git-master/r/25223 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-29ASoC: Add post-CODEC bias level callback for machine driverMark Brown
Currently the machine driver can only do bias level configuration before the CODEC bias level is brought up. This means that the machine cannot do any configuration which depends on the CODEC bias level being maintained. Provide a post-CODEC callback which allows the machine driver to do things like enable the FLL on a CODEC which is brought down to BIAS_OFF when idle. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Cherry-picked from mainline kernel. Change-Id: Ib0a8533e3762dfc67ee21209a28e9a6603d31a37 Reviewed-on: http://git-master/r/23058 Tested-by: Sumit Bhattacharya <sumitb@nvidia.com> Reviewed-by: Ravindra Lokhande <rlokhande@nvidia.com> Reviewed-by: Scott Peterson <speterson@nvidia.com>
2011-03-28serial: 8250: support auto control of RTSCTS on tegra typePradeep Goudagunta
Add UART_CAP_HW_CTSRTS flag to tegra type for supporting auto control of RTSCTS. Bug 803910 Change-Id: I7b69e4b203e66903ba5755338fcb55f4a87b9a43 Reviewed-on: http://git-master/r/24463 Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-24media: video: tegra: SH532U: fix formatting errorsQinggang Zhou
- fix an incorrect i2c address and a function return check. - add checks for function returns. - remove the developer name in the beginning comment. - fix an uninitialized variable.. Change-Id: I2d42025b7ff47eb6228e626e65990f4da04b94ac Reviewed-on: http://git-master/r/23594 Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Tested-by: Qinggang Zhou <qzhou@nvidia.com> Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
2011-03-22video: pwm_backlight: Add check_fb hookRobert Morell
In systems with multiple framebuffer devices, one of the devices might be blanked while another is unblanked. In order for the backlight blanking logic to know whether to turn off the backlight for a particular framebuffer's blanking notification, it needs to be able to check if a given framebuffer device corresponds to the backlight. This plumbs the check_fb hook from core backlight through the pwm_backlight helper to allow platform code to plug in a check_fb hook. Originally reviewed on http://git-master/r/21716 Reviewed-on: http://git-master/r/23100 (cherry picked from commit c7831cb27fc6a2701b020676a6daf9c76e9470d9) Change-Id: I32895d6f2c5988b09680a350e169f1f3c9b56da6 Reviewed-on: http://git-master/r/23725 Reviewed-by: Robert Morell <rmorell@nvidia.com> Tested-by: Gaurav Sarode <gsarode@nvidia.com> Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-22backlight: add low threshold to pwm backlightArun Murthy
The intensity of the backlight can be varied from a range of max_brightness to zero. Though most, if not all the pwm based backlight devices start flickering at lower brightness value. And also for each device there exists a brightness value below which the backlight appears to be turned off though the value is not equal to zero. If the range of brightness for a device is from zero to max_brightness. A graph is plotted for brightness Vs intensity for the pwm based backlight device has to be a linear graph. intensity | / | / | / |/ --------- 0 max_brightness But pratically on measuring the above we note that the intensity of backlight goes to zero(OFF) when the value in not zero almost nearing to zero(some x%). so the graph looks like intensity | / | / | / | | ------------ 0 x max_brightness In order to overcome this drawback knowing this x% i.e nothing but the low threshold beyond which the backlight is off and will have no effect, the brightness value is being offset by the low threshold value(retaining the linearity of the graph). Now the graph becomes intensity | / | / | / | / ------------- 0 max_brightness With this for each and every digit increment in the brightness from zero there is a change in the intensity of backlight. Devices having this behaviour can set the low threshold brightness(lth_brightness) and pass the same as platform data else can have it as zero. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Acked-by: Richard Purdie <rpurdie@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Reviewed-on: http://git-master/r/23099 (cherry picked from commit 92db79791aa60cacb3fa90d1cb2e942420c29408) Change-Id: Icbe49b593dfa6608934ff274b4c9281e43c30b5c Reviewed-on: http://git-master/r/23724 Tested-by: Gaurav Sarode <gsarode@nvidia.com> Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-22misc: mpu3050: Invensense MPU code update v3.3.3vsalve
Update Invensense Motion Library (MPL) to production version v3.3.3. Previous version was engineering release and is not suitable for mass production. This version of the MPL most notably fixes problems with suspend/resume where touch screen would quit working during a suspend/resume cycle. Change-Id: Ia33433a677862b3d1e31d410aac7176d7a381a8f Reviewed-on: http://git-master/r/22987 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-03-17[TPS658x RTC] Correct reg RTC_CTRL usageDavid Schalig
Correct PRE_BYPASS (clock scaler 32kHz/1kHz select) bitfield. Add platform data to tune RTC XTAL capacitance in board file. Bug 798832, Tested on Ventana/wake via Alarm Clock Change-Id: I82d67610a815866707fc1db934d7d4d7cf93d883 Reviewed-on: http://git-master/r/22402 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Reviewed-by: David Schalig <dschalig@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-03-17regulator: tps6586x: add PFM/PWM options on SMs supplyXin Xie
TPS6586x SM0, SM1 and SM2 port have 2 power switching modes: - PWM only, or - PMW-PFM auto mode Some of TPS6586x have voltage spike in PFM-to-FWM transition can lockup the CPU if choose PWM-PFM auto mode. This patch enables such mode selection on SMs ports from the board level power configuration file. BUG 796364 Change-Id: I7015798151d6753ff5dcc329703338fde105e2b0 Reviewed-on: http://git-master/r/22701 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com> Reviewed-by: Xin Xie <xxie@nvidia.com> Tested-by: Xin Xie <xxie@nvidia.com>
2011-03-17media: video: tegra: SH532U: Add the SH532U focuser driver.Qinggang Zhou
This focuser is from SEMCO and is integrated with OV5650 sensor and LC898211 driver. bug 778859 Change-Id: I6e5dcc129c72aed7d92a00a1d926424050583c1d Reviewed-on: http://git-master/r/22711 Reviewed-by: Qinggang Zhou <qzhou@nvidia.com> Tested-by: Qinggang Zhou <qzhou@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
2011-03-10mfd: max8907c: Add api to power off max8907cPrashant Gaikwad
Add an api to power off max8907c by setting power off bit in RESET_CNFG reg. Bug 799957 Bug 800602 (Cold boot) Change-Id: Ie0206d684a86fecc75273c1d3b087bb2d47b4c56 Reviewed-on: http://git-master/r/22385 Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-09merge: trivial updates resolved from upstreamDan Willemsen
* Move include/linux/tegra_usb.h to include/linux/platform_data/tegra_usb.h Change-Id: I5b7799c5af8029b15ad206978718b337afac8814 Reviewed-on: http://git-master/r/22165 Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com> Tested-by: Daniel Willemsen <dwillemsen@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
2011-03-08spi: tegra: Fixing misc issues.Laxman Dewangan
Following are the fixes; - Supportng half duplex. - Only using SW based CS. - Write to readback with command register does not work. Fixing issue. - Using cpu based transfer for smaller size and dma based for larger size. - reading proper transfer status after every transaction. bug 791149 bug 791780 Change-Id: I293b3f1b571276f5d8fe4ad4da67f827926e4b73 Reviewed-on: http://git-master/r/20581 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Reviewed-by: Amit Kamath <akamath@nvidia.com>
2011-03-07merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mach-tegra/include/mach/system.h arch/arm/mach-tegra/include/mach/usb_phy.h arch/arm/mach-tegra/usb_phy.c drivers/usb/host/ehci-tegra.c drivers/video/tegra/dc/dc.c drivers/video/tegra/dc/hdmi.c include/linux/tegra_usb.h Change-Id: Ic1f4f2b360893e8de6b867a8ecc239aca02367da
2011-03-04ASoC: WM8903: Expose gpio pins via GPIOLIBChao Jiang
Exposed gpio pins on wm8903 via GPIOLIB. This will help ALSA control drivers to manipulate the codec much more easier. Change-Id: I070eafa6e9a533cc0c285c1780d1b8393105def1 Reviewed-on: http://git-master/r/20883 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@nvidia.com>
2011-03-04Kernel driver for SSL3250A flash/torch camera device.Erik Lilliebjerg
Change-Id: Id5cb40c9823c7fcfd26e45e4608c45b16a2d431a Reviewed-on: http://git-master/r/21351 Reviewed-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com> Tested-by: Erik M Lilliebjerg <elilliebjerg@nvidia.com> Reviewed-by: George Bauernschmidt <georgeb@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-03max8907c mfd: Add wake irq capabilityTom Cherry
This change allows the max8907c to wake the system when receiving an irq. It also masks all non-wake conditions from causing an irq when going into suspend and unmasks these conditions when resuming to not cause spurious wake-up events. Change-Id: I5eadb929ff4aded8a6ec11426ab424f0f692c042 Reviewed-on: http://git-master/r/20100 Tested-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-03-01Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36Colin Cross
2011-03-01usb: otg: Add ulpi viewport access opsBenoit Goby
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-01usb: host: tegra: Cleanup before sending upstreamBenoit Goby
Change-Id: I846d43b1ecbe6c726f024b6a0fb318d6300a3746 Signed-off-by: Benoit Goby <benoit@android.com>
2011-03-01usb: host: Moved tegra_usb.h to include/linux/platform_dataBenoit Goby
Change-Id: Ic093d07858eb6e27aae9cd04d4c59407b5b1d76d Signed-off-by: Benoit Goby <benoit@android.com>
2011-02-24Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36Erik Gilling
Conflicts: drivers/video/tegra/dc/hdmi.c Change-Id: I10fd2dbcc07d7961dd75e10a2c4de926457c2912
2011-02-24[ARM] tegra: hdmi nvhdcp driverJon Mayo
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>
2011-02-23hwmon: adt7461: support Thermal ThrottlingPrashant Gaikwad
The driver now supports thermal throttling. When the temperature reaches a certain threshold, thermal throttling is enabled and when the chip cools off to a certain threshold, throttling is disabled. Bug 786378 Change-Id: I7e769bd98e0bfe0d1f2decdba4432f91a0133d54 Reviewed-on: http://git-master/r/20372 Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-22video: tegra: Add PWM backlight driverJoseph Lehrer
bug 773671 Change-Id: Ib93f0dcb7e22220fe297c81d403c401548f3c649 Reviewed-on: http://git-master/r/18280 Tested-by: Joseph Lehrer <jlehrer@nvidia.com> Reviewed-by: Thomas Cherry <tcherry@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Sachin Nikam <snikam@nvidia.com> Reviewed-by: Daniel Willemsen <dwillemsen@nvidia.com>
2011-02-22tegra bluesleep: Bluetooth active power management driverAnantha Idapalapati
A new driver is implemented to actively manage the bluetooth module power. bluesleep also tries to manage the power of the transport used. Two signals (GPIOs) are used to manage the power events. BT_WAKE : signal from HOST to BT chip to intimate BT chip can sleep. HOST_WAKE: signal from BT chip to HOST to intimate HOST should wakeup/ activate the transport modules required for BT communication. Bug 791669, 773186 (cherry picked from commit 111f4ccd3c4cfde2fa52ae4c0c56a2288c3af3a8) Change-Id: Iff1e81bb22d9bd43113f7cdd01329da3ae852a15 Reviewed-on: http://git-master/r/19858 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-22arm: tegra: hsuart: Support for Bluetooth wakeupPradeep Goudagunta
Added support to tegra_hsuart driver for bluetooth wakeup. Bug 773186 Change-Id: Id8f1face1b99942fd13949d0815a1dedd1a5a5d0 Reviewed-on: http://git-master/r/19586 Reviewed-by: Anantha Idapalapati <aidapalapati@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Anantha Idapalapati <aidapalapati@nvidia.com>
2011-02-21merging 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: I5e6994d4db216062b9cd1673f45bd9fdcf1f96ae
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-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-16Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36Rebecca Schultz Zavin
2011-02-14net: wireless: Add get_country_code functionality to platformDmitry Shmidt
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
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-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-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-09USB: gadget: android: Support switching vendor ID when configuration changesMike Lockwood
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>
2011-02-09merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: drivers/video/tegra/dc/hdmi.c Change-Id: Ia65c693bf49160e3906df68403129ba1e5545912
2011-02-08media: video: tegra: add driver for ov2710Nathan Lord
Change-Id: I9d9a9a301f23398a13fa7d865058f384288f6c92 Reviewed-on: http://git-master/r/18537 Reviewed-by: Nathan Lord <nlord@nvidia.com> Tested-by: Nathan Lord <nlord@nvidia.com> Reviewed-by: Jonathan Mayo <jmayo@nvidia.com> Reviewed-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-02-08USB: HCD: Add driver hooks for (un)?map_urb_for_dmaRobert Morell
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>
2011-02-08USB: HCD: Add usb_hcd prefix to exported functionsRobert Morell
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>
2011-02-07Merge branch linux-tegra-2.6.36 into android-tegra-2.6.36Erik Gilling
Change-Id: I6fcdbcd0eb7103ac580deb94faf79959a5818ba1
generated by cgit v1.2.3 (git 2.0.4) at 2024-11-02 16:33:55 +0000