summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio: don't clear output devices at standbySimon Wilson2011-09-131-3/+0
| | | | | | | | | | | | | | | | The output devices in adev->devices are cleared sometimes when making a call. The sequence is as follows: 1. do_output_standby() (clears bits in adev->devices) 2. set_mode to IN_CALL state 3. select_output_device() reads the bits in adev->devices, but none are set. As a result, with no valid route, call audio fails. Fixes bug 5309421 Change-Id: I81efe325d8b482f7474750c08d353ca989da9939
* Use a new config flag to decide if notification led pulsing can be turned ↵Amith Yamasani2011-09-121-0/+3
| | | | | | | on/off. Bug: 5242350 Change-Id: Ief79f6a15419beda1e90fd3e996baed832de56c7
* new kernel prebuiltSimon Wilson2011-09-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92b5ddf ARM: omap4: tuna: Enable HDMI audio in defconfig 90e6992 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 5d9e2fc Merge branch 'linux-omap-3.0' into android-omap-3.0 410ad94 Merge branch 'android-3.0' into android-omap-3.0 5df4fc4 OMAP4: tuna: Don't enable UART4_RX for wakeup b0ed517 mfd: twl6030: set the device pointer 32cf022 ASoC: ABE: Update with ABE firmware 09.49.2 04633df ASoC: SDP4430: Use ABE DC offset cancellation ca80213 ASoC: ABE DSP: Add support for DC offset cancellation 1998af9 mfd: twl6040: Add function to query IC revision cd5e904 ASoC: twl6040: Update HSOTRIM/HFOTRIM in register cache 4e1a735 ASoC: ABE DSP: Set ramp time to 5ms for all gains 9d914ce ASoC: OMAP ABE: Update mute location of frontends 2a6c017 ASoC: twl6040: Use correct widget name for Earpiece power mode 2af23bf ASoC: OMAP: HDMI: Add support for multiple channels. 54419b8 ASoC: OMAP: HDMI: Add functionality for multichannel audio 765603c ASoC: OMAP: Update Makefile and Kconfig for HDMI audio df2d970 OMAP4: HDMI: Use generated audio MCLK when supported a39edc7 OMAP4: HDMI: Add OMAP device for HDMI audio codec 5e57d5d ASoC: HDMI: Move HDMI audio codec to soc/codec c0c0945 OMAP4: HDMI: Move audio HDMI IP specific portion to new IP file 12b5a4e OMAP4: Add device for HDMI OMAP4 audio for ASoC machine driver 5e30367 OMAP4: HDMI: Add OMAP device for HDMI audio CPU DAI 49df56d ASoC: OMAP4: Add HDMI Audio machine driver for OMAP4 boards 408b4a6 ASoC: OMAP: Add CPU DAI driver for HDMI e9772c4 modem_if: dpram: Add CDMA dump function 36af2a4 ARM: vfp: Always save VFP state in vfp_pm_suspend 4f77fd4 ARM: vfp: ensure that thread flushing works if preempted c0822d4 ARM: vfp: fix a hole in VFP thread migration 7577c6c ARM: vfp: rename check_exception to vfp_hw_state_valid 70528f9 ARM: vfp: rename last_VFP_context to vfp_current_hw_state 682cb5f modem_if: usb_link: modified phone_active_irq_handler Change-Id: I16376e9bc7ce4c8aedbc8575d745ccaa3a085292
* Revert "Revert "audio : add to support bluetooth with NR & EC functionality""Eric Laurent2011-09-121-2/+14
| | | | This reverts commit 494a9150218d73774796c40bc101928034094082.
* audio: open modem/bluetooth in stereoSimon Wilson2011-09-111-1/+1
| | | | | | | Cross-dependency with kernel change: I65a3555569bf4698619130c80d5c391bb6bb9b46 Change-Id: Ibfd6a884626a21ad1a06572e3458cca1b31e3afc
* new kernel prebuiltSimon Wilson2011-09-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | a2f0913 ASoC: OMAP: Enable stereo mode for Bluetooth bfff220 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 2f04ad8 Merge branch 'linux-omap-3.0' into android-omap-3.0 6704900 Merge branch 'android-3.0' into android-omap-3.0 ffebb24 netfilter: xt_qtaguid: warn only once for missing proc qtaguid data 6b82151 usb: otg_id: add suspend/resume interface d14723f OMAP4: misc: omap_temp_sensor: set drvdata before calling sensor_enable b175870 Revert "misc: omap_temp_sensor: Fix wrong structure pointer." cfa90b2 ARM: omap4: tuna: USB/UART Manual Mode Support f91cf44 ARM: omap4: tuna: Set power button as wakeup 868db5a HACK: I2C: OMAP: Dump original xfer length on controller timeout 30b9e25 Revert "HACK: OMAP: I2C: PM: remove pm-qos constraints for omap44xx" 48fa519 OMAP4: Don't count CPU suspend in IRQSOFF trace 0d30cb3 ASoC: ABE DSP: mute/unmute BT UL gains during suspend/restore b81b22b modem_if: dpram_link: Dpram driver improvements 6e19220 ARM: tuna: Update platform_data for dpram driver 5e18710 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 bfe7919 Merge branch 'linux-omap-3.0' into android-omap-3.0 4ba633d Merge branch 'android-3.0' into android-omap-3.0 ecabdc3 omap: iommu: do not allow core to lower state while in use f7d29b6 netfilter: xt_qtaguid: 1st pass at tracking tag based data resources Change-Id: I7fb18d227a342d67857efbb936ba479e89975b65
* tuna: correct file ownership/perms for USB/UART switchingPark sung-ho2011-09-111-2/+6
| | | | | Change-Id: Ifa3f47d885a83b6953c8b99412c05915f08cbc01 Signed-off-by: Park sung-ho <p5397.park@samsung.com>
* Merge "Update kernel prebuilt"Dima Zavin2011-09-091-0/+0
|\
| * Update kernel prebuiltDima Zavin2011-09-091-0/+0
| | | | | | | | | | | | | | b7ee7d0 input: mms_ts: restore firmware VA24 Change-Id: I611f10d88818107098f9a7bb02c9f3e0b33095f6 Signed-off-by: Dima Zavin <dima@android.com>
* | Merge "Revert "audio : add to support bluetooth with NR & EC functionality""Eric Laurent2011-09-091-14/+2
|\ \ | |/ |/|
| * Revert "audio : add to support bluetooth with NR & EC functionality"Eric Laurent2011-09-091-14/+2
| | | | | | | | This reverts commit b48dbbdeab6f28cf99dc25da67e696ac1399c659.
* | Correct the min frame rate settings for the video encodersJames Dong2011-09-091-5/+5
|/ | | | | | | Set the actual frame rate for MMS setting to use 15fps Change-Id: I2528993d1d9a122f76a80712c969c8c55c6e688d related-to-bug: 5145483
* tuna: update prebuilt kernelIliyan Malchev2011-09-091-0/+0
| | | | | | | | | | | | | | | | | | | a18c7e4 Change carveout sizes. 4f9ca3f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 46a416e Merge branch 'linux-omap-3.0' into android-omap-3.0 597d07c rpmsg: Change the address used by rpmsg for suspend 49cf38e rpmsg: Change ION carveout start address in rpmsg driver 1df833c omap4: export error notify function for remoteproc 9fd61a8 OMAP: remoteproc: watchdog timer for remote cores 5ea0136 omap:iommu: Enable Ducati fault ISR for L2 MMU error 8a8569a drivers: remoteproc: save last traces in sysfs in case of crash cc4e8d3 OMAP4: tuna: gps: keep rts line under hw flow control 3136993 modem_if: usb_link: Retry Slave wake up b7a40c9 ARM: omap4: tuna: add mhl charging to board files 8edde8f video: MHL: enable charging with MHL dongle Change-Id: Ia745cc78f4c00f0e622543dc72251fbb4649720e Signed-off-by: Iliyan Malchev <malchev@google.com>
* audio: ensure the correct MUX is set for BT uplinkSimon Wilson2011-09-081-14/+5
| | | | | | | | | | | Support for PORT_VX as an input capture device was not completely removed and the bluetooth uplink was still incorrectly using the VX MUX. PORT_VX support has been completely removed and bluetooth now uses the correct MUX for uplink. Fixes bug 5279972 Change-Id: I8664abf7cff61f894f447dc7a3c49241dce4087b
* Merge "audio: don't put output in standby when changing route"Simon Wilson2011-09-081-13/+12
|\
| * audio: don't put output in standby when changing routeSimon Wilson2011-09-081-13/+12
| | | | | | | | | | | | | | | | | | | | The OMAP4 ALSA kernel code can now handle output routing changes when the PCM is opened. This avoids pops when closing PCMs to change the route between speaker and headset for example, and makes a noticeable difference when notifications occur when playing music. Change-Id: I957d96fae6764a3049d4f3c00074a9295a18d66d
* | new kernel prebuiltErik Gilling2011-09-081-0/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 5ab49cc Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 21fe46c Merge branch 'linux-omap-3.0' into android-omap-3.0 4be6fc8 gpu: pvr: Update to DDK 1.8@290340 15b1d34 [OMAP4-TUNA]: Add description for i2c2 channel 7a2aa9f OMAP4: trim_quirks: Use omap4_ctrl_pad_writel for setting PAD_CORE_EFUSE registers 228a872 OMAP4: trim_quirks: Update trim s/w override based on bgap 55f76ea OMAP4: PM: disable IVA AUTO_RET 4ff4532 OMAP4: HSI: improve the debug message on bad CAWAKE 3269420 OMAP4: HSI: remove #if 0ed code bf10c8b OMAP4: HSI: fix multiline comments d1d0039 [OMAP4-DSS-Tuna] Add parameter to fine-tune the DSI clock timing register c443e84 ASoC: twl6040: fix spelling mistake cd23a75 ARM: omap4: tuna: fix JIG attach/detach handling 5835968 Merge branch 'android-omap-3.0' into android-omap-tuna 9107d2b Merge branch 'linux-omap-3.0' into android-omap-3.0 907c066 [OMAP4-DSS]: Fix ESD noise issue by setting DSI clock lane to LP state 434f09e OMAP4: AESS: Set context loss query to pdata 12973c2 OMAP4: McPDM: Add context loss query to pdata ea5c885 ASoC: mcpdm: Add suspend/resume 17dde09 ASoC: ABE DSP: Use new API for context loss 24dcad6 ASoC: ABE DSP: Restore mono mixers in resume 00359b1 OMAP: remove unused context lost pointer. 5c93a26 OMAP4: Provide handling of I2C channel controlled outside the mpu 571c7e6 OMAP: PM: Fix crash when omap_dm_timer_set_load_start() is called c1921c4 OMAP4: HSI: SW WA for hardcoded wakeup dependency from HSI to DSP 61b46c8 OMAP4: Enable PL310 errata only if L2$ is enabled b3d8bef OMAP4: CPUfreq: Clean up thermal throttling logic as it's moved to temp sensor driver 25edf19 OMAP4: TEMP: Sensor: Update logic to throttle/unthrottle 23bafd7 OMAP4: TEMP: sensor update T_hot/T_cold to take into account OMAP hot spot e12ac95 CPUfreq: Hotplug: Update down threshold to 35% CPU load Change-Id: I6cd40ec5530743489dbdbda425a09caf4409defc Signed-off-by: Erik Gilling <konkers@android.com>
* audio : add to support bluetooth with NR & EC functionalityUK KIM2011-09-081-2/+14
| | | | | | | | | | | EC & NR function can be duplicated in modem and bluetooth device. If BT device want to use own function, modem has to turn off own functions. This can be related with clicking sound and sound quality in some case of somde bluetooth device or modem's configuration. Change-Id: Ifebc824e04afc06cd861a67138a1e06ce3f462f1
* Updated kernel prebuiltColin Cross2011-09-081-0/+0
| | | | | | | | | | | | | | | | | 96eedbd ARM: omap: tuna: Set OMAP_WAKEUP_EN to wlan irq pin afebd88 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 e5a9a68 Merge branch 'android-3.0' into android-omap-3.0 04a77cd input: mms_ts: firmware update for VA25-4 30154dd input: mms_ts: do not hardcode version in driver bf40972 input: mms_ts: make firmware flashing more robust 871b474 input: mms_ts: disable irqs during time sensitive operations f86c85d Revert "modem_if: Avoid unnecessary skb copy" 692e468 rtc alarm: fix bad index when canceling alarms[] 25c8508 ARM: OMAP4: tuna: fix pin configuration for TWL 07b26cd mmc: core: host: only use wakelock for detect work eb98e93 tuna: sensors: proxmity sensor bug fix Change-Id: I728d4966e5adc4fd2aa58ecee564f6dfb5635c88
* Merge "audio: add logging to track call state"Simon Wilson2011-09-081-0/+7
|\
| * audio: add logging to track call stateSimon Wilson2011-09-081-0/+7
| | | | | | | | Change-Id: Ic055b9680623ad9d9ad1d8edfbc9bafceab4c43a
* | Merge "tuna: Patch to consider Image quality factor for JPEG compression"Wu-cheng Li2011-09-081-2/+2
|\ \ | |/ |/|
| * tuna: Patch to consider Image quality factor for JPEG compressionBraganza2011-09-081-2/+2
| | | | | | | | | | | | | | | | Modified the ImageQuality value from 90 to 95 as required by Ducati. Since application is setting always QUALITY_HIGH the change is done for only to the corresponding value for both Back and front Camera. Change-Id: Ifad6ba88a6132f351afb9dfacb0173afbda0ec44 Signed-off-by: Sam <sam.braganza@samsung.com>
* | Calibrate voice recognition recording levelsJean-Michel Trivi2011-09-081-2/+2
| | | | | | | | | | | | | | | | Calibrate the input levels for voice recognition on the main microphone (bottom mic) and headset inputs to the value expected in this use case. Change-Id: I6c0743bb9ae4c00194a8baeed43f523918a1a10e
* | Merge "enable wifi p2p system feature"Irfan Sheriff2011-09-072-3/+1
|\ \
| * | enable wifi p2p system featureIrfan Sheriff2011-09-072-3/+1
| | | | | | | | | | | | | | | Bug: 5267396 Change-Id: I329d3313290be78ad89394717d46b30fd29cbbd8
* | | Updated kernel prebuiltColin Cross2011-09-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a0e658 ARM: omap4: tuna: switch to interactive governor 3a93a54 ARM: omap4: tuna: provide oscillator ramp timings edabbb7 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 1204575 Merge branch 'linux-omap-3.0' into android-omap-3.0 3fbb2d8 ARM: omap4: cpuidle: wait for cpu1 to boot before releasing cpu0 0e8f213 ARM: omap4: dpll44xx: Don't use DCC at 1.2GHz 36ae588 ARM: omap4: dpll44xx: fix scaling DPLL_MPU Change-Id: Ib2c7372c8ed7589d7407d132dce5d8c316891e89
* | | dumpstate: add audio debug outputSimon Wilson2011-09-071-0/+3
| | | | | | | | | | | | Change-Id: I269c01c133613024ede0fa8a590ef45ae5a55ba6
* | | new kernel prebuiltErik Gilling2011-09-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 4fa9daa Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 16a04e4 Merge remote branch 'pcommon/android-3.0' into android-omap-3.0 686d33a USB: gadget: android: pass ctrl requests to accessory function when disabled 4bc7144 net: wireless: bcmdhd: Update to version 5.90.125.78 044de29 Merge branch 'linux-omap-3.0' into android-omap-3.0 02878a6 gpu: pvr: Update to DDK 1.8@289794 6c52f5b OMAP:DSS2: Add more detail to why predecimation would fail d36707e OMAP:DSS:HDMI: Make EDID read, HDMI mode selection and HPD events consistent 1885843 OMAP:DSSCOMP: Expose supported monitor timings to user space b442e52 OMAP:DSS: Switch HDMI timings and EDID handling to use fbmon Change-Id: Ida81a50e6637769c56d04510716a11051434b1e2 Signed-off-by: Erik Gilling <konkers@android.com>
* | | Merge "add dsscomp files to dumpstate"Erik Gilling2011-09-071-0/+3
|\ \ \
| * | | add dsscomp files to dumpstateErik Gilling2011-09-071-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I774e4b0dd153492b59e789fb8813489c7ea487c9 Signed-off-by: Erik Gilling <konkers@android.com>
* | | | New Prime prebuiltPaul Eastham2011-09-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | b6163fc Revert "ARM: omap4: tuna: switch to interactive governor" Change-Id: Iefcbfc2a6d326439b0089ef77e997f66bd446d5d
* | | | Merge "audio: enable 450Hz high-pass filter for speaker"Simon Wilson2011-09-071-0/+11
|\ \ \ \ | |_|_|/ |/| | |
| * | | audio: enable 450Hz high-pass filter for speakerSimon Wilson2011-09-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | This filters out frequencies that can damage the speaker. Change-Id: I35946c9ee3e80be673643ef40129e7e5214a0d8b
* | | | tuna: update prebuilt kernelIliyan Malchev2011-09-061-0/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17a999f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 f068462 Merge branch 'linux-omap-3.0' into android-omap-3.0 e16ec00 Merge branch 'android-3.0' into android-omap-3.0 f7dfd26 drivers: remoteproc: print traces in a circular way c76946d modem_if: cdma: Set gpio_cp_off high on cbp71_off 248bdff OMAP4: PM: restore the trim settings on OFF deb1c7d misc: omap_temp_sensor: Fix wrong structure pointer. 055652a OMAP: PM: use context lost register to restore context. 18c2cdf OMAP: PM: replace omap_pm_get_dev_context_loss_count with omap_pm_was_context_lost 6d80f8e OMAP4: hwmod: add context lost register address 0294fcf OMAP4: PM: PMIC: register the LP timing 3744190 OMAP4: PM: add clksetup and pmic setup time 03e024f OMAP2+: PM: provide mechanism to describe overall behavior of osc and PMIC. c0972b9 OMAP4: PM: restore GPIO clocks during wake from failed OFF 201a13b OMAP4: serial: enable errata i202 d1e1f35 tty: serial: omap-serial: set RTS bit to active low for all UARTS fc94832 ASoC: ABE HAL: add 450Hz High-pass filter to DL2 EQ b97c507 ASoC: DSP: Add state and hw_params info to debugfs 2705b22 ASoC: DSP: Disambiguate hardware params names 95cf7a1 usb: ehci: make HC see up-to-date qh/qtd descriptor ASAP 9232392 usb: musb: fix context api's a96b2ef usb: musb: omap2+: save and restore OTG_INTERFSEL 17e981d tty: serial: omap-serial: fix UART_EFR handling 7013f49 PM: Backoff suspend if repeated attempts fail ae940f9 OMAP2+: powerdomain: allow drivers to hit OSWR 7767489 OMAP2+: PM: dvfs should only be compiled if CONFIG_PM 31f30b8 OMAP2+: dmtimer: Fix miscompile for !CONFIG_PM 3d823d3 OMAP2+: hwmod: Fix miscompile on emif_clear_irq for non-OMAP4 Change-Id: I2fe63e2d07cfbd142129e55c0b02702629dbb3d9 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | Merge "Add 720p video recording profile for back camera"James Dong2011-09-061-20/+53
|\ \ \
| * | | Add 720p video recording profile for back cameraJames Dong2011-09-011-20/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Reduce the bit rate for 720p videos from 12Mbps to 8Mbps. o Increase the bit rate for audio from 12200bps to 96000bps. The application needs to set 720p as the default camcorder option, which is logged as bug 5141068 Change-Id: Ifd46ac48f3ea13a4fc854da9509e70397108587d related-to-bug: 5248906
* | | | Merge "audio: always use PORT_MM2_UL for capture"Simon Wilson2011-09-061-29/+15
|\ \ \ \
| * | | | audio: always use PORT_MM2_UL for captureSimon Wilson2011-09-061-29/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PORT_VX and PORT_MM2_UL cannot be opened at the same time, and doing so causes loss of audio. When a voice call is taken when a video call is in progress, the modem is opened before the capture stream is ended so the problem occurs. Using PORT_MM2_UL ensures we don't hit this case. Fixes bug 5221406 Change-Id: Id6aa26e5321e74375a51b455aa55723df2287c35
* | | | Update kernel prebuiltBenoit Goby2011-09-061-0/+0
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ba4ade HACK: ehci recovery from port resume failure 7b49f4f HACK: fix ehci suspend/resume failure 1bdd790 modem_if: Avoid unnecessary skb copy 9b9fd85 modem_if: Don't stop the netif queue if send fails 5126485 modem_if: usb_link: supprot force LTE dump 849231b modem_if: usb_link: Set host_actve gpio. 37394e7 modem_if: usb_link: support LTE dump and silent reset when LTE crash c3226c0 modem_if: usb_link: Move the location of Slave wakeup pin control Change-Id: Id71bed69e7b057ace06ee31f2e3c3c381c2c0143
* | | audio HAL: add audio pre processing.Eric Laurent2011-09-062-136/+744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for audio pre processing and echo reference for AEC. Also: - added defines for ABE ports sampling rates - always select sub mic for camcorder and VoIP on speakerphone even if headset with mic is present - change mutex locking order: first hw device then stream. This allows calling functions on active output and input streams without releasing the hw device mutex. Aquiring the hw device mutex systematically in dtream read and write guarantees that a low priority thread waiting on the stream mutex will get it in a timely manner. Change-Id: I4abc9e56b30e7b72109db1961af76c6fd4c03be0
* | | wifi: Calibration file updateDmitry Shmidt2011-09-061-4/+4
| |/ |/| | | | | | | | | | | BUG: b/5167816 Change-Id: I0d9faa3b3367dce855d536f37b0f35224c2aa915 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Merge "audio: specify analog volumes in dB"Simon Wilson2011-09-061-5/+8
|\ \
| * | audio: specify analog volumes in dBSimon Wilson2011-09-061-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change applies conversions so that analog codec volumes can be specified in dB. It also restores the DL2 ABE gain to 0dB now that the ABE kernel code has been patched to prevent speaker distortion. The headset and speaker volumes are adjusted to take this change into account. Change-Id: I5cfe465e30e0c6a2424bd05e4a412eae8d878eba
* | | Update kernel prebuiltDima Zavin2011-09-061-0/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0e831b ARM: omap4: tuna: switch to interactive governor 2344ab9 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 14c65e6 Merge branch 'android-3.0' into android-omap-3.0 e3498e8 Merge branch 'linux-omap-3.0' into android-omap-3.0 3b0b3f6 ARM: omap2: tuna: ensure that touch irq can wake from oswr d37debf HACK: I2C debugging for timeouts 97a6e01 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 f9b6b00 Merge branch 'linux-omap-3.0' into android-omap-3.0 ceac5d2 ARM: omap4: cpuidle: allow all states when both cpus are active 2c780ea ARM: omap4: allow gp timer to be used on both cpus 18b1a24 ARM: omap4: save cpu1 banked gic distributor registers in idle c84e347 ARM: omap4: Allocate unused irqs for use as software triggers 64753a4 netfilter: qtaguid: fix proc/.../stats uid filtered output 86c2485 ASoC: ABE: Set DL1/DL2 gains to -7dB for PDM links Change-Id: Iaebfd28e765aacb2d72a386844acb80b014caa69 Signed-off-by: Dima Zavin <dima@android.com>
* | Merge "tuna: include standalone charger mode support"Dima Zavin2011-09-043-4/+14
|\ \
| * | tuna: include standalone charger mode supportDima Zavin2011-09-023-4/+14
| | | | | | | | | | | | | | | Change-Id: Ib56844c0eda029ed29de28109812646d20727d92 Signed-off-by: Dima Zavin <dima@android.com>
* | | audio: enable sidetone for toro device when using earpieceSimon Wilson2011-09-021-1/+42
|/ / | | | | | | Change-Id: I4ea7f3795ba571fdd395f3fff4cd3e485d0e89a8
* | new kernel prebuiltErik Gilling2011-09-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: ec68dbb Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 3662381 Merge branch 'linux-omap-3.0' into android-omap-3.0 4a90962 gpu: pvr: Update to DDK 1.8@289270 e95ec8a gpu: pvr: Update to DDK 1.8@289037 159c5ee gpu: pvr: Update to DDK 1.8@288777 9e572c4 ASoC: SDP4430: Prevent McASP to send DAPM suspend events 0be8417 Revert "power: max17040: Replace unnecessary TO_FIXED after 16-bit read conversion." 489d0b9 HACK: OMAP: I2C: PM: remove pm-qos constraints for omap44xx 89aec7a power: max17040: Replace unnecessary TO_FIXED after 16-bit read conversion. e547e71 ARM: omap: tuna: Set wifi locale table 757816c power:max17040: Modified the driver to use 16 bits register read/write 81a5e94 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 c43dafa Merge branch 'android-3.0' into android-omap-3.0 e365df0 net: wireless: bcmdhd: Turn Off packet filtering for dhcp session 1b61b28 net: wireless: bcmdhd: Set bigger wakelock timeout for events e2ed1e7 net: wireless: bcmdhd: Update to 5.90.125.74 c71b5e2 net: wireless: bcmdhd: Skip disassoc if country is not changed in country set 8fba1f1 net: wireless: bcmdhd: Use allocation with GFP_ATOMIC only in atomic context Change-Id: I71b91c9872a8e38972860126933e041fc6ba28b5 Signed-off-by: Erik Gilling <konkers@android.com>
* | Revert "audio: change pcm_config_vx channel from 1 to 2"Simon Wilson2011-09-011-1/+1
| | | | | | | | | | | | | | | | | | This change causes bluetooth SCO audio during a call to be unreliable: often there is no call audio. Reverting this causes the downlink (bluetooth earpiece) audio to sound robotic, but the audio is more reliable. This reverts commit 3772f57d8332e7b2113bd35cd297b8fe00d20d15.