summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tuna: update media profilesIliyan Malchev2011-07-121-8/+244
| | | | | Change-Id: I927d5cc0165b7e07850f5c5e520d383a0985e18c Signed-off-by: Iliyan Malchev <malchev@google.com>
* Merge "audio: add support for multiple output devices"Simon Wilson2011-07-121-128/+51
|\
| * audio: add support for multiple output devicesSimon Wilson2011-07-121-128/+51
| | | | | | | | Change-Id: I3cc1d6bd414301e82002153c08fa530c31527e48
* | Tuna kernel prebuiltBenoit Goby2011-07-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | 25f1ad3 omap_hsi: HACK: Don't use runtime pm 8e37445 ARM: omap4: tuna: enable fast charge on AC charger c74354b ARM: omap: tuna: add fsa9480 to defconfig 19840b9 ARM: omap4: tuna: use otg event notifications for pda_power 67cc706 ARM: omap4: tuna: add USB connector detect/switch driver a67bcb2 ARM: omap4: tuna: do not use twl6030 usb xceiver driver 21b7573 misc: add Fairchild Semi FSA9480 usb switch driver Change-Id: I84cb5840adca705a49266172fb343f4f560c2d7b
* | Merge "Remove the simulator target from all makefiles. Bug: 5010576"Jeff Brown2011-07-121-4/+0
|\ \ | |/ |/|
| * Remove the simulator target from all makefiles.Jeff Brown2011-07-111-4/+0
| | | | | | | | | | | | Bug: 5010576 Change-Id: Id47575b409e10db2f101a6a5d3520c5933d94be2
* | audio: put pcm into standby before changing output deviceSimon Wilson2011-07-121-2/+1
| | | | | | | | | | | | | | | | | | | | This avoids the high-pitched whine when changing the route from speaker to headset by ensuring that no bytes are being transferred through the ABE while the route is altered. It also means the workaround to avoid the kernel panic when exiting standby in out_write() can be removed. Change-Id: I67d391d003bd90892622a212b45a394e2d15ff70
* | Merge "Tuna kernel prebuilt"Rebecca Schultz Zavin2011-07-121-0/+0
|\ \
| * | Tuna kernel prebuiltRebecca Schultz Zavin2011-07-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aef4f38 Merge remote branch 'omap/android-omap-3.0' into tuna-3.0 7c3892d Merge remote branch 'omap/linux-omap-3.0' into android-omap-3.0 12958bb gpu: pvr: Update to DDK 1.8.18.853 9c058d7 ARM: omap4: tuna: Add sensor orientations for toro sample 3 and lunchbox 5659470 misc: inv_mpu: Fix read returning 0 incorrectly. a7483a9 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 bace7ea Merge branch 'android-3.0' into android-omap-3.0 26b51fe Merge branch 'linux-omap-3.0' into android-omap-3.0 46c115d Merge branch 'linux-omap-pm-3.0' into linux-omap-3.0 a1b10cc Revert "OMAP4 Clock: Update sequence for dpll core m5x2 clock" ab246b8 USB: otg: add otg id notifier utiltiies 2fc52d6 pda_power: add support for using otg transceiver events 89daa34 Bluetooth: Add support for returning the encryption key size 1fa2de3 Bluetooth: Add support for storing the key size c00ddbf Bluetooth: Add support for communicating keys with userspace 1143205 Bluetooth: Remove unused field in hci_conn 5d873ca Bluetooth: Use the stored LTK for restabilishing security f1b45c5 Bluetooth: Use the link key list to temporarily store the STK e56cede Bluetooth: Add support for storing the LTK 10daf97 Bluetooth: Fix SM pairing parameters negotiation 60e5647 Bluetooth: Reject an encryption request when the key isn't found 7f9004d Bluetooth: Add functions to manipulate the link key list for SMP a7481be Bluetooth: Add new structures for supporting SM key distribution c1d5e1d Bluetooth: Add support for SMP phase 3 (key distribution) 119c689 Bluetooth: Remove L2CAP busy queue c0675b8 Bluetooth: Use event-driven approach for handling ERTM receive buffer d033662 Bluetooth: Move code for ERTM local busy state to separate functions f1e1cc3 Bluetooth: Fix potential deadlock in mgmt 44c2935 Bluetooth: Fix potential deadlock in hci_core a577fe3 Bluetooth: Remove enable_smp parameter c006aa0 Bluetooth: Add lmp_host_le_capable() macro 5521abe Bluetooth: Add enable_le module parameter e326af4 Bluetooth: Write LE Host Supported command d5fa513 Bluetooth: Add extfeatures to struct hci_dev 758b9e9a Bluetooth: Check earlier for L2CAP ERTM frames to drop 0ea110d Bluetooth: Clean up unused struct hci_conn items 0e43af4 Bluetooth: Fix bad locking balance bfdeb07 Bluetooth: Add Atheros AR3012 one PID/VID supported 19f7f22 Bluetooth: Add bt_printk d8e4f87 Bluetooth: Rename function bt_err to bt_to_errno 6e35f04 Bluetooth: ERTM timeouts need to be converted to jiffies 783db13 Bluetooth: Fix indentation whitespace 63e9cde Bluetooth: uses crypto interfaces, select CRYPTO 23e6494 Bluetooth: include scatterlist.h where needed a8eaf8b Bluetooth: Fix not setting the chan state 43d669e Bluetooth: Remove useless access to the socket 16af3da Bluetooth: Fix crash when setting a LE socket to ready b4742a1 Bluetooth: Fix locking in blacklist code e299c1c Bluetooth: Use bit operations on conn_state 2ddee5a Bluetooth: use bit operation on conf_state 58d1980 Bluetooth: Add blacklisting support for mgmt interface 9d90e2e Bluetooth: Move blacklisting functions to hci_core 397d9ae Bluetooth: Add key size checks for SMP b19d5ce Bluetooth: Add support for SMP timeout 53fba61 Bluetooth: fix missing parameter for HCI_OP_DISCONNECT 64532ec Bluetooth: Add support for Pairing features exchange 901920a Bluetooth: Add support for building pairing commands 208dfd9 Bluetooth: Update the security level when link is encrypted 403d2c8 Bluetooth: Fix initial security level of LE links a5474a8 Bluetooth: Add support for resuming socket when SMP is finished c34e25e Bluetooth: Remove debug statements 735038c Bluetooth: Add support for LE Start Encryption 21b8a2b Bluetooth: Add SMP confirmation checks methods c8e856e Bluetooth: Add SMP confirmation structs 8e7a3c5 Bluetooth: Add LE SMP Cryptoolbox functions 09fabbc Bluetooth: Add support for using the crypto subsystem 13b4839 Bluetooth: Add simple SMP pairing negotiation ea37012 Bluetooth: Start SMP procedure 133e14c Bluetooth: Implement the first SMP commands d7649a5 Bluetooth: Don't forget to check for LE_LINK 446b49b Bluetooth: keep reference if any ERTM timer is enabled bd69b5a Bluetooth: Make timer functions generic 4a6aa52 Bluetooth: Add refcnt to struct l2cap_chan f1b394a Bluetooth: Add state tracking to struct l2cap_chan c4cf743 Bluetooth: add close() callback to l2cap_chan_ops 162025c Bluetooth: add recv() callback to l2cap_chan_ops b090c4b Bluetooth: Add l2cap_chan_ops abstraction b87bf5b Bluetooth: Merge l2cap_chan_create() in the l2cap_sock_alloc() 3f8e1e3 Bluetooth: Clean up some code style issues 941df95 Bluetooth: Kill set but unused variable 'cmd' in cmtp_recv_capimsg() 8f1e790 Bluetooth: Silence DEBUG_STRICT_USER_COPY_CHECKS=y warning f78088a Bluetooth: Fix check for the ERTM local busy state 5125e9e Bluetooth: Restore accidentally-deleted line 8b00cf0 Bluetooth: Simplify hci_conn_accept_secure check 514abe6 Bluetooth: Add BT_POWER L2CAP socket option. 9f449e0 Bluetooth: Verify a pin code in pin_code_reply 6fbf3ee Bluetooth: Remove a magic number ef69a01 Bluetooth: fix sparse & gcc warnings c7f0d99 Bluetooth: Set 'peer_addr_type' in hci_le_connect() 5e89ece Bluetooth: Check advertising cache in hci_connect() 92398c8 Bluetooth: Remove useless check in hci_connect() 149c097 Bluetooth: Add 'dst_type' field to struct hci_conn 5444429 Bluetooth: Refactor hci_auth_complete_evt function 62c5f52 Bluetooth: Fix auth_complete_evt for legacy units 45e600f Bluetooth: Advertising entries lifetime 726e133 Bluetooth: Clear advertising cache before scanning 5df108f Bluetooth: Add Advertising Report Meta Event handler 6c77c8c Bluetooth: LE advertising cache 1c3cc118 Bluetooth: Add advertising report meta event structs 762a990 Bluetooth: Rename __l2cap_chan_close() to l2cap_chan_close() 1eb5ad7 Bluetooth: Remove export of l2cap_chan_clear_timer() 13003e0 Bluetooth: create channel timer to replace sk_timer 8974c54 Bluetooth: Add chan->chan_type struct member dcb1cc3 Bluetooth: Create l2cap_chan_send() 6e9e43f Bluetooth: Create __l2cap_chan_close() ceb723b Bluetooth: Remove unnecessary use of hci_dev_list_lock 5234259 Bluetooth: Kill set but not used variable 'l2cap_sk' in rfcomm_sock_getsockopt_old() af2a7f4 Bluetooth: fix set but not used warning 54f6151 Bluetooth: Allow unsegmented SDU retries on sock_queue_rcv_skb failure Change-Id: Ibe7a7217058a983bf5c13bf53a3f299865bab132 Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* | | Merge "Add A2DP audio module."Jaikumar Ganesh2011-07-121-1/+2
|\ \ \ | |/ / |/| |
| * | Add A2DP audio module.Jaikumar Ganesh2011-07-121-1/+2
| | | | | | | | | | | | Change-Id: I3ec46050c48b75a4673e30255452e4d11fcda73f
* | | Tuna kernel prebuiltRebecca Schultz Zavin2011-07-111-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes flicker during video playback Updates img libs to latest 7199881 Merge remote branch 'omap/android-omap-3.0' into android-omap-tuna-3.0 22c8098 Merge remote branch 'omap/linux-omap-3.0' into android-omap-3.0 8aa19aa ARM: omap: tuna: sync up defconfig 5f9fb94 ARM: omap4: tuna: Enable HID drivers. a15e110 rpmsg: omx: Integration with ion and sgx e095f93 gpu: pvr: Update to DDK 1.8.18.844 d6ba5d7 gpu: pvr: Update to DDK 1.8.18.834 ee6f8c4 gpu: pvr: Update to DDK 1.8.18.791 f8601b5 gpu: pvr: Update to DDK 1.8.18.791 f7bc52d gpu: pvr: Update to DDK 1.8.18.781 6560070 gpu: pvr: Fix include from ion.c fd84271 gpu: pvr: Update to DDK 1.8.18.768 fcd9ba5 gpu: pvr: Update to DDK 1.8.18.755 bc35a18 gpu: pvr: Update to DDK 1.8.18.749 af50f0b gpu: pvr: Update to DDK 1.8.18.737 6d3f70d gpu: pvr: Update to DDK 1.8.18.726 8717e29 gpu: pvr: Update to DDK 1.8.18.709 2bdd274 gpu: pvr: Update to DDK 1.6.16.687 3fb40b8 gpu: pvr: Update to DDK 1.8.18.684 Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> 5b79e07 OMAP:DSSCOMP: Make invalid compositions and states BUGS 80d6cd9 OMAP:DSSCOMP: Fix concurrency issues with delayed apply dad513c OMAPLFB: Integrate with DSSCOMP. a1bc73b OMAP:DSSCOMP: Protect composition state during callback 60886b2 OMAP:DSSCOMP: Fix wait_for_vsync in dsscomp_apply b2c528a OMAP:DSSCOMP: Added early_suspend handler to allow blanking 405f52bd OMAP:DSSCOMP: Gralloc compositions must complete in order accc256 OMAP:DSSCOMP: Fix composition list concurrency errors. 0660ae9 OMAP:DSSCOMP: Disable overlays not specified in a composition 0844e59 OMAP:DSSCOMP: Added dsscomp_delayed_apply() b77e0f1 OMAP: DSSCOMP: Added gralloc adaptation layer d0cf5c4 OMAP: DSS: DSSCOMP: Remove random access (sync_id), move to simple queue e3835a0 OMAP:DSS:DSSCOMP: Add DSS composition module to build/config system 1c86328 OMAP:DSS:DSSCOMP: New composition module 7af6fc8 gpu: pvr: Update to DDK 1.8.18.661 105983a gpu: pvr: Update to DDK 1.8.18.638 Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> 1a6ba71 gpu: pvr: Update to DDK 1.8.18.591 Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> ed393a4 gpu: pvr: Update to DDK 1.8.18.581 Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> ec45c8c gpu: pvr: Update to DDK 1.8.18.571 Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> Signed-off-by: Imagination Technologies Ltd <gpl-support@imgtec.com> bddc977 Revert "gpu: pvr: 2.6.39 fixups" b44bad7 gpu: pvr: First attempt to add ProcessFlip2 feature Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com> Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com> 6fa70b73 Merge remote branch 'omap/linux-omap-dss-3.0' into linux-omap-3.0 b6ffdd2 Merge remote branch 'omap/linux-omap-mm-3.0' into linux-omap-3.0 27c84b6 ARM: OMAP: tuna: soc info: add production ID 98820d2 Revert "(TEMP) OMAP: DSS: enable video decoding" f17baf8 ARM: OMAP: tuna: soc info: add die ID 2149f34 Revert "OMAP: DSSCOMP: Fix apply command to wait for vsync" 4b43651 usb: musb: omap2430: handle charger OTG xceiver event c6fb14c mmc: omap_hsmmc: Add MMC_PM_IGNORE_PM_NOTIFY for builtin device 00b92b6 OMAP:TILER: Make tiler_alloc_block_area fail gracefully. 7776ace OMAP4: TILER: Expose tiler APIs to allocate areas and pin memory + minor fixes 2de1312 OMAP4:DSS: Jumbo patch to enable predecimation d085c10 OMAP: DSS2: Add callback for tracking overlay/manager changes 4105323 OMAP4:DSS: Added TILER support for DSS 1a6f4be OMAP4: DSS: Making the deault color format of framebuffer ARGB32 5771c3a OMAP: DSS2: Add zorder support on OMAP4 d98a5bc OMAP: DSS2: Add DISPC VIDEO3 pipeline support 2a032a0 OMAP4: DSS: Fix incorrect OMAP3-alpha compatibility setting 33ad35b OMAP:DSS: Add global alpha settings for video 1 overlay Change-Id: Ib8ed6a3c2b652912c1bcbdcf383b1dbbf137444c Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
* | | use bugmailer.sh for bugreportGuang Zhu2011-07-111-1/+1
| | | | | | | | | | | | | | | | | | it captures bugreport, compresses it and fires an intent to mail it. Change-Id: Idf9df7b9dd1887ae709c9816f488e13e17a2ed80
* | | Merge "Audio HAL: added interface for audio preprocessing"Eric Laurent2011-07-111-0/+24
|\ \ \ | |_|/ |/| |
| * | Audio HAL: added interface for audio preprocessingEric Laurent2011-07-111-0/+24
| | | | | | | | | | | | Change-Id: Ic784c7fa0e82f6ef398548741b603b55d902ae5c
* | | Merge "require KG02 bootloader"Ed Heyl2011-07-111-1/+1
|\ \ \
| * | | require KG02 bootloaderEd Heyl2011-07-111-1/+1
| | | | | | | | | | | | | | | | Change-Id: I699c579bb5cbc28d994cd2a9ab11eb40901edd40
* | | | Merge "Add BT address setting."Jaikumar Ganesh2011-07-111-0/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Add BT address setting.Jaikumar Ganesh2011-07-111-0/+2
| |/ | | | | | | | | | | | | | | This changes adds the per device BT adddress path. Contributed by: hyungseoung.yoo <hyungseoung.yoo@samsung.com> Change-Id: I0ca65c54c62880e218b0d135b3beb06069379f9b
* | Merge "Allow incremental radio updates."Michael Ward2011-07-111-10/+47
|\ \
| * | Allow incremental radio updates.Michael Ward2011-07-111-10/+47
| | | | | | | | | | | | Change-Id: I435bfb68320fdbe58a9cfd602ff19136b98d8656
* | | Prime kernel prebuiltSimon Wilson2011-07-111-0/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5bf781e (TEMP) OMAP4: rpmsg: PM: free pm_qos in remove 942f2bd Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 94393ef Merge branch 'linux-omap-3.0' into android-omap-3.0 f288dae Merge branch 'linux-omap-pm-3.0' into linux-omap-3.0 c717f81 Merge branch 'omap-pm-integration' of git://github.com/nmenon/linux-omap-ti-pm into linux-omap-pm-3.0 0393091 Merge commit 'v3.0-rc6' into linux-omap-3.0 fc84c03 Merge branch 'android-3.0' into android-omap-3.0 e9a28c7 ARM: omap: tuna: enable SEC jack driver a3edd4a ARM: omap4: tuna: add SEC Jack platform data e6d0146 misc: sec_jack: initial SEC ear jack driver 23b6dd6 net: wireless: bcmdhd: Fix crash if event queue is empty 7543710 net: wireless: bcmdhd: Fix CFG80211 suspend/resume if interface is down 8c3bcb42 net: wireless: bcmdhd: Add setband/getband private commands 2d7bb94 net: wireless: bcmdhd: Add packet filtering commands ea94048 OMAP4: CPUIDLE: If OSWR is enabled, allow C4 state. 6283145 OMAP4460: HACK: Disable prefetch since it breaks MPUSS OSWR. 2819b99 OMAP4: l2cache: only double line shift is 4460 specific 25e6cb3 OMAP4460: remove replicated L2 cache workaround ed7a0f9 OMAP4: Add OSWR for all powerdomains on suspend bd1a43b OMAP4: PM: increment logic off counter. 09391f5 OMAP4460: Workaround for ROM bug because of CA9 r2pX gic control register change 809ce74 OMAP4: PM: Add MPUSS OSWR support ebaff49 OMAP4: PM: Enable the CHIP RET support 97bfd36 OMAP4: PM: Disable SR in idle ec3d835 OMAP2+: DVFS: provide ability to know if dvfs is scaling for a domain eedb08e OMAP4: VC: provide voltsetup masks 9726f4d OMAP3+: VC: calculate the setup times dynamically 6a2b034 OMAP3+: VC: add ability for auto transition 5ee70d0 OMAP3+: SR: ensure pm-runtime callbacks can be invoked with IRQ disabled c00a3ea OMAP4: PM: TWL6030: Update slew rate. 888c39e regulator: TWL: Remove entry of RES_ID for 6030 e74a81a OMAP4: Clock: Fix the .core_m6_rate in virt_l3 clock table 33615ca OMAP4 Clock: Update sequence for dpll core m5x2 clock 83e4a5c OMAP4: Clock: round_rate and recalc functions for DPLL_ABE af9070c OMAP3+: use DPLL's round_rate when setting rate 0539136 OMAP2+: hwmod: Add API to check IO PAD wakeup status 083eef7 OMAP2+: hwmod: Add API to enable IO ring wakeup. d9f760b power: max17040_battery: update power_supply on status or level change Change-Id: I7f1b7398c42dd6fdd9b1fa2028b4d400347130af
* | Increase tuna system partition sizeColin Cross2011-07-111-2/+1
| | | | | | | | | | | | The Tuna system partition is 654 MB Change-Id: Ifd2ff50d9b574c5c174535c82dd39f29cdcf058a
* | Merge "Toro: Add permissions on modem devs for CDMA/LTE RIL"Benoit Goby2011-07-101-4/+11
|\ \
| * | Toro: Add permissions on modem devs for CDMA/LTE RILBenoit Goby2011-07-101-4/+11
| | | | | | | | | | | | Change-Id: I23e6a8bb71a0beda030b362fb4b2fceadc09440b
* | | Merge "Toro : add board specific configurations for LTE RIL"Benoit Goby2011-07-101-0/+4
|\ \ \ | |/ /
| * | Toro : add board specific configurations for LTE RILsinikang2011-07-101-0/+4
| | | | | | | | | | | | | | | | | | | | | - add cdma & lte radio related device files configuration Change-Id: I98e897b74b37a432f11a3d1a1cd1872d3c2ef7c4 Signed-off-by: sinikang <sinikang@samsung.com>
* | | audio: output standby supportSimon Wilson2011-07-101-11/+36
| | | | | | | | | | | | Change-Id: I34894e039311e82feda05b0ac58b93518072244c
* | | Prime kernel prebuiltSimon Wilson2011-07-101-0/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ac7393 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 0435f0d Merge remote branch 'omap/linux-omap-3.0' into android-omap-3.0 3d81e0e Merge remote branch 'common/android-3.0' into android-omap-3.0 709aac3 Merge branch 'linux-omap-audio-3.0' into linux-omap-3.0 497a882 ASoC: McPDM: Fix race conditions during stream open/close a3cbab0 ASoC: OMAP ABE: Add context save/restore aaddd89 power: max17040_battery: update status on ext power changed event f10f0c2 Revert "HACK: ARM: omap4: pm: don't idle gpio controllers" 69ce5c0 RPMSG: replace spinlock with mutex to lock kick function 751b520 OMAP: rpmsg: adapt omap_rpmsg to the remoteproc autosuspend 0a17bf3 OMAP4: remoteproc: implement runtime PM autosuspend 531d334 remoteproc: add runtime PM autosuspend support cd65778 virtio_ring: export function more_used() 646e74f OMAP: mailbox: fix NULL nb in omap_mbox_put 1650f7a OMAP: remoteproc: implement fatal error notifications c72866d gpu: ion: Validate handles passed via the kernel api a7d2886 gpu: ion: omap: Add debug statements f44b1c1 remoteproc: add fatal error notifications for rproc users 8668ed4 OMAP: iommu: disable interrupts if mmufault is not handled 3fe0083 omap: ion: fix omap_ion.h 8e7fbc0 ARM: omap2: dvfs/pd: fix plist usages not that lock is removed 4698db5 plist: Remove the need to supply locks to plist heads 0226f8a plist: Remove the need to supply locks to plist heads Change-Id: I466e6ce0326b736f707c727bff5c598f4ed68d4a
* | Merge "audio: capture support"Simon Wilson2011-07-101-12/+130
|\ \
| * | audio: capture supportSimon Wilson2011-07-101-12/+130
| | | | | | | | | | | | | | | | | | | | | | | | - Enable start and standby of input stream - Not tested sample rates other than 8/16 - Capture causes a kernel panic if a sound is not played first Change-Id: I44ec338c7fb77c43b12f4d0ee19b9f12c7cc4ad6
* | | Tuna kernel prebuilt, built-in wifi driver with cfg80211Dmitry Shmidt2011-07-085-12/+10
|/ / | | | | | | | | | | | | | | | | f7bcada ARM: omap: tuna: Switch wlan to CFG80211 and built-in driver 3183df0 maguro: misc: modem_if: mipi_link: Update mipi-hsi link device f2a4fff Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 Change-Id: I84df5986da476fdbd4244221aa388ab492655bb2 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
* | Prime kernel prebuiltsPaul Eastham2011-07-072-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0fb8e3 misc: modem_if: Update modem interface iodevice 4ef4d29 omap4: hsi: enable io pad wakeup 8610668 maguro: misc: modem_if: mipi_link: Update mipi-hsi link device a4cb212 OMAP4: hwmod data: Add MSTANDBY_SMART_WKUP for HSI a33074f OMAP4: HSI: add HSI OPP definition 8075152 OMAP3+: HSI: add runtime PM support 816abfa OMAP4: HSI: platform specific changes f389677 hsi: implement io daisy chain mux wakeup 9301909 OMAP4: HSI: driver misc fixes dd0fe66 OMAP4: tuna: Enable OTG VBUS wakelock Change-Id: Ib7ae80784c60f03b3e3464cd96555c279e8867e0
* | Prime kernel prebuiltsIliyan Malchev2011-07-072-0/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8338958 (TEMP) omap4: rpmsg_omx: Request L3 bandwidth and latency on core 550c45e Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 e2aaaa9 Merge branch 'linux-omap-3.0' into android-omap-3.0 734fe5a Merge branch 'linux-omap-pm-3.0' into linux-omap-3.0 9723e1d Merge branch 'omap-pm-integration' of git://github.com/nmenon/linux-omap-ti-pm into linux-omap-pm-3.0 ded0229 OMAP: Redefine mandatory barriers for OMAP to include 012b818 OMAP4: PM: create fdif as a processor_device 482ed5d OMAP4: OPP: Add entries for FDIF and the DSP 74a5b34 OMAP: ID: add production ID information 49b0669 OMAP4: clockdomain: Keep L4 PER and L4 CFG depedency with MPUSS and DUCATI 61a3367 i2c-omap: OMAP4: PM: (re)init for every transfer to support off-mode 890416d OMAP4: trim quirk: Fix incorrect CPU revision check 4607fb9 OMAP2+: hwmod: Fix smart-standby + wakeup support c3f37a3 OMAP: OPP: Do a round_rate before adding into OPP table 1c7630f OMAP4: clock: Fix round_rate for mpu and l3 virtual clocks abda638 ARM: mm: Add strongly ordered descriptor and memory allocate API. b50c064 OMAP2+: PMIC: fix build issues with pmic_update b97cd01 Merge branch 'android-3.0' into android-omap-3.0 82a6120 Merge branch 'linux-omap-3.0' into android-omap-3.0 f2230156 ion: fix ION_HEAP_<xxx>_MASK definitions 51cf13b arm: omap4: pm: set smart-idle/wakeup for gpio2 08d0866 ARM: omap4: tuna: print more detailed board revision information 093ceb4 ARM: omap4: tuna: update pmic maps to 443x instead of 44xx 75dc25a USB: OTG: Take wakelock when VBUS present 94d14f8 Merge remote branch 'omap/android-omap-3.0' into android-omap-tuna-3.0 4a31830 Merge remote branch 'common/android-3.0' into android-omap-3.0 42c5a07 gpu: ion: Fix deferencing ERR_PTR 5a3e147 gpu: ion: Fix possible memory leak 6d3b958 gpu: ion: Remove redunant code from ion_open 0b7e8ae gpu: ion: Fix bug in ion client destroy ee4425a ARM: omap: tuna: Create random wlan MAC for Toro devices (temporarily) 0399694 ARM: omap4: tuna: enable smartreflex on init 2450033 netfilter: qtaguid: fix bad-arg handling when tagging socket 0ea2255 mmc: omap_hsmmc: fix build breakage 50544ef Merge remote branch 'omap/android-omap-3.0' into android-omap-tuna-3.0 a67423f Merge remote branch 'common/android-3.0' into android-omap-3.0 83e3dab gpu: ion: Fix bug in ion_client_create b9ea0a9 net: wireless: bcmdhd: Set interface name to 'wlan' by default bcc458f net: wireless: bcmdhd: Fix pm_notifier unregistration fdf9534 net: wireless: bcmdhd: Postpone driver init call b7e9a09 net: wireless: bcmdhd: Add private start/stop commands 0f11fdf net: wireless: bcmdhd: Fix MAC address setting ff8f36c Update to 5.90.125.33 Add logic to get MAC address before firmware is loaded 9bcfe37 net: wireless: bcmdhd: Add SETFWPATH private command 4720a01 net: wireless: bcmdhd: Fix wd_timer_valid field protection 3f409b9 Update to 5.90.125.32: * Move Android specific functions to wl_android (wifi control functions, wifi device, pre-alloc buffer.) * Link Android start/stop commands to interface up/down (download firmware when primary interfacde is up.) * Fix a issue in driver unload, the same IRQ can not be disabled twice (set_irq_wake) 20c194f OMAP: DSS: panel-s6e8aa0: Select BACKLIGHT_CLASS_DEVICE since it does not build without it 8525580 mmc: omap_hsmmc: Skip mmc suspend/resume ops for SDIO device 6146888 board-tuna: Add Samsung DDR organisation and timings. c94de5d Merge remote branch 'omap/android-omap-3.0' into android-omap-tuna-3.0 Signed-off-by: Iliyan Malchev <malchev@google.com> Change-Id: Ib72b6f791482f010fa50af1d9664d918c23fdb56
* Merge "init.tuna.usb.rc: Configuration for RNDIS function"Mike Lockwood2011-07-061-1/+3
|\
| * init.tuna.usb.rc: Configuration for RNDIS functionMike Lockwood2011-07-061-1/+3
| | | | | | | | | | Change-Id: I75eeaff7c968e594d4b74c84935b81ccfc8e42e1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Merge "Support bootloader and radio OTAs for Prime."Michael Ward2011-07-067-2/+339
|\ \
| * | Support bootloader and radio OTAs for Prime.Michael Ward2011-07-067-2/+339
| | | | | | | | | | | | | | | | | | | | | | | | For bootloader figure out the correct xloader location in bootloader.img and write to /xloader. The sbl is always in the same place, and can be written to /sbl. For radio the radio.img just needs to be written to /radio. Change-Id: I7b3b82b5c093331287ada24ba8ebce31a79f74bf
* | | require new bootloader (KG01).Ed Heyl2011-07-061-1/+1
| |/ |/| | | | | Change-Id: I5914f34cc7276f9d9968e46fc812e6e8d6d2d624
* | Merge "Add VideoEditorGoogle to the build"Shih-chia Cheng2011-07-041-0/+3
|\ \ | |/ |/|
| * Add VideoEditorGoogle to the buildShih-chia Cheng2011-07-041-0/+3
| | | | | | | | Change-Id: I4c70a5a04faf54750f6a4b6f8d5f1df43cb4adf2
* | tuna: update wlan calibration filejun.ho.lee2011-07-011-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | 1. Modify 2G Tx CAL Parameter - PA parameters based on TSSI calibration 2. Modify cck digital filter type - Tuning parameter for EVM, SEM 3. Add 5G LOFT debug parameter 4. Add Rx sensitivity parameter for calibration of 5G Rx Change-Id: I1adbe5911568dfc841b4048352eeb3136f5e2765 Signed-off-by: jun.ho.lee <jun.ho.lee@samsung.com>
* | Always build lights.tunaArve Hjønnevåg2011-07-011-4/+0
| | | | | | | | Change-Id: Ic598bb70a67f65c80675746ec61336bd768bc30b
* | Merge "Move config_showNavigationBar to framework so it can be read there."Adam Powell2011-06-302-25/+4
|\ \
| * | Move config_showNavigationBar to framework so it can be read there.Adam Powell2011-06-302-25/+4
| |/ | | | | | | Change-Id: Ife5ae874898080ed1301e216279105e7483f9d37
* | Updated kernel and wifi prebuiltsColin Cross2011-06-302-0/+0
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c353be9 misc: modem_if: Fix BUG in modem_probe if link init fails 289e7aa LCD : modify defconfig for support backlight driver. 61196b4 ARM: omap4: tuna: Add gamma-table 1b21a4e OMAP: DSS: panel-s6e8aa0: Port brightness code from Nexus-S 413588a Revert "ARM: omap4: tuna: enable smartreflex on init" 63e794e ARM: omap2: tuna: Add ion support to tuna board file f4775db ARM: configs: Add ION to tuna_defconfig 7a9f843 Merge remote branch 'omap/android-omap-3.0' into android-omap-tuna-3.0 e628a6b gpu: ion: Add omap support to ion 76c0898 Merge remote branch 'omap/linux-omap-3.0' into android-omap-3.0 7d052e0 Merge remote branch 'omap/linux-omap-dss-3.0' into linux-omap-3.0 6b23bb1 Merge remote branch 'common/android-3.0' into android-omap-3.0 e6ee124 gpu: ion: Several fixes 4c1af23 ARM: omap: tuna: add soc info attribute group d749b23 ARM: omap4: tuna: enable smartreflex on init 220fba9e (TEMP) rpmsg: res_mgr: request constraints for iss 8863cb9 ARM: OMAP4: tuna: update power map for 4430 Tunas 0a1f12c OMAP4: Tuna: Enable SmartReflex 010aa61 ARM: omap4: tuna: Mux Setting for GPS_UART_SEL 0a03a4e ARM: omap4: tuna: GPS initialization and MUX setting b103c75 OMAP4: I2C: Enable FIFO usage for OMAP4 2352dfe OMAP4: PM debug: fixup section mismatch warnings 1c3bb5e ARM: omap4: tuna: enable pm-debug f88e7b0 Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 049b79a Merge branch 'linux-omap-3.0' into android-omap-3.0 6978af1 rpmsg: resmgr: request / release constraints 8bcd480 omap: rpres: adding constraints API 21a4371d input: mms_ts: ensure that we only enable/disable once 94e7a1a OMAP: DSS2: DSI: Support non-dcs long read Change-Id: Ie2f49aecbb7b96ddeffb21f399c3f2b8551c6599
* Add light module for backlightArve Hjønnevåg2011-06-305-3/+360
| | | | | | Copied from crespo Change-Id: I75956a352472b4503e85058570255fd651ac3795
* PRIME: [GPS] Allow the GPS exported GPIOAlexy Shin2011-06-302-1/+9
| | | | | | | | | Allow the permission to /sys/class/sec/gps/GPS_PWR_EN/value and /sys/class/sec/gps/GPS_nRST/value Change-Id: I775c710e721835fae787fd32acdca5c53616c0a3 Signed-off-by: Alexy Shin <alexy.shin@samsung.com> Signed-off-by: Mike Lockwood <lockwood@android.com>
* tuna: new kernel/wifi prebuiltsIliyan Malchev2011-06-292-0/+0
| | | | | | | | | | | | | | | | | | f7e88fd Merge remote branch 'omap/android-omap-3.0' into android-omap-tuna-3.0 105777a Merge remote branch 'common/android-3.0' into HEAD cacc6b9 ARM: omap: tuna: set muxing for camera on tuna in board file 5f644be Merge branch 'android-omap-3.0' into android-omap-tuna-3.0 c59a027 Merge branch 'linux-omap-3.0' into android-omap-3.0 c80005a gpu: ion: Add ION Memory Manager ba54e8d OMAP: DSSCOMP: Fix apply command to wait for vsync 914f4ea Merge remote branch 'omap/android-omap-3.0' into android-omap-tuna-3.0 8eb8fe1 Merge remote branch 'omap/linux-omap-3.0' into android-omap-3.0 ae364f7 Merge remote branch 'omap/linux-omap-mm-3.0' into linux-omap-3.0 2f96246 OMAP4: Print reset reasons at boot 9f0ee1c TILER: Modify ION APIs to use address arrays and return number of virt pages Change-Id: Iaed217b564a2c7104dd821a2174bb3ff7eebd9da Signed-off-by: Iliyan Malchev <malchev@google.com>
* tuna: sensors: add light, proximity, pressure sensorsMarty Fouts2011-06-2911-4/+613
| | | | | | | | NOTE: - light sensor ADC values need to be calibrated. Change-Id: Iba75dc62a922bbcd0d1e273566f9089c4da450fb Signed-off-by: Marty Fouts <mfouts@sta.samsung.com>