summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audio: bypass resampler for HDMI audioSimon Wilson2011-10-061-22/+32
| | | | | | | Native 44.1kHz will be used for HDMI audio since the output device supports it. Change-Id: I60eebf2556c0384e2a4c21150bee2fbbbd5ca6fd
* audio: add locks, only tear down PCMs when needed for WB AMRSimon Wilson2011-10-061-5/+10
| | | | Change-Id: I03ba325b613aef21dba8d16187aaccca08d2a328
* am fcb204e9: Merge "Fix issue 5415809: increase HP volume for TTY." into ↵Simon Wilson2011-10-061-9/+18
|\ | | | | | | | | | | | | ics-factoryrom * commit 'fcb204e9329241047ed7564c4808440f62a5c580': Fix issue 5415809: increase HP volume for TTY.
| * Merge "Fix issue 5415809: increase HP volume for TTY." into ics-factoryromSimon Wilson2011-10-061-9/+18
| |\
| | * Fix issue 5415809: increase HP volume for TTY.Eric Laurent2011-10-061-9/+18
| | | | | | | | | | | | | | | | | | | | | Increase headphones volume to -2dB when TTY mode is full or VCO as per Samsung's request. Change-Id: I92da179b487c87d07bc363f7344c20cc8779abd6
* | | am d0e69596: (-s ours) tuna: update kernel prebuiltBenoit Goby2011-10-060-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'd0e6959653ca7f1ef05f2d50b65f43d0f2a8c41a': tuna: update kernel prebuilt
| * | tuna: update kernel prebuiltBenoit Goby2011-10-061-0/+0
| | | | | | | | | | | | | | | | | | | | | bef91a7 usb: musb: Handle short packet for mode1 RX path 1bfb933 usb: musb: Correct the sequence for DMAENAB/DMAMODE for mode1 RX Change-Id: Ia349e5d4f704a09de5249b71ed99712f38c5d628
* | | new kernel prebuiltErik Gilling2011-10-061-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 113a9d8 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 733dd3f Merge branch 'linux-omap-3.0' into android-omap-3.0 f48f142 OMAP: DSS: Reduce blockiness when upscaling ee54593 OMAP: DSS: Use device's pixel clock for non-LCD displays f6854c1 OMAP: DSS: Add scaling clock requirements for OMAP4 ES2+ f763a47 OMAP:DSS: Use 5-tap filter always for OMAP4 fd004a8 OMAP: DSS: Improve scaling quality 5ef6852 OMAP4: DSS: HDMI: Handle sync lost errors for TV 002e75c OMAP: DSS: Fix ignoring first sync loss 0e11c5b OMAP:DSS: SW workaround for HW scaler overread issue Change-Id: I81da724aaec9861b871d8f03ebd9d70cefd2b5f3 Signed-off-by: Erik Gilling <konkers@android.com>
* | | Merge "audio: route to S/PDIF when digital dock detected"Simon Wilson2011-10-061-6/+16
|\ \ \
| * | | audio: route to S/PDIF when digital dock detectedSimon Wilson2011-10-051-6/+16
| | | | | | | | | | | | | | | | Change-Id: Ia571fca8e0ce384283a15024b6b271231bf86479
* | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-060-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Id2c4ae5df2150fb1d72dbd8ffe4701a0ca4c57fc
| * \ \ \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-060-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
* | | | | am e6609602: tuna: updated kernel prebuiltBenoit Goby2011-10-051-0/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit 'e6609602e9187f7b50fecf585a1dc317a234d1f1': tuna: updated kernel prebuilt
| * | | tuna: updated kernel prebuiltBenoit Goby2011-10-051-0/+0
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5279677 usb: ehci: omap4xx: fix resume failure cd5cae9 ARM: omap4: tuna: Update gamma table for sm2 panel 418d70c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 903e0b9 Merge branch 'linux-omap-3.0' into android-omap-3.0 c19c3ff Merge branch 'android-3.0' into android-omap-3.0 9061443 tuna: twl6030 adc: Enable ADC channel 1 for battery temperature d5ec0a1 mfd: twl6030 adc: Fix crash on I2C error at boot cedc991 OMAP4: PM: dont suspend if any devices were scaling 52095fa OMAP3+: PM: DVFS: Add api to check if any device is scaling c94ee12 OMAP4: HSI: retry omap_device_scale until PM ready Change-Id: I6dbf92d0f0063a175b325851a444359b76d7f725
* | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-050-0/+0
|\ \ \ | | |/ | |/| | | | Change-Id: Ia8602a944a5f5ccdbfcddd0ab09ae783db03814d
| * | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-050-0/+0
| |\ \ | | |/ | |/|
| | * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-050-0/+0
| | |\
* | | \ am f30bf3a7: new kernel prebuiltErik Gilling2011-10-051-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'f30bf3a794ef2ffdd3559f6c29cb67dffceb0eb7': new kernel prebuilt
| * | | new kernel prebuiltErik Gilling2011-10-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 9ef8e73 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 358571d Merge branch 'linux-omap-3.0' into android-omap-3.0 a0628c5 gpu: pvr: Update to DDK 1.8@295231 1209d9c net: wireless: bcmdhd: Fix event thread termination in case of empty queue 4bbb273 ARM: omap4: tuna: configure volume keys as wakeup capable be538f9 misc: modem_if: Remove adding useless packet size 9440fab omap_hsi: Don't make /sys/kernel/debug/hsi/*/counters world writable Change-Id: Ic57ff48ad675a6e6c19d25dd06d43610c4b8a825 Signed-off-by: Erik Gilling <konkers@android.com>
* | | | audio HAL: fix echo reference.Eric Laurent2011-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The number of frames written to the echo reference buffer in out_write() was wrong. As we write frames at the audioflinger sampling rate we should write the number of frames passed to out_write(), not the number of frames passed to tynialsa after resamopling. Change-Id: Ia6a1c7e090c73e1566634a17b720e1e6049b22fe
* | | | audio HAL: fix start_call() error handling.Eric Laurent2011-10-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of an error when opening the modem pcm driver in start_call(), the order in which the tinyalsa pcm streams were relased was wrong and could cause calling pcm_close() on a null pcm stream. Change-Id: Iad7149997d3993561f4a3ed4b2005f5867b51c56
* | | | Fix the output format for 3gpp MMS videoJames Dong2011-10-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia78509e7277584cb30661ef90870b066cffed253 related-to-bug: 1659270
* | | | am 8670ec6f: require PRIMEKJ01Ed Heyl2011-10-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8670ec6ffe65b170bac14a35fb70a8122f6728b1': require PRIMEKJ01
| * | | require PRIMEKJ01Ed Heyl2011-10-051-1/+1
| |/ / | | | | | | | | | Change-Id: Ifa944f6743e696442b745e2f59bf1046999da70a
* | | am 027a1b6e: tuna: update kernel prebuiltColin Cross2011-10-051-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '027a1b6e9a501cc35864d4cfe69864b7b15e6372': tuna: update kernel prebuilt
| * | tuna: update kernel prebuiltColin Cross2011-10-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25308b2 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 1546e8d Merge branch 'linux-omap-3.0' into android-omap-3.0 dbf5d20 Merge branch 'android-3.0' into android-omap-3.0 78dadb0 Revert "OMAP4: DSS: Enable bufferfilling by default" e2eda96 Revert "OMAP DSS: FIFO Threshold Optimization" 8b807b6 Revert "OMAP:DSS2: Fix FIFO threshold calculation" 183a1fc input: evdev: do not block waiting for an event if fd is nonblock 587b1eb input: evdev: if no events and non-block, return EAGAIN not 0 4873193 input: evdev: only allow reading events if a full packet is present Change-Id: Ic9c71173d53758a71c91cc65b0939d444fb05aa1
* | | am aa1f82f6: tuna: set maximum screen off cpu frequency to 700MHzColin Cross2011-10-041-0/+3
|\ \ \ | |/ / | | | | | | | | | * commit 'aa1f82f6ae4a6d4535406d398b1c73a18a319300': tuna: set maximum screen off cpu frequency to 700MHz
| * | tuna: set maximum screen off cpu frequency to 700MHzColin Cross2011-10-041-0/+3
| | | | | | | | | | | | | | | | | | | | | Cap the maximum screen off cpu frequency at 700MHz to reduce power usage during events that wake the device from suspend. Change-Id: I83462383759d330cad616f4ec14a0c9d20df7a3f
* | | am 83a662f7: tuna: updated kernel prebuiltColin Cross2011-10-041-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '83a662f7f9d465b309b5e7b173497688d847406d': tuna: updated kernel prebuilt
| * | tuna: updated kernel prebuiltColin Cross2011-10-041-0/+0
| | | | | | | | | | | | | | | | | | e4c5736 ARM: omap2+: cpufreq: Allow lower maximum frequency when screen is off Change-Id: I3c1bcff0f64325b045d4cd1d93049d5154b9634e
* | | Merge "Bug 5389244 - Reduce system UI vibration duration"Adam Powell2011-10-041-0/+5
|\ \ \
| * | | Bug 5389244 - Reduce system UI vibration durationAdam Powell2011-10-041-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | A kinder, gentler system UI. Change-Id: Ib9b85b04dadac274c4f8dbe928ec6414de000fdd
* | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-040-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: Ibedaa00d7f6fda5ec26787cb660209ed912f2755
| * | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-040-0/+0
| |\ \ \ | | |_|/ | |/| |
* | | | Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-040-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: I23708d64d08e6e803894b176c56e18b9d4181af2
| * | | merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-030-0/+0
| |\ \ \
| | * \ \ merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-030-0/+0
| | |\ \ \
* | | \ \ \ am a1837fb4: new kernel prebuiltErik Gilling2011-10-041-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit 'a1837fb44979a05629fca95ea8a8d3c03360303f': new kernel prebuilt
| * | | | | new kernel prebuiltErik Gilling2011-10-041-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: eae5bca Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 76d0689 Merge branch 'linux-omap-3.0' into android-omap-3.0 89cab1b gpu: pvr: Update to DDK 1.8@294981 16ec285 OMAP: DSS: Assign overlays only to the default display Change-Id: I5b6e5ae2922bd7226615bd21b63efd556a9f02fb Signed-off-by: Erik Gilling <konkers@android.com>
* | | | | | am 2b4009c9: Merge "tuna: update kernel prebuilt" into ics-factoryromBenoit Goby2011-10-041-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | * commit '2b4009c9a68d76c59ef40e578f763781ba7e2c77': tuna: update kernel prebuilt
| * | | | Merge "tuna: update kernel prebuilt" into ics-factoryromBenoit Goby2011-10-041-0/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | tuna: update kernel prebuiltBenoit Goby2011-10-041-0/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | 1c66adf modem_if: usb_link: Process urbs that complete with status -ENOENT Change-Id: I40f337bcfb66c3b3b255c73506e07148e7b27af1
* | | | am cbb5f293: Merge "Set PhaseBeam as default live wallpaper on Tuna" into ↵Justin Ho2011-10-031-0/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | ics-factoryrom * commit 'cbb5f2935d82264f3f06c3e59a656c1ff527ffed': Set PhaseBeam as default live wallpaper on Tuna
| * | | Merge "Set PhaseBeam as default live wallpaper on Tuna" into ics-factoryromJustin Ho2011-10-031-0/+4
| |\ \ \ | | |/ / | |/| |
| | * | Set PhaseBeam as default live wallpaper on TunaJustin Ho2011-10-031-0/+4
| | | | | | | | | | | | | | | | Change-Id: Iffc1192ff7e6178413e288c7467230675800e1ae
* | | | am e01a6076: tuna: update kernel prebuiltColin Cross2011-10-031-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'e01a60760d034d057a2d63de160e8d63e1d81b7d': tuna: update kernel prebuilt
| * | | tuna: update kernel prebuiltColin Cross2011-10-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df73564 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 b600f95 Merge branch 'linux-omap-3.0' into android-omap-3.0 6e2584c OMAP: L3 STD exhaustive debug 6e3710f OMAP4: Fix reg offsets for CLK2 domain d2c43c1 OMAP:DSS2: Fix FIFO threshold calculation Change-Id: I977d1404ebd2957ef04d839b21481225fc17ed42
* | | | am 075cfe0b: tuna: update kernel prebuiltBenoit Goby2011-10-031-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '075cfe0bd2c48543f5f474841bb169b6d3fc12e6': tuna: update kernel prebuilt
| * | | tuna: update kernel prebuiltBenoit Goby2011-10-031-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | d8229d6 modem_if: usb_link: Support silent reset when dumpmode on / off Change-Id: I480e1376aece412ad3dd9a68484b7a7467c5aa32
* | | | am 92de51ed: tuna: update kernel prebuiltColin Cross2011-10-031-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '92de51ed086768657027f3bc37dc7fed43986b5a': tuna: update kernel prebuilt