summaryrefslogtreecommitdiff
path: root/include/linux
AgeCommit message (Collapse)Author
2011-08-18i2c: tegra: Remove warningsAlok Chauhan
Updated the tegra_i2c_platform_data to remove warnings. bug 854305 Change-Id: Ie8e5b1737826cd877352d911ff5b87233fcff0dc Reviewed-on: http://git-master/r/47733 Reviewed-by: Alok Chauhan <alokc@nvidia.com> Tested-by: Alok Chauhan <alokc@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-08-16spi: tegra: Supporting HW based CS controlLaxman Dewangan
Supporting the hw based CS to communicate to spi device. This provides the constraints in hold and setup time of CS before clock start and clock ends. The hw based CS can be selected if spi client provide the option through the device controler data and only one transfer per message is requested. Reviewed-on: http://git-master/r/23988 Change-Id: Iba6d1efd8c5406f1b44ddd44b6f739ac529a94df Reviewed-on: http://git-master/r/47150 Tested-by: Cho-Che Cheng <jacheng@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-08-16i2c: tegra: Added arbitration lost error recoveryAlok Chauhan
Added the arbitration lost error recovery code into i2c driver. bug 854305 This is cherry pick of change http://git-master/r/#change,43201 in main but hand-merged. Change-Id: Ic745491f1914c1e4c470f7b8b4ff9a29eb030a82 Reviewed-on: http://git-master/r/46289 Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com> Reviewed-by: Alok Chauhan <alokc@nvidia.com> Tested-by: Alok Chauhan <alokc@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-06-29serial: tegra: Support for best clock sourceLaxman Dewangan
Finding the best clock source for uart controller which can generate the clock rate having minimum error between requested baudrate and configured baudrate. bug 842665 Change-Id: I9a750f578f7dfd7ea2138fdf1bcec30b0f3392d5 Reviewed-on: http://git-master/r/38426 Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Laxman Dewangan <ldewangan@nvidia.com> Tested-by: Pradeep Goudagunta <pgoudagunta@nvidia.com> Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
2011-06-16usb: gadget: composite: Allow function drivers to pause control transfersRakesh Bodla
Some USB function drivers (e.g. f_mass_storage.c) need to delay or defer the data/status stages of standard control requests like SET_CONFIGURATION or SET_INTERFACE till they are done with their bookkeeping and are actually ready for accepting new commands to their interface. They can now achieve this functionality by returning USB_GADGET_DELAYED_STATUS in their setup handlers (e.g. set_alt()). The composite framework will then defer completion of the control transfer by not completing the data/status stages. This ensures that the host does not send new packets to the interface till the function driver is ready to take them. When the function driver that requested for USB_GADGET_DELAYED_STATUS is done with its bookkeeping, it should signal the composite framework to continue with the data/status stages of the control transfer. It can do so by invoking the new API usb_composite_setup_continue(). This is where the control transfer's data/status stages are completed and host can initiate new transfers. The DELAYED_STATUS mechanism is currently only supported if the expected data phase is 0 bytes (i.e. w_length == 0). Since SET_CONFIGURATION and SET_INTERFACE are the only cases that will use this mechanism, this is not a limitation. (cherry picked from commit 1b9ba000177ee47bcc5b44c7c34e48e735f5f9b1) Change-Id: I4aaf702e03898573f92e58223a29eafbc9612219 Reviewed-on: http://git-master/r/36273 Tested-by: Rakesh Bodla <rbodla@nvidia.com> Reviewed-by: Hanumanth Venkateswa Moganty <vmoganty@nvidia.com>
2011-05-31USB: gadget: f_accessory: Add string for accessory's unique serial numberMike Lockwood
Signed-off-by: Mike Lockwood <lockwood@android.com> (cherry picked from commit 99b7fdff26bdaa2dbdecd45db18834f9d7447632) Change-Id: Ic4e663abf1a3c6d0ea21983f5e2171a34c0e6641 Reviewed-on: http://git-master/r/32891 Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Tested-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-05-31USB: gadget: f_accessory: Misc improvements and cleanup:Mike Lockwood
- Add URI string - Replace type string with a description string - Add a control call to retrieve accessory protocol version (currently 1) - Driver read() and write() calls now fail after USB disconnect until driver file is closed and reopened. - Misc cleanup work Signed-off-by: Mike Lockwood <lockwood@android.com> (cherry picked from commit 5dcd55b2e98ffdaf54a5cdd67a3101e1e5dd3aa1) Change-Id: I5b45ee76d5f83b626555e42d34f450db9b69f47b Reviewed-on: http://git-master/r/32887 Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Tested-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-05-31USB: gadget: f_accessory: New gadget driver for android USB accesoriesMike Lockwood
Signed-off-by: Mike Lockwood <lockwood@android.com> (cherry picked from commit 5826bb3c467116287087703472261f51f71ca090) Change-Id: I6d66f0e6ff137467f8656d28f1107d7478a22720 Reviewed-on: http://git-master/r/32886 Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Tested-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-04-25mfd: max8907c: Prog pwren to power down/up corePrashant Gaikwad
apis added to program max8907c regulator to power down and up core supply rail via the pwren signal on enter and exit deep sleep mode. Bug 817378 Change-Id: I5af04db22b6c84fc4359c1a0cf209710ca144159 Reviewed-on: http://git-master/r/28434 Tested-by: Prashant Gaikwad <pgaikwad@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
2011-04-25merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36Nitin Kumbhar
Conflicts: arch/arm/mm/proc-v7.S drivers/video/tegra/dc/dc.c Change-Id: I40be0d615f14f1c01305388a706d257f624ba968
2011-04-22Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36Rebecca Schultz Zavin
2011-04-19net: Reorder incoming packets in PPPoLAC and PPPoPNS.Chia-chi Yeh
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>
2011-04-15tegra dc: fix premult dst alpha blendingFrancis Hart
Register assignments were wrong for incoming overlay blend parameters. DisplayManagerLite policy sets src combine mode to premult to signal dst premult aplha blending. But the DC expects premult set for the dst window for this mode. Bug 796009 Change-Id: I5929bc4cd362ac60c7a9f14bb4ae83da04b857ab Reviewed-on: http://git-master/r/26835 Reviewed-by: Varun Colbert <vcolbert@nvidia.com> Tested-by: Varun Colbert <vcolbert@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-07MMC: Fix erase/trim for certain SanDisk cards.Andrei Warkentin
CMD38 argument is passed through EXT_CSD[113]. Change-Id: I47e9d5e2cf44d9274a65a3b1955026185cb8f2b8 Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
2011-04-07MMC: Expose mmc_switch to higher drivers.Andrei Warkentin
Needed for Sandisk workaround (manipulate EXT_CSD). Change-Id: I7bfe50a1503ac73ae072db718b60c27526521e41 Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
2011-04-07MMC: Extends card quicks with MMC/SD quirks matching the CID.Andrei Warkentin
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>
2011-04-07mmc: add per device quirk placeholderPierre Tardy
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>
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-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-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-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-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-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-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-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
generated by cgit v1.2.3 (git 2.0.4) at 2025-05-17 23:15:42 +0000