summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-12-08Merge branches 'mach-plat-3.1' and 'cg2900-3.1' into stable-linux-ux500-3.1linux-mainline-2011-12Philippe Langlais
2011-12-08cg2900: Change the PMU_EN gpio for snowballRobert MARKLUND
Snowball have the GPIO_EN on GPIO161 diffrent from u8500. Change-Id: I6dddb1e3d7b7b80ce046fbd92a7852a3d0a6c59d Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-12-08mach-ux500: Fix snowball pins for buttonsRobert MARKLUND
Fix snowball pins for buttons also do the declaration the same way all the other decalrations are done. Moved the u9500 special GPIO swich to before board variant specific GPIO Change-Id: I9b25667d3ece4a49706b5c43c7cc7df5df3930e1 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-12-06Merge branch 'other' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'caif' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'hsi' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'modem' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Kconfig drivers/misc/Makefile drivers/staging/Makefile
2011-12-06Merge branch 'ste-multimedia-framework' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile
2011-12-06Merge branch 'wlan' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'st-mems-sensors' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'cg2900-fm' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'cg2900' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'audio' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Makefile
2011-12-06Merge branch 'security' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'mali' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'video' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Makefile
2011-12-06Merge branch 'hwmem' into linux-stable-ux500-3.1Philippe Langlais
Conflicts: drivers/misc/Makefile
2011-12-06Merge branch 'input' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'trace-debug' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'usb' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'storage-mmc' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'dma' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'gpio' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'mach-plat' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06Merge branch 'core' into linux-stable-ux500-3.1Philippe Langlais
2011-12-06mach-ux500: sensors: Add __init directive for mop500_sensors_init()Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-12-06bluetooth: 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>
2011-12-06bluetooth: 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>
2011-12-06ux500_ing05160_mailboxPD_0.1:Lockdeb correctness fix for modem_irqBibek Basu
Commit ID: Ib94dcbf6: U5500 : Lockdeb correctness fix for modem_irq Build and boot test only done for 8500 config Booting will only happend properly if used Initramfs Change-Id: I5da03baa7b8ee8f32de5712b7136442fbe2cec1c Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/28923
2011-12-06CAIF : coverity issuesDurga Prasada Rao BATHINA
free phy_driver memory and initialize linkid to 0. ST-Ericsson ID: 358047 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: Icb295648b23bd836b9f5a40a0b605e4792a8511d Signed-off-by: Durga Prasada Rao BATHINA <durgaprasadarao.b@stericcson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31751 Reviewed-by: Bibek BASU <bibek.basu@stericsson.com> Tested-by: Bibek BASU <bibek.basu@stericsson.com>
2011-12-06CAIF SHM: coverity issuesDurga Prasada Rao BATHINA
dereferencing NULL pointer,if skb_dequeue returns NULL. ST-Ericsson ID: 358051 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: Ib88648e68c631cc8eaf839f96af7e847c12922b1 Signed-off-by: Durga Prasada Rao BATHINA <durgaprasadarao.b@stericcson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31750 Reviewed-by: Bibek BASU <bibek.basu@stericsson.com> Tested-by: Bibek BASU <bibek.basu@stericsson.com>
2011-12-06caif-shm: Fix deadlock caused due to improper lockingArun Murthy
Improper usage of spin lock, which leads to deadlock. Tx: acquire_lock1 -> trying to acquire lock2 Rx: acquire_lock2 -> trying to acquire lock1 Fix: locking was done through out the function which is not required. Only in placed where list has be accessed or modified locking is required. ST-Ericsson Linux next: NA ST-Ericsson ID: 360284 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I962fcb35f44b6030d6f1151f118d35e328b69156 Signed-off-by: Arun Murthy <arun.murthy@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30980 Reviewed-by: Hemant-vilas RAMDASI <hemant.ramdasi@stericsson.com> Tested-by: Hemant-vilas RAMDASI <hemant.ramdasi@stericsson.com> Reviewed-by: Durga Prasada Rao BATHINA <durgaprasadarao.b@stericsson.com>
2011-12-06CAIF: Alignment with internal CAIF development gitPhilippe Langlais
Code changes from internal git that will / are submitted to kernel upstream. - CAIF SPI. Multiple bug fixes, power management. Change-Id: I7e0f989ec5508358efeb3459c561d40dc94ed0a8 Signed-off-by: Erwan Bracq <erwan.bracq@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21536 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-12-06CAIF: 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>
2011-12-06ARM: 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>
2011-12-06ARM: 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>
2011-12-06ARM: 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>
2011-12-06ARM: 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>
2011-12-06ARM: 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>
2011-12-06drivers: 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>
2011-12-06drivers: 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>
2011-12-06drivers: 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>
2011-12-06arch: arm: ST-E HSI controllerPhilippe Langlais
Change-Id: Ibe70431ede8a9707b37e3394c22beb9acc42d8cb Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
2011-12-06drivers: 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>
2011-12-06HSI: 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>
2011-12-06HSI: 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>
2011-12-06HSI: 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
2011-12-06HSI: omap_ssi: Introducing OMAP SSI driverCarlos Chinea
Introduces the OMAP SSI driver in the kernel. The Synchronous Serial Interface (SSI) is a legacy version of HSI. As in the case of HSI, it is mainly used to connect Application engines (APE) with cellular modem engines (CMT) in cellular handsets. It provides a multichannel, full-duplex, multi-core communication with no reference clock. The OMAP SSI block is capable of reaching speeds of 110 Mbit/s. Change-Id: Iea002a8f321cf66ab439552620af001206626ed6 Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20576 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-12-06HSI: hsi: Introducing HSI frameworkCarlos Chinea
Adds HSI framework in to the linux kernel. High Speed Synchronous Serial Interface (HSI) is a serial interface mainly used for connecting application engines (APE) with cellular modem engines (CMT) in cellular handsets. HSI provides multiplexing for up to 16 logical channels, low-latency and full duplex communication. Change-Id: I7f20219c15151e5c36c22a581b581b832abec04d Signed-off-by: Carlos Chinea <carlos.chinea@nokia.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/20575 Reviewed-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Tested-by: Pawel SZYSZUK <pawel.szyszuk@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-12-06misc: Compile modem specific misc driversPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 23:01:53 +0000