summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 56e8b292: am e6f399a5: audio: decrease headset gain by 14dB for ringtone modeUK KIM2011-10-261-0/+3
|\ | | | | | | | | * commit '56e8b292cb2aa15804eb436d48c71e1a98b36550': audio: decrease headset gain by 14dB for ringtone mode
| * am e6f399a5: audio: decrease headset gain by 14dB for ringtone modeUK KIM2011-10-261-0/+3
| |\ | | | | | | | | | | | | * commit 'e6f399a540256c671f638306545b2bc04654a58f': audio: decrease headset gain by 14dB for ringtone mode
| | * audio: decrease headset gain by 14dB for ringtone modeUK KIM2011-10-261-0/+3
| | | | | | | | | | | | | | | | | | This is to prevent audio shock in AUDIO_MODE_RINGTONE. Change-Id: Ic21c347a64ee0e2668dbff49dc6addcb93e4d82f
* | | Merge remote branch 'goog/ics-mr1-plus-aosp'Ed Heyl2011-10-265-7/+2
|\ \ \ | |/ /
| * | fix previous typo/mistake, submit correct kernelEd Heyl2011-10-261-0/+0
| | | | | | | | | | | | Change-Id: Ia70b898c9816d613fae332249c6ffd48df4a626d
| * | ics-mr0 hand merge to avoid conflictsThe Android Automerger2011-10-262-7/+2
| |\ \ | | |/ | | | | | | Change-Id: I220aa41c50473717e8407e43c383fae09cdcf302
| | * Revert "tuna: turn on serial console for non-user builds"Dima Zavin2011-10-251-6/+1
| | | | | | | | | | | | This reverts commit 2fa60e64a290c6c39d23226847f74730608ed72f.
| | * Update kernel prebuiltDima Zavin2011-10-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b6b3b8 ARM: omap4: tuna: enable fiq console in defconfig 19e6e99 ARM: omap4: tuna: disable smart-idle for uart3 51a0d5b ARM: omap4: tuna: move uart3 to fiq debugger cb4c6ea Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 99ae0ab ARM: omap4: check debug uart wake status on i/o pad wakeup 806a6a7 ARM: omap2: fiq_debugger: restore UART state after ctxt lost 31763ea ARM: omap4: add OMAP support for the fiq debugger 7400e81 Merge remote branch 'partner-common/android-3.0' into android-omap-3.0 932de6c ARM: common: fiq_debugger: protect the uart state from the sleep timer f4aea21 ARM: common: fiq_debugger: add suspend/resume handlers efde655 ARM: common: fiq_debugger: add uart_enable/disable platform callbacks 83b7270 ARM: common: fiq_debugger: add non-fiq debugger support b009275 ARM: common: fiq_debugger: peek the 0th char in ringbuf 0d5d8ec ARM: common: fiq_debugger: fix the cleanup on errors in probe 48ef31a ARM: common: fiq_debugger: do not disable debug when console is enabled 626ba34 gp2a: delay first read after light sensor enable ae6fb09 ARM: omap4: tuna: pass the last reset reason to ram console 3a893a6 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 dd75ab2 Merge branch 'linux-omap-3.0' into android-omap-3.0 0312cf6 Merge branch 'android-3.0' into android-omap-3.0 bf94f10 ARM: omap4: resetreason: add newline to end of reset reason string 9e4ee81 ram_console: pass in a boot info string 169c5f0 Revert "omap: dispc: force L3_1 CD to NOSLEEP when dispc module is activ 78793cc ARM: omap4: cpuidle: configure MPU C4 state to CSWR ab1596c ARM: omap4: resetreason: export reset reason string Change-Id: I3505da3c8dea4a977cfb07334ceb6335167499ce Signed-off-by: Dima Zavin <dima@android.com>
| | * Merge "tuna: Raise lowest auto-brightness LCD backlight level from 10 to 16" ↵Todd Poynor2011-10-251-1/+1
| | |\ | | | | | | | | | | | | into ics-mr0
| | | * tuna: Raise lowest auto-brightness LCD backlight level from 10 to 16Todd Poynor2011-10-251-1/+1
| | | | | | | | | | | | | | | | Change-Id: I95f900232136bcba5e5baa888018f452b072274f
| | * | Merge "Revert "Update melfas touch firmware to vers 0x58/0x38."" into ics-mr0Paul Eastham2011-10-252-0/+0
| | |\ \
| | | * | Revert "Update melfas touch firmware to vers 0x58/0x38."Dima Zavin2011-10-252-0/+0
| | | |/ | | | | | | | | | | | | | | | | | | | | Go back to version 0x57/0x37 to work with 60Hz refresh This reverts commit ce92f4bd9aff37d619dabafb8144856ab345fee1.
| | * | New Prime prebuiltPaul Eastham2011-10-251-0/+0
| | |/ | | | | | | | | | | | | | | | 601eb2c Revert "ARM: omap4: tuna: Modify LCD refresh rates to 48hz." Change-Id: I65c90c573077bc444dbfa339a1d94274bea2b2ac
| * | New Prime prebuiltPaul Eastham2011-10-251-0/+0
| | | | | | | | | | | | | | | | | | 601eb2c Revert "ARM: omap4: tuna: Modify LCD refresh rates to 48hz." Change-Id: I65c90c573077bc444dbfa339a1d94274bea2b2ac
| * | Revert "Update melfas touch firmware to vers 0x58/0x38."Dima Zavin2011-10-252-0/+0
| | | | | | | | | | | | | | | | | | Go back to version 0x57/0x37 to work with 60Hz refresh This reverts commit ce92f4bd9aff37d619dabafb8144856ab345fee1.
| * | new kernel prebuiltSimon Wilson2011-10-251-0/+0
| | | | | | | | | | | | | | | | | | b681d90 ARM: omap4: tuna: change adc range of ear key Change-Id: I0c135e4f5881a86b6ef5562dad105f8ef482de4e
| * | tuna: update kernel prebuiltBenoit Goby2011-10-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 83b0809 omap: l3 error: ABE error reporting once 463da08 mfd: omap: fix hostconfig recommended configuration 937ae52 arm: omap4: usb: disable pad wakeups 16063a7 misc: modem_if: link_mipi: Increase write_done timeout Change-Id: I178bd6f3bba5afbc45bb4d806395787d2f3c9e67
| * | tuna: Allow the RIL to control the LTE modem autosuspend modeBenoit Goby2011-10-251-0/+3
| | | | | | | | | | | | Change-Id: Iecf672a25911792acf51b4de08c794f5e8024551
| * | Import revised translations. DO NOT MERGEEric Fischer2011-10-2546-0/+1426
| | | | | | | | | | | | Change-Id: I986b7953c698ddcf820cc8fefe9af62c534603d1
| * | new kernel prebuiltErik Gilling2011-10-251-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 4fbc971 tuna: HWMOD: put usbhost in smart mode only on lte boards 9ed3f2c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 51b9aba Merge branch 'linux-omap-3.0' into android-omap-3.0 b8370af gpu: pvr: Update to DDK 1.8@300406 a2a266f ARM: tuna: pogo: Enable fast charging for pogo Change-Id: I375b4d90d5f6d7970a68ef10716036e64be054e0 Signed-off-by: Erik Gilling <konkers@android.com>
* | | am c24067ee: Update melfas touch firmware to vers 0x58/0x38.Dima Zavin2011-10-260-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit 'c24067ee08160752de7b187cdf747459d0bf6ebd': Update melfas touch firmware to vers 0x58/0x38.
| * | Update melfas touch firmware to vers 0x58/0x38.Dima Zavin2011-10-252-0/+0
| | | | | | | | | | | | | | | | | | | | | Updates due to change of LCD frequency was made (48Hz vs 60Hz) Change-Id: Ifdd322e20eba7062c43c19effbd7d3b6e7b24b25 Signed-off-by: Dima Zavin <dima@android.com>
* | | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-263-8/+8
| | | | | | | | | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: Iab0aa050fba57491f5cb7ed928f44a0fda7d1ea4
* | | Merge "Import revised translations."Eric Fischer2011-10-2546-0/+1426
|\ \ \
| * | | Import revised translations.Eric Fischer2011-10-2546-0/+1426
| |/ / | | | | | | | | | Change-Id: Ibf86d9bbbf2d9c13fa6dc927f93496bcc3a00f04
* | | am cef19c20: new kernel prebuiltSimon Wilson2011-10-241-0/+0
|\ \ \ | | |/ | |/| | | | | | | * commit 'cef19c208dd055c5302b089357146dfd21321f89': new kernel prebuilt
| * | new kernel prebuiltSimon Wilson2011-10-241-0/+0
| | | | | | | | | | | | | | | | | | b681d90 ARM: omap4: tuna: change adc range of ear key Change-Id: I0c135e4f5881a86b6ef5562dad105f8ef482de4e
* | | am 27e5efe5: tuna: update kernel prebuiltBenoit Goby2011-10-241-0/+0
|\ \ \ | |/ / | | | | | | | | | * commit '27e5efe5ea72fecd13a9760beb4dee1344ca7fea': tuna: update kernel prebuilt
| * | tuna: update kernel prebuiltBenoit Goby2011-10-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 83b0809 omap: l3 error: ABE error reporting once 463da08 mfd: omap: fix hostconfig recommended configuration 937ae52 arm: omap4: usb: disable pad wakeups 16063a7 misc: modem_if: link_mipi: Increase write_done timeout Change-Id: I178bd6f3bba5afbc45bb4d806395787d2f3c9e67
* | | am 8d77c1ca: Merge "tuna: Allow the RIL to control the LTE modem autosuspend ↵Benoit Goby2011-10-241-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | mode" into ics-mr0 * commit '8d77c1ca7bb8691aba1a1fe72918f665a1118f7c': tuna: Allow the RIL to control the LTE modem autosuspend mode
| * | Merge "tuna: Allow the RIL to control the LTE modem autosuspend mode" into ↵Benoit Goby2011-10-241-0/+3
| |\ \ | | | | | | | | | | | | ics-mr0
| | * | tuna: Allow the RIL to control the LTE modem autosuspend modeBenoit Goby2011-10-241-0/+3
| | | | | | | | | | | | | | | | Change-Id: Iecf672a25911792acf51b4de08c794f5e8024551
* | | | am db94b2f0: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-10-240-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into ics-mr0 * commit 'db94b2f0562c39f54b95bfdbb09f8e828cd436b8': Import revised translations. DO NOT MERGE
| * | | Merge "Import revised translations. DO NOT MERGE" into ics-mr0Eric Fischer2011-10-2446-0/+1426
| |\ \ \ | | |/ / | |/| |
| | * | Import revised translations. DO NOT MERGEEric Fischer2011-10-2446-0/+1426
| | | | | | | | | | | | | | | | Change-Id: I986b7953c698ddcf820cc8fefe9af62c534603d1
* | | | am 0578a50a: new kernel prebuiltErik Gilling2011-10-241-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '0578a50aba2f274c8b2b8b604fa767a519e24736': new kernel prebuilt
| * | | new kernel prebuiltErik Gilling2011-10-241-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 4fbc971 tuna: HWMOD: put usbhost in smart mode only on lte boards 9ed3f2c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 51b9aba Merge branch 'linux-omap-3.0' into android-omap-3.0 b8370af gpu: pvr: Update to DDK 1.8@300406 a2a266f ARM: tuna: pogo: Enable fast charging for pogo Change-Id: I375b4d90d5f6d7970a68ef10716036e64be054e0 Signed-off-by: Erik Gilling <konkers@android.com>
* | | | am ce92f4bd: Update melfas touch firmware to vers 0x58/0x38.Dima Zavin2011-10-242-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit 'ce92f4bd9aff37d619dabafb8144856ab345fee1': Update melfas touch firmware to vers 0x58/0x38.
| * | Update melfas touch firmware to vers 0x58/0x38.Dima Zavin2011-10-242-0/+0
| |/ | | | | | | | | | | | | Updates due to change of LCD frequency was made (48Hz vs 60Hz) Change-Id: Ifdd322e20eba7062c43c19effbd7d3b6e7b24b25 Signed-off-by: Dima Zavin <dima@android.com>
* | am 3560dab3: new kernel prebuiltErik Gilling2011-10-231-0/+0
|\ \ | |/ | | | | | | * commit '3560dab3350a6f88d54a790798832ecb0c5a4d54': new kernel prebuilt
| * new kernel prebuiltErik Gilling2011-10-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | includes: d055246 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 3974beb Merge branch 'linux-omap-3.0' into android-omap-3.0 17a9d77 OMAP4: HDCP: Fix crash on cancel_delayed_work 75bfe07 OMAP4: HDMI: Audio: poll HDMI display before returning error 9b837e4 OMAP4: HDMI: Check AKSV registers before resetting HDMI Wrapper Change-Id: Ie829f9ff34fe0dab3559d886cf3c77ebea1d8202 Signed-off-by: Erik Gilling <konkers@android.com>
* | am 109b6a0d: tuna: update kernel prebuiltBenoit Goby2011-10-231-0/+0
|\ \ | |/ | | | | | | * commit '109b6a0d8f3e046635896fcd41361d538f8277d8': tuna: update kernel prebuilt
| * tuna: update kernel prebuiltBenoit Goby2011-10-231-0/+0
| | | | | | | | | | | | | | | | 417e65a HACK: modem_if: usb link : Modem silent reset when usb is disconnected for long time 3e47546 HACK: modem_if: usb: Force enumeration if modem is not responding 43e5cc5 omap: usb-dpll: enable extra logging Change-Id: Ic7d6c2929c5ba718ef89487de2912326f992083d
* | am ad7abefb: tuna: update kernel prebuiltBenoit Goby2011-10-231-0/+0
|\ \ | |/ | | | | | | * commit 'ad7abefbf535cad6e6bc588e3f1f061900a3a52d': tuna: update kernel prebuilt
| * tuna: update kernel prebuiltBenoit Goby2011-10-221-0/+0
| | | | | | | | | | | | | | | | | | ade2079 omap: ehci: fix system wide suspend 6d99f12 OMAP4: HWMOD: put usbhost in smart mode when suspended 8dcf89e gp2a: report light sensor value on enable e3b9596 ARM: omap4: tuna: update hw revision names Change-Id: Ib7bf00c751b7e5f7179dfbc43da43a96131984cc
* | am 216ccd57: Merge "SensorHAL: clear previous light value on enable" into ↵Arve Hjønnevåg2011-10-212-0/+9
|\ \ | |/ | | | | | | | | | | ics-mr0 * commit '216ccd5723f5a5674d7b0c5821477bf5289e2e6e': SensorHAL: clear previous light value on enable
| * Merge "SensorHAL: clear previous light value on enable" into ics-mr0Arve Hjønnevåg2011-10-212-0/+9
| |\
| | * SensorHAL: clear previous light value on enableVishnudev Ramakrishnan2011-10-212-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sensor HAL changes to make light sensor value to be reported on enabling light sensor. - Ignore the dummy initial value -1 that is pushed by driver - Set previous light value to -1 on enable Change-Id: Iaa64fb02f4b82339ba96146d170ca447f409a5ad Signed-off-by: Vishnudev Ramakrishnan <vramakri@sta.samsung.com>
* | | am 309c0d36: SMC: Run tf_daemon and smc_pa_ctrl as drmrpcJeffrey Tinker2011-10-212-4/+8
|\ \ \ | |/ / | | | | | | | | | * commit '309c0d366d74035bbc3fca8a387a3326b2937513': SMC: Run tf_daemon and smc_pa_ctrl as drmrpc
| * | SMC: Run tf_daemon and smc_pa_ctrl as drmrpcJeffrey Tinker2011-10-212-4/+8
| | | | | | | | | | | | Change-Id: I220489731d5bd457f3db69156bb54b7caa3e452b