summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tuna: create a symlink for hdcp_keysDima Zavin2011-10-112-2/+23
| | | | | Change-Id: I3c42817cfcd581d211c29e756285cb7db0a14f7d Signed-off-by: Dima Zavin <dima@android.com>
* tuna: update kernel prebuiltColin Cross2011-10-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d60771f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 bbb9f81 Merge branch 'linux-omap-3.0' into android-omap-3.0 c71e41e OMAP4: sram: Mapping 4K of Public internal memory to kernel a2a27f5 OMAP:DSS2: Fix FIFO threshold calculation 0e9302d OMAP DSS: FIFO Threshold Optimization 37824f0 OMAP4: DSS: Enable bufferfilling by default bd21a9f omap: dispc: force L3_1 CD to NOSLEEP when dispc module is active. 6e60e1a ARM: omap4: tuna: enable HDCP in defconfig 9b890e1 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 1185a83 Merge branch 'linux-omap-3.0' into android-omap-3.0 0d028b7 OMAP4: HDCP: clean up debugging output 374f46d OMAP4: HDCP: Add menuconfig option for HDCP 5d81717 OMAP4: HDCP: Change authentication sequence and DDCTimeout values b617ff2 OMAP4: HDMI: Load HDCP keys before HDMI power on Notification d493e54 OMAP4: HDCP: use request_firmware to load keys 4c71791 omap4: HDCP: Add support for omap4_secure_dispatch call cc029a1 OMAP4: HDCP: Register as misc device fbb2654 OMAP4: HDCP: Add interrupt handling to enable HDCP authentication 70469ed OMAP4: HDCP: Add support for HDCP in OMAP4 driver afb47e8 ASoC: OMAP: HDMI: Set audio configuration after power ON event 4a15a2c OMAP4: HDMI: Workaround: wait for audio to be off before cutting PHY power c4fb6d1 OMAP4:HDMI: Add power off/on notification during HDMI reconfiguration db4462a OMAP3+: PM: VP: control log for forceupdate failure 96d2281 OMAP3+: PM: VP: additional information for tracing issues 11673a7 OMAP3+: PM: VP: check to ensure VP is idle before forceupdate 2bbb1ca OMAP: DSS: panel-s6e8aa0: elvss pulse use only 0-4bits in D1h 3rd parameter. 808183a OMAP3+: PM: VP: ensure VP is idle before disable Change-Id: I816ddea6683a53c294b08137ac8ec9f757157c48
* Reconcile with ics-factoryrom-releaseThe Android Open Source Project2011-10-100-0/+0
|\ | | | | | | Change-Id: Ieb6301c61e3b3662904bea154043c3717fea2d3e
| * merge in ics-factoryrom-release history after reset to ics-factoryromThe Android Automerger2011-10-090-0/+0
| |\
* | \ Merge "silence sensor HAL"Mathias Agopian2011-10-101-2/+3
|\ \ \
| * | | silence sensor HALMathias Agopian2011-10-101-2/+3
| | | | | | | | | | | | | | | | Change-Id: I2a2382a73ff6615cc1148ec838fa188964a9d1d4
* | | | am 01268b43: (-s ours) New Prime prebuilt for factoryromPaul Eastham2011-10-100-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '235c4e5e1a04e15524529b0f0ddcb431ad753509': New Prime prebuilt for factoryrom
| * | | New Prime prebuilt for factoryromPaul Eastham2011-10-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b96c09 usb: core: respect the NO_RESET_RESUME quirk f7b7095 usb: ehci: omap4xx: re-enumeration workaround refined 67a1b70 usb: ehci-omap: implement ulpi helpers Change-Id: If40351b78df2f94f7b62d553aa13077295ebc8b9
* | | | Merge "audio: bypass resampler for HDMI audio"Simon Wilson2011-10-101-22/+32
|\ \ \ \
| * | | | 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
* | | | | new kernel prebuiltErik Gilling2011-10-100-0/+0
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 23506ba Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 513de6f Merge branch 'linux-omap-3.0' into android-omap-3.0 ca39a04 gpu: pvr: Update to DDK 1.8@295945 eaa8d0e ARM: omap4: tuna: change adc range of 3 way buttons. 56670ae OMAP4: temp_sensor: Update T_SHUT temperature value to 110C d48af24 mfd: twl6030 madc: disable when not in use 2cfe356 ARM: omap4: tuna: Add support for POGO detection Change-Id: I627dbd951d6247b5c04e853dc42d6ec453db0c4f Signed-off-by: Erik Gilling <konkers@android.com>
* | | | require new bootloader PRIMEKJ02Ed Heyl2011-10-101-1/+1
| | | | | | | | | | | | | | | | Change-Id: I72cb1f7ee575ef624099633748317f06dca79b57
* | | | tuna: enable off mode based on propertyColin Cross2011-10-091-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If property persist.sys.tuna.off_mode is 1, enable off mode. To enable off mode: adb root adb shell setprop persist.sys.tuna.off_mode 1 Change-Id: I01ce285dd2bd42b41b0432e142a6d63442ca7479
* | | | Updated kernel prebuiltColin Cross2011-10-090-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffc2b67 ASoC: Tuna: Enable/disable TWL6040 external 32kHz clock 8e59ea2 OMAP4: tuna: Add CLK32KAUDIO supply for TWL6040 e6df33d ARM: omap4: tuna: hold clk32kaudio for BT b170253 ARM: omap: tuna: enable/disable clk32kaudio for wlan b687b8f Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 790a509 Merge branch 'android-3.0' into android-omap-3.0 1cd3de1 Merge branch 'linux-omap-3.0' into android-omap-3.0 4e93124 regulator: TWL6030: add clk32kaudio as regulator 9cbcbe7 usb: core: respect the NO_RESET_RESUME quirk bc90e68 usb: ehci: omap4xx: re-enumeration workaround refined f034a16 usb: ehci-omap: implement ulpi helpers 8493beb netfilter: xt_qtaguid: fix crash on ctrl delete command 1c7f07e ASoC: ABE HAL: Use second-order filter for DL2EQ 450Hz HP profile 3bc18c7 bridge: Have tx_bytes count headers like rx_bytes. Change-Id: I25a535c2435018bab93a23f7dbabde9edc49eb85
* | | | am 8ab85c13: Merge "Update melfas firmware to versions 0x34/0x54." into ↵Dima Zavin2011-10-090-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | ics-factoryrom * commit '637be352bc012bb7acdb8d51d3f9db6c621e7076': Update melfas firmware to versions 0x34/0x54.
| * | | Merge "Update melfas firmware to versions 0x34/0x54." into ics-factoryromDima Zavin2011-10-092-0/+0
| |\ \ \
| | * | | Update melfas firmware to versions 0x34/0x54.Dima Zavin2011-10-072-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug that can cause 'missing reference value track'. i.e. firmware loses tracking and gives a touch on still. The bug could have produced a touch fail on thermal variation or long term usage without putting TSP into sleep mode / wake up. Change-Id: I47ff95ac1b552c3af6e37a929b64b60fc3e818a9 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | Update melfas firmware to versions 0x34/0x54.Dima Zavin2011-10-092-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a bug that can cause 'missing reference value track'. i.e. firmware loses tracking and gives a touch on still. The bug could have produced a touch fail on thermal variation or long term usage without putting TSP into sleep mode / wake up. Change-Id: Ieee26f7e2aae12ab826048f55ed8232c1dd590c5 Signed-off-by: Dima Zavin <dima@android.com>
* | | | | Create /data/smc directory on startupJeff Tinker2011-10-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4598045 Implementing secure video path on TI OMAP4 chip for ICS Change-Id: I7c81044ffefd48ac3b7c0d1b46990ef5b9ed6106
* | | | | Merge "Load the smc pa, start the daemon and set driver permissions."Jeff Tinker2011-10-072-2/+18
|\ \ \ \ \
| * | | | | Load the smc pa, start the daemon and set driver permissions.Jeff Tinker2011-10-072-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 4598045 Implementing secure video path on TI OMAP4 chip for ICS Change-Id: I010ab638daf3630a3765cbe41b671c95a3f8bea5
| * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| |\ \ \ \ \
| | * | | | | new kernel prebuiltErik Gilling2011-10-050-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>
| | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | |\ \ \ \ \
| | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-040-0/+0
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-10-030-0/+0
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-290-0/+0
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-270-0/+0
| | | | | | | | | |\ \ \ \ \
| | | | | | | | | | * | | | | new kernel prebuiltErik Gilling2011-09-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: 28c3bdb Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 80ec707 Merge branch 'linux-omap-3.0' into android-omap-3.0 7a5ba47 gpu: pvr: Update to DDK 1.8@293295 c9704e9 modem_if: Fix kernel panic on shutdown 3473bd3 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 e977725 Merge branch 'linux-omap-3.0' into android-omap-3.0 8d4037e gpu: pvr: backport bugfixes from DDK 1.8@293295 7716bb1 OMAP4: HSI: Fix missign break; setting HSI in 3-wires mode 35c3f59 misc: modem_if: mipi_link: Remove ioctl 'HSI_IOCTL_SET_ACREADY_NORMAL' f3e62dc modem_if: usb_link: Retry pm_request_autosuspend if it fails 18dd861 power: max17040: Don't report bad data on I2C read error cd0bf5b watchdog: omap_wdt: use touch_watchdog_notifier_head to pet watchdog 62fc976 ARM: add touch_nmi_watchdog 9165044 modem_if: Change lte state to CRASHED if modem is not responding bccab2f Revert "HACK: modem_if: usb: Force enumeration if modem is not responding" 7f57858 ARM: omap4: tuna: turn off lock debugging 0412c1e ARM: omap4: tuna: enable SLUB_DEBUG Change-Id: Iabd4a8ef690cbbbf83ebfc4c6c3c17fa09886c9a Signed-off-by: Erik Gilling <konkers@android.com>
| | | | | | | | | | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-260-0/+0
| | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-190-0/+0
| | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | * \ \ \ \ merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | * | | | | New Prime prebuilt kernelThe Android Automerger2011-09-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ac088f4 usb: core: Add NO_RESET_RESUME quirk 5fd7cb8 ARM: omap4: tuna: do not use twl6030 poweroff 4126e1e omap4: tuna: Add boot flag to enter the charging mode. 37c64c7 misc: modem_if: Fix missing sk buff free f860da7 misc: modem_if: Change ip checksum to 'CHECKSUM_NONE' Change-Id: I70b60a4d077d2eb87fc48d13a8853d702cc62e74 Conflicts: kernel
| | | | | | | | | | | | | | | | | * | | | | Move crypto key storage location for Prime off of /efsKen Sumrall2011-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /efs is changing to a read-only filesystem, so the risk of corrupting factory calibration data is much less. That means the key storage for encryption must move. A new bootloader has taken 64 kbytes from the recovery partition and made it into a new metadata partition. There is no filesystem on it, the keys are being stored directly on the block device. Change-Id: Ide27c72cc232949e11f190abedd9ae7342b00142
| | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | * | | | | Updated kernel prebuiltColin Cross2011-09-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e4e0b0d Revert "gpu: pvr: Remove PVR_NO_FULL_CACHE_OPS" a84a792 misc: fsa9480: add suspend/resume handlers Change-Id: I2af57bd8abab06a8d4d7d4b55dbc07ac9c7a4fa6
| | | | | | | | | | | | | | | | | | * | | | | new kernel prebuiltErik Gilling2011-09-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | includes: bea4fd0 TUNA:HDMI: set hpd_gpio and max pixel clock via board file. 09e0597 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 aa84b4b Merge branch 'linux-omap-3.0' into android-omap-3.0 4233d79 OMAP:DSS:HDMI: Support most CEA modes 612feaf video: fbmon: Add support for CEA pixel ratios. 825b424 video: fbmon: add remaining modes to CEA mode database 211745b OMAP:DSS2: Fix FIFO threshold calculation 10065b1 OMAP:DSS:HDMI: Use device info to set hpd gpio and max pixel clock dd4befc OMAP:DSS:DSSCOMP: Fix potential stack corruption in DSSCOMP_QUERY_DISPLAY ioctl 1135014 OMAP:DSS:DSSCOMP: use gralloc_queue for ProcessFlipV1 as well. 5bdae91 OMAP:DSS:DSSCOMP: Serialize gralloc_queue 6a6f20b omap4: remoteproc: free wdt interrupt when remoteproc is stopped df4c73a omap: mbox: save, restore and off support d0938b1 remoteproc: fix section-size check 60cfd67 omap4: remoteproc: call rproc mailbox put/get upon activate/deactivate 21d7d39 omap4: rpmsg: restart rpmsg mailbox upon suspend/resume notifications Change-Id: I5e7c6b1b5c0afef31e4c6856bbbf47f5b537fbe2 Signed-off-by: Erik Gilling <konkers@android.com>
| | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | * | | | | audio: reduce sidetone volume by 6dBSimon Wilson2011-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cross-dependency on kernel change: I4b85eebf18e99b106816131bd927cf0962055dcd The earpiece volume has been increased by 6dB because of dynamic route gain adjustment, so the sidetone gain must be decreased by the same amount otherwise there is too much feedback and we are outside specification. Change-Id: I6b268105553ab68e9b0e9f18d41c018823d1e6cb
| | | | | | | | | | | | | | | | | | | * | | | | Update kernel prebuiltDima Zavin2011-09-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50e5262 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 1cb2397 Merge branch 'linux-omap-3.0' into android-omap-3.0 62ad2a2 ARM: omap4: tuna: modify 'dsi_pll_regm' value for improve the gps perfor b8169e9 ASoC: SDP4430: Pass DL1 active output to ABE DAI driver ee1b9c7 ASoC: OMAP ABE: Adjust DL1 gains dynamically per output 708a6c6 ASoC: core: Search CODEC in a SoC card a4b885b ASoC: DAPM: Allow reading DAPM widget power state 90916a5 ASoC: DAPM: Add card stream event notification c156ddf ASoC: ABE: Move the enabling of the IO task for the Frontends. 145dbf8 ASoC: ABE: Update location of ABE monitoring function. ca8467b Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 28345fc Merge branch 'linux-omap-3.0' into android-omap-3.0 111e67f OMAP4: tuna: Add functions for applying the concept of charge. 45a57b0 power: max17040: Add Discharging, Recharging concept. cc73758 usb: musb: omap2430: process all otg events, not just the latest one e532f02 usb: musb: omap2+: fix cleanup on errors in init and in exit 051f471 OMAP4 Tuna Display: Enable Writeback Buffer usage for GFX Fifo 702f77c Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 61fd799 Merge branch 'linux-omap-3.0' into android-omap-3.0 6f82103 OMAP DSS: GFX pipeline to use WB DDMA buffers 0e4aad9 OMAP DSS: FIFO Threshold Optimization 379710b OMAP4: twl6030: Add set_suspend_enable/disable callback function of regu 0211c9f ARM: omap4: tuna: wakeup NFC uart on pn544 gpio a9d77ea misc: inv_mpu: yas530.c: Fix noisy performance. Change-Id: Ia3bfda758fa3cc14116770ccbcf3a7eb77f03bc8 Signed-off-by: Dima Zavin <dima@android.com>
| | | | | | | | | | | | | | | | | | | * | | | | 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
| | | | | | | | | | | | | | | | | | | * | | | | merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | * | | | | new kernel prebuiltSimon Wilson2011-09-120-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