summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-03-19gator/driver: Version 5.9Jon Medhurst
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2012-03-19gator/daemon: Fix counters initialisationWade Cherry
In certain circumstances counter were not enabled correctly. Fixed. Signed-off-by: Wade Cherry <wade.cherry@arm.com> Signed-off-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Jon Medhurst <tixy@linaro.org>
2012-03-19gator/daemon: Version 5.9Jon Medhurst
Signed-off-by: Jon Medhurst <tixy@linaro.org>
2012-03-19mcde: hdmi: Workaround to don't use the clock framework for MCDE on SnowballPhilippe Langlais
After Jimmy Rubin commit "video: mcde: Add dsi/dpi freq settings", HDMI framebuffer is no more functional, hence this workaround. Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-03-19Merge topic branch 'other' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'caif' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'hsi' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'modem' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'ste-multimedia-framework' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'wlan' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'st-mems-sensors' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'cg2900-fm' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'cg2900' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'audio' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'security' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'mali-generic' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'video' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'hwmem' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'input' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'trace-debug' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'usb' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'storage-mmc' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'dma' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'gpio' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'mach-plat' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19Merge topic branch 'core' into integration-linux-ux500-3.3Philippe Langlais
2012-03-19snowball: android: Fixing access right for BTKejun ZHOU
Signed-off-by: Kejun ZHOU <kejun.zhou@linaro.org> Committer: Mathieu Poirier <mathieu.poirier@linaro.org>
2012-03-19BT: Add sec_level to auth_conn_infoLukasz Rymanowski
With this patch it is possible to retrieve sec_level from the kernel by user space. This is needed for SAP working on hciops. This patch missed to be added when moving to kernel 3.0 ST-Ericsson ID: 256270 ST-Ericsson FOSS-OUT ID: FOSS-OUT-10060 Change-Id: Ic569db392e6f6ee2e546003dec86cc2d62a1fcd7 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42169 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Tested-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Hakan GARDRUP <hakan.gardrup@stericsson.com> Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com> Reviewed-by: Kanak GUPTA <kanak.gupta@stericsson.com>
2012-03-19bluetooth: Add SCO parameters support for socketAndrzej Kaczmarek
Adds ability to setup SCO connection parameters through socket option. ST-Ericsson Linux next: Not tested, ER 256277 ST-Ericsson ID: 256277 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10137 Change-Id: If859341019fd9f7cc7c0efe95750779e84fac801 Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30136 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Tested-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-03-19bluetooth: Improve BNEP extension headers handlingAndrzej Kaczmarek
Adds handling of extension headers to BNEP control packets. Adds support for BNEP setup connection request handled in pand. ST-Ericsson Linux next: - ST-Ericsson ID: 328144 ST-Ericsson FOSS-OUT-ID: Trivial Depends-On: Id2cbd106af9b380f63d87ea0b4652ec6cd996fa4 Change-Id: I005e00e2fe934dc19f40533953d5b233676f0d0e Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18117 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com>
2012-03-19caif-shmcore: in tx check for buffer full conditionArun Murthy
There are 6 buffers and each buffer can be filled with 10 messages. The size of each buffer is 8k. In shm tx work function, 10 messages are written to the buffer, if the buffer gets filled during writing these 10 messages stop writing to buffer and use the next buffer. ST-Ericsson Linux next: NA ST-Ericsson ID: 375088 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I146d41e4e415c8ff96c605b4c20546ff7501442a Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/43350 Reviewed-by: Durga Prasada Rao BATHINA <durgaprasadarao.b@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Sjur BRENDELAND <sjur.brandeland@stericsson.com>
2012-03-19caif-shmcore: increase the priority of flow control wqArun Murthy
replace work queue with kthread workqueue for which the priority can be increased. Priority has to be increased, because ideally there the control information on flow ctrl i.e ON or OFF should reach caif with no delay. ST-Ericsson Linux next: NA ST-Ericsson ID: 372652 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I7a148b3277bcc885ade810df12b47c609a631e21 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42835 Reviewed-by: Hemant-vilas RAMDASI <hemant.ramdasi@stericsson.com> Reviewed-by: QABUILD Reviewed-by: QATEST Reviewed-by: Sjur BRENDELAND <sjur.brandeland@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2012-03-19caif-shm: synchronize caif flow controlArun Murthy
In the shm tx work function caif flow control is turned ON and without acquiring the spin lock. In the rx callback cail flow control is turned off. The expected sequence would be on caif writing message to modem via shm, if shm finds that there is no empty space then, it is not sets caif flow control to OFF. On shm receiving messages from modem, it sets caif flow control to ON. Now this since this is in interrupt context, there are chances of this fucntion being preeempted by the caif OFF that is being set in the tx work function. Hence create a seperate workqueue and two work functions to turn caif flow control ON and OFF. With this implementation it is ensured that caif flow control is turned OFF first by tx work function and turned ON by the rx callback. ST-Ericsson Linux next: NA ST-Ericsson ID: 372652 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ide75415233d7b4560faf25862876c15421df7c2c Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42438 Reviewed-by: QABUILD Reviewed-by: Hemant-vilas RAMDASI <hemant.ramdasi@stericsson.com> Reviewed-by: Sjur BRENDELAND <sjur.brandeland@stericsson.com>
2012-03-19CAIF: Minor alignment with internal CAIF gitErwan Bracq
Some added blank line and BUGON for CAIF serial. Change-Id: If3452ed104b93203fc86fe6a95fd957946447876 Signed-off-by: Erwan Bracq <erwan.bracq@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21527 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-03-19drivers: u95xx: Add HSI channel priorityDerek Morton
Configure channel priority when configuring HSI interface. ST-Ericsson Linux next: N/A ST-Ericsson ID: 365662 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I9880ee8d118dd8fefe7dc8ee46814ee1862cfac8 Signed-off-by: Derek Morton <derek.morton@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42229 Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19u95xx: Add API for HSI channel priorityDerek Morton
Add support for specifying channel priority when configuring HSI interface. ST-Ericsson Linux next: N/A ST-Ericsson ID: 365662 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I4a1a453edec6122c7d5331db43cb8237c837cc42 Signed-off-by: Derek Morton <derek.morton@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/42228 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-03-19drivers: U9500: Add WAKE support in ST-E HSIPawel Szyszuk
Added support for IRQ_PRCMU_HSI0 (HSI0_CAWAKE event). GPIO pin is used to control ACWAKE output line. ST-Ericsson ID: 365660 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iefa11ef3466c599af20025ee71f879b9e41c06d9 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/36089 Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19ARM: U9500: HSI registers update to DB8500 V2 specPawel Szyszuk
ST-Ericsson Linux next: NA ST-Ericsson ID: 365681 ST-Ericsson FOSS-OUT ID: NA Change-Id: I396c2a4d44ded438308e358aa0ad976a397d4dd6 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33224 Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com> Reviewed-by: Derek MORTON <derek.morton@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19ARM: U9500: HSI RX PIPELINE buffer flushPawel Szyszuk
ST-Ericsson Linux next: NA ST-Ericsson ID: 365683 ST-Ericsson FOSS-OUT ID: NA Change-Id: I25b92d815447d2746ba25a9db132b242b3da9d9c Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33223 Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com> Reviewed-by: Derek MORTON <derek.morton@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19ARM: U9500: HSI core clocks initializationPawel Szyszuk
ST-Ericsson Linux next: NA ST-Ericsson ID: 343481 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ic59f08e1bb5d858344d95b5d34ae8a5d85d9aa1d Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32518 Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19ARM: U8500: ST-E HSI: RX FRAMEBURSTCNT set to 0xFFPawel Szyszuk
HSIR FRAMEBURSTCNT register set to the max value 0xFF (255). ST-Ericsson Linux next: NA ST-Ericsson ID: 361371 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I095f113633d873a60a5622b1d195c28a2b01ceab Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32216 Reviewed-by: Christopher BLAIR <chris.blair@stericsson.com> Reviewed-by: Derek MORTON <derek.morton@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19ARM: U8500: ST-E HSI: DMA burst and PIPE supportPawel Szyszuk
Added support for HSIR PIPELINED mode (also in drivers/hsi) Added DMA max burst (in DMA words) as a parameter in hsi.h DMA channel high priority set to TRUE for HSI ST-Ericsson ID: 356625 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Id842e61343ce5013992337db085fcbe91dd5b9f7 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32180 Reviewed-by: Yann GAUTIER <yann.gautier@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19drivers: hsi: context save/restore for STE HSIrepo sync
ST-Ericsson ID: ER338229 Change-Id: I860d98414ee603ab8b992d6688ff02de7cc6fd98 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22821 Reviewed-by: Alex MACRO <alex.macro@stericsson.com> Reviewed-by: QATEST Reviewed-by: Chris KIMBER <chris.kimber@stericsson.com> Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>
2012-03-19drivers: hsi: Add CAIF-HSI glue layerPawel Szyszuk
Change-Id: Id0b4672be6a34cf7fca2494ebb6728b679ad9a63 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21042 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Henrik CARLING <henrik.carling@stericsson.com> Tested-by: Henrik CARLING <henrik.carling@stericsson.com>
2012-03-19drivers: hsi: Add ST-E HSI controllerPawel Szyszuk
Change-Id: I1cbd641a712a33f7d9551e8291dd83dd51b62b79 Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21036 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-03-19arch: arm: ST-E HSI controllerPhilippe Langlais
Change-Id: Ibe70431ede8a9707b37e3394c22beb9acc42d8cb Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
2012-03-19drivers: hsi: Add hsi_char device to /dev/ folderPawel Szyszuk
Change-Id: I48b038f4d80e6a452aad9a2f077c93e66175c810 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20174 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-03-19HSI: hsi_char: Add HSI char device kernel configurationAndras Domokos
Add HSI character device kernel configuration Change-Id: Ic66236e6745634850ef887b96313bbdc6e624972 Signed-off-by: Andras Domokos <andras.domokos@nokia.com> Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20579 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-03-19HSI: hsi_char: Add HSI char device driverAndras Domokos
Add HSI char device driver to the kernel. Change-Id: I58a6e1526271781c4532202b4688ee239e6fbc58 Signed-off-by: Andras Domokos <andras.domokos@nokia.com> Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20578 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-03-19HSI: omap_ssi: Add OMAP SSI to the kernel configurationPhilippe Langlais
Add OMAP SSI device and driver to the kernel configuration Change-Id: I7f21d4016a98db6f53efcd03f9ffd176b8845d7c Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20577 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: arch/arm/mach-omap2/Makefile