summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2012-05-22cg2900: [U9500] Correct the GPIO configuration for WLANPhilippe Langlais
There are two parts in this correction. Firstly, as there is much in common between a U9500 platform and a U8500 one, all the tests performed to identify a U9500 platform shall be done before the ones related to U8500. Otherwise, the platform will be considered as a U8500 one and the GPIOs will be badly configured. Secondly, the mapping of WLAN_IRQ has to be changed. On U8500, WLAN_IRQ is mapped onto GPIO04. On U9500, it is GPIO144 that shall be used. ST-Ericsson ID: 368270 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Rejane DURAND <rejane.durand@stericsson.com>
2012-05-22cg2900: Fix for race conditionLukasz Rymanowski
Fix for race condition which leads to double kfree_skb. ST-Ericsson Linux next: 365852 ST-Ericsson ID: 365852 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10019 Change-Id: Ia951a283d9e3774b29a51280b0536838926c99f9 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34863 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Tested-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Hemant GUPTA <hemant.gupta@stericsson.com> Reviewed-by: SZYMON JANC <szymon.janc@tieto.com> Reviewed-by: Nitin DHINGRA <nitin.dhingra@stericsson.com> Reviewed-by: Ulrik LAUREN <ulrik.lauren@stericsson.com>
2012-05-22cg2900: updates for 3.2Philippe Langlais
Update for headers file (linux/module.h + linux/pm_qos.h) Replace CONFIG_MFD_SUPPORT by HAS_IOMEM + select MFD_CORE Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-05-22staging: Add ST-Ericsson CG2900 driver compilationPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-05-22cg2900: Add support for 3.25 MbpsLukasz Rymanowski
With this patch it is possible to set baud rate 3.25 Mbps on CG2900 UART. ST-Ericsson ID: 364789 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: Not tested, 364789 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Change-Id: If54af597b949038e9ef4c05d80c9235666e127a4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32689 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Tested-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22cg2900: Fix Memory Leak during Driver Init.Hemant Gupta
This patch fixes memory leak during driver initialization because pmu gpio was never freed in case of failure in snowball initialization. ST-Ericsson ID: 365769 ST-Ericcson FOSS-OUT-ID: Trivial ST-Ericsson Linux next: 365769 Change-Id: Ic6ed3e172ca46ccf0da443272845de984f0f5706 Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33254 Reviewed-by: QABUILD Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22cg2900: Use Dynamic Machine configuration.Hemant Gupta
This patch adds dynamic selection of machine configuration and merges the board and device configuration files. ST-Ericsson ID: 365671 ST-Ericcson FOSS-OUT-ID: Trivial ST-Ericsson Linux next: 365671 Change-Id: I58601115bb8234ab203ac8cd37711563eceb4d17 Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33130 Reviewed-by: QABUILD Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22cg2900: Use PM QoS for CG2900 UARTPar-Gunnar Hjalmdahl
This patch adds usage of PM QoS in the CG2900 UART driver. This is to assure that data throughput is not lowered due to CPU going to sleep too often during data transfer. ST-Ericsson ID: 361013 ST-Ericcson FOSS-OUT-ID: Trivial ST-Ericsson Linux next: 361013 Change-Id: Ib79dee9bd95817d459acd477715d95d7aade06a7 Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33109 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Ulrik LAUREN <ulrik.lauren@stericsson.com> Tested-by: Ulrik LAUREN <ulrik.lauren@stericsson.com> Reviewed-by: Hemant GUPTA <hemant.gupta@stericsson.com>
2012-05-22mfd/cg2900: Error opening HCI Raw ChannelHemant Gupta
This patch fixes the corner case issue in driver, due to which if the port is closed while data is being read, the driver state is not correct next time the port is re-opened. ST-Ericsson Linux next: Not tested, ER356425 ST-Ericsson ID: 356425 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I82090c25ce7dd3aea07bacd96856d62361bcd741 Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32208 Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22mfd/cg2900: Support HCI Raw Channel.Hemant Gupta
Add support for HCI Raw channel so that CG2900 can be accessed directly from user space. ST-Ericsson Linux next: Not tested, ER351170 ST-Ericsson ID: 351170 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If8a2455be32f0eb99f7c0bc7a5cf0e09270fa6af Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32206 Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22cg2900: Fix after 3.1 rebasePhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-05-22cg2900: Register CG2900 as clock source for wlanHemant Gupta
This patch registers CG2900 Driver as clock source which can be used by CW1200 Driver for enabling, disabling clock supplied by CG2900. ST-Ericsson Linux next: 361990 ST-Ericsson ID: 361990 ST-Ericsson FOSS-OUT ID: STETL-FOSS-OUT-10019 Change-Id: Ia86e439c4dca962a5e911a73a3d0cee7d3289193 Signed-off-by: Hemant Gupta <hemant.gupta@stericsson.com> Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34067 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-05-22cg2900: Use correct platform_dataPar-Gunnar Hjalmdahl
This patch fixes a bug in the CG2900 driver where platform data structure was overwritten during probe. ST-Ericsson ID: 364913 ST-Ericcson FOSS-OUT-ID: Trivial ST-Ericsson Linux next: 364913 Change-Id: Id6e6918814e01dbef0cd89eda0a034196a81454a Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34065 Tested-by: Robert MARKLUND <robert.marklund@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-05-22cg2900: Fix merge problemsRobert Marklund
Remove dual setups so that we only run one Remove unused labels and freeing of gpios Change-Id: Ib8f21dcbec7bd8155a8c10448f515084143fab24 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34066 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-05-22cg2900: u5500: Make ux500 play nice at build timeRobert Marklund
Make the cg2900 build if we have both soc:s enabled. Change-Id: I302b0772128270f07a2b6ab114d151faa8680dd2 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-05-22cg2900: prcmu: fix path to header filePhilippe Langlais
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32448 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22ux500: use updated gpio driverMian Yousaf Kaukab
AB8500 gpio driver is now exporting its gpios directly. Change-Id: Iea4e25f325246a1e690fd3c4fa67ba88157957ab Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32128 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22u9500: cg2900: GPIO conflicts with external modemPhilippe Langlais
This patch content should have gone with the below commit 2057772c5d0b1a18198c91085d9e828cdb23d23b
2012-05-22cg2900: Set WLAN_PMU_EN for startupPar-Gunnar Hjalmdahl
Re apply the patch as some part of the patch content was lost becuase of 42cf5133396cf34d8ec640e4dc8f36f81b028dc3 Change-Id: I99dd076f79f01eb67b3db5020707f9d8f53fb455 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30792 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: bluetooth support for 5500Grzegorz Sygieda
This patch enables cg2900 functionality in 5500 boards. All tests have been made on B5500 (big board BBM R1A) with new CG2900 hardware. NOTE: For proper work new B5500 FPGA firmware is needed (v536). Depends-On: I7820139cc44e347c5b113b1beb665c2489bf74c2 ST-Ericsson Linux next: NA ST-Ericsson ID: 281802 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3df0bc1e41e60ce6abf4be9cb18465073ba8d738 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30348 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22Revert "cg2900: bluetooth support for 5500"Virupax Sadashivpetimath
This reverts commit 76d004cce0dbb6fddad256790e6ae574278b46e0. Conflicts: arch/arm/mach-ux500/board-u5500.c drivers/staging/cg2900/devices-cg2900-u8500.c drivers/staging/cg2900/devices-cg2900.h Change-Id: Ic480f348be5387d83a3e46280b73dd9bbb3ba43d Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30347 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22u9500: GPIO conflicts with external modemChristophe Guibout
On 8500, GPIO226 is used to set WLAN_PMU_EN for startup. More details in CR 326583. On 9500, GPIO226 is reserved for HSIT_CAWAKE0, and WLAN_PMU_EN is mapped on AB_GPIO11. WLAN_IRQ has been moved from GPIO04 on 8500 to GPIO144 on 9500 because GPIO04 is used for UART1 RX. ST-Ericsson ID: 354110 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: Ia76f1a5a611a1929c12589a48c3e0774e891880a Signed-off-by: Christophe Guibout <christophe.guibout@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30041 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: Set WLAN_PMU_EN for startupPar-Gunnar Hjalmdahl
This patch changes startup behavior of CG2900 so that WLAN_PMU_EN is controlled separately. ST-Ericsson Linux next: Not tested, ER 326583 ST-Ericsson ID: 326583 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iac4aac30835b93c16ceaaf2aa0e601b293cc0cbb Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23839 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30040 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: Fix checkpatch issuesPar-Gunnar Hjalmdahl
This patch corrects checkpatch issues found during mainlining work of the CG2900 driver to the Linux Kernel. ST-Ericsson Linux next: Not tested, ER 282957 ST-Ericsson ID: 333469 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I62eb48ecdeddcc064279466195df24afdc87abbc Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19743 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30039 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: Fix for not working BT on hrefp V71Lukasz Rymanowski
GPIO 170 is no longer used by BT. Remove it from cg2900_uart_resources. ST-Ericsson Linux next: Not tested, ER282957 ST-Ericsson ID: 328481 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Icec5ecc284806553bac2bd41bf555b70d1abadb8 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30037 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: bluetooth support for 5500Philippe Langlais
This patch enables cg2900 functionality in 5500 boards. All tests have been made on B5500 (big board BBM R1A) with new CG2900 hardware. NOTE: For proper work new B5500 FPGA firmware is needed (v536). Depends-On: I7820139cc44e347c5b113b1beb665c2489bf74c2 ST-Ericsson Linux next: NA ST-Ericsson ID: 281802 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iebdacf94fd125c7ead843ecee6927d95f8e32738 Signed-off-by: Grzegorz Sygieda <grzegorz.sygieda@tieto.com> Tested-by: Grzegorz Sygieda <grzegorz.sygieda@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/22941 Reviewed-by: Grzegorz SYGIEDA <Grzegorz.Sygieda@tieto.com> Tested-by: Grzegorz SYGIEDA <Grzegorz.Sygieda@tieto.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30035 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22Adding a delay to CG2900 enable to make the chip start up correctlyUlrik LAUREN
An existing fix for resolving a bug in CG2900 has been reverted, the fix for ER319589 has been removed since it shall not be necessary for chip enabling. Instead, a delay of 100 ms has been added during chip enabling. ST-Ericsson ID: 337664 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ib59cb7a70972985f41efae2e06653217b3b1abd5 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23086 Reviewed-by: QATEST Reviewed-by: Andreas ARESKOUG <andreas.areskoug@stericsson.com> Reviewed-by: Tomasz HLIWIAK <tomasz.hliwiak@tieto.com> Tested-by: Tomasz HLIWIAK <tomasz.hliwiak@tieto.com> Reviewed-by: Ulrik LAUREN <ulrik.lauren@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30034 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: Delay creation of MFD devicesPar-Gunnar Hjalmdahl
This patch changes behavior when a chip transport is connected, i.e. normally during startup of system. It became obvious that this change was needed when commit ab81cbf99c881ca2b9a83682a8722fc84b2483d2 was introduced. We now wait until startup is finished, i.e. after shutting down the chip, before we register the MFD devices. ST-Ericsson ID: 352334 ST-Ericcson FOSS-OUT-ID: Trivial ST-Ericsson Linux next: 274079 Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Change-Id: I48983ac4363600daf99a8edd2d3bfb9093ef94d4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29938 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Tested-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22cg2900: Add pdata_size to mfd_cellPar-Gunnar Hjalmdahl
This patch adds the pdata_size parameter to the MFD cells so that the correct amount of platform data is copied when creating MFD devices. ST-Ericsson ID: 352334 ST-Ericcson FOSS-OUT-ID: Trivial ST-Ericsson Linux next: 274079 Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Change-Id: I10f3146eac89d4e238d80829f8c209aaad909bd1 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29818 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Tested-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22cg2900: Do not send RX data to wrong userPar-Gunnar Hjalmdahl
This patch corrects an issue where received data was sent to the wrong user depending on which user first opened the channel. ST-Ericsson Linux next: Not tested, ER 282957 ST-Ericsson ID: 333690 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I14c0bb64e2bd2c0d175da0407af3da179920d015 Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29927
2012-05-22cg2900: Use correct struct for SCO start streamPar-Gunnar Hjalmdahl
This patch corrects an issue where wrong structure was used when starting a SCO stream. ST-Ericsson Linux next: Not tested, ER 282957 ST-Ericsson ID: 333792 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia36809fa623d4957f962410a3416beca2f657b9f Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19948 Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com> Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29800 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22mfd/cg2900: Fix for memory leak when using logger.Lukasz Rymanowski
Remove memory leak when sending skb to logger. ST-Ericsson Linux next: Not tested, ER282957 ST-Ericsson ID: 329071 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I0880bc71b4fa654601d96dfdddeff17e64155e55 Signed-off-by: Lukasz Rymanowski <lukasz.rymanowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18452 Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Tested-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Dariusz SZYMCZAK <dariusz.xd.szymczak@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Henrik POSSUNG <henrik.possung@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29798 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: Disable chip when init failedAndrzej Kaczmarek
Adds set_chip_power FALSE call to disable chip when it was not possible to read out revision from the chip (means that initialization failed). ST-Ericsson Linux next: Not tested, ER 351382 ST-Ericsson ID: 351382 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ia3ace0b964095d679cb9c3885de2deaa1aa195a3 Signed-off-by: Andrzej Kaczmarek <andrzej.kaczmarek@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/28057 Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Tested-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29797 Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22cg2900: Fix crash when transport is closedPar-Gunnar Hjalmdahl
This patch fixes crashes caused by transport being removed while users of the CG2900 driver still exist. ST-Ericsson Linux next: Not tested, ER 336652 ST-Ericsson ID: 336652 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I6318ce1086097a4fa63a1793b6795b01ea939715 Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/21781 Reviewed-by: QATEST Reviewed-by: Lukasz RYMANOWSKI <lukasz.rymanowski@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29795 Reviewed-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com> Tested-by: Virupax SADASHIVPETIMATH <virupax.sadashivpetimath@stericsson.com>
2012-05-22staging: cg2900: Fix for gpio header moveRobert Marklund
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-05-22staging: cg2900: Update for api change in 3.0Philippe Langlais
Add missing header file Change-Id: I2e8b87b9b5de26e741374eb11b93f15cfa37d826 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-05-22cg2900: Fix chip enableRobert Marklund
Update chip enable to use the new sugested procedure. The only change was to lower the reset time from 100 ms to just 20 ms. This should be investigated to see what the chip acually needs. Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: Ibff160fb46708b9f6c96613e623b7d90be35b3eb Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25039 Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-05-22cg2900: Add regulator supportRobert Marklund
Add regulator support needed on snowball HW. ST-Ericsson Linux next: 340135 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: Ic7b5d4559fa44fb13b788002f321898fba3d5843 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24086 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com> Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
2012-05-22staging: Add ST-Ericsson CG2900 driverPar-Gunnar Hjalmdahl
This patch adds support for the ST-Ericsson CG2900 Connectivity Combo controller (Bluetooth, FM, GPS). Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org> Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-05-19Merge branch 'for-linus' of git://git.kernel.dk/linux-blockLinus Torvalds
Pull block layer fixes from Jens Axboe: "A few small, but important fixes. Most of them are marked for stable as well - Fix failure to release a semaphore on error path in mtip32xx. - Fix crashable condition in bio_get_nr_vecs(). - Don't mark end-of-disk buffers as mapped, limit it to i_size. - Fix for build problem with CONFIG_BLOCK=n on arm at least. - Fix for a buffer overlow on UUID partition printing. - Trivial removal of unused variables in dac960." * 'for-linus' of git://git.kernel.dk/linux-block: block: fix buffer overflow when printing partition UUIDs Fix blkdev.h build errors when BLOCK=n bio allocation failure due to bio_get_nr_vecs() block: don't mark buffers beyond end of disk as mapped mtip32xx: release the semaphore on an error path dac960: Remove unused variables from DAC960_CreateProcEntries()
2012-05-18Merge tag 'dm-3.4-fixes-2' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm Pull a dm fix from Alasdair G Kergon: "A fix to the thin provisioning userspace interface." * tag 'dm-3.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm: dm thin: fix table output when pool target disables discard passdown internally
2012-05-19dm thin: fix table output when pool target disables discard passdown internallyMike Snitzer
When the thin pool target clears the discard_passdown parameter internally, it incorrectly changes the table line reported to userspace. This breaks dumb string comparisons on these table lines in generic userspace device-mapper library code and leads to tables being reloaded repeatedly when nothing is actually meant to be changing. This patch corrects this by no longer changing the table line when discard passdown was disabled. We can still tell when discard passdown is overridden by looking for the message "Discard unsupported by data device (sdX): Disabling discard passdown." This automatic detection is also moved from the 'load' to the 'resume' so that it is re-evaluated should the properties of underlying devices change. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Acked-by: Joe Thornber <ejt@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
2012-05-18Merge tag 'md-3.4-fixes' of git://neil.brown.name/mdLinus Torvalds
Pull one more md bugfix from NeilBrown: "Fix bug in recent fix to RAID10. Without this patch, recovery will crash" * tag 'md-3.4-fixes' of git://neil.brown.name/md: md/raid10: fix transcription error in calc_sectors conversion.
2012-05-19md/raid10: fix transcription error in calc_sectors conversion.NeilBrown
The old code was sector_div(stride, fc); the new code was sector_dir(size, conf->near_copies); 'size' is right (the stride various wasn't really needed), but 'fc' means 'far_copies', and that is an important difference. Signed-off-by: NeilBrown <neilb@suse.de>
2012-05-18Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds
Merge misc fixes from Andrew Morton. * emailed from Andrew Morton <akpm@linux-foundation.org>: (4 patches) frv: delete incorrect task prototypes causing compile fail slub: missing test for partial pages flush work in flush_all() fs, proc: fix ABBA deadlock in case of execution attempt of map_files/ entries drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01
2012-05-17drivers/rtc/rtc-pl031.c: configure correct wday for 2000-01-01Rajkumar Kasirajan
The reset date of the ST Micro version of PL031 is 2000-01-01. The correct weekday for 2000-01-01 is saturday, but pl031 is initialized to sunday. This may lead to alarm malfunction, so configure the correct wday if RTC_DR indicates reset. Signed-off-by: Rajkumar Kasirajan <rajkumar.kasirajan@stericsson.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Cc: Mattias Wallin <mattias.wallin@stericsson.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-05-17Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds
Pull two networking fixes from David S. Miller: 1) Thanks to Willy Tarreau and Eric Dumazet, we've unlocked a bug that's been present in do_tcp_sendpages() since that function was written in 2002. When we block to wait for memory we have to unconditionally try and push out pending TCP data, otherwise we can block for an unreasonably long amount of time. 2) Fix deadlock in e1000, fixes kernel bugzilla 43132 From Tushar Dave. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: e1000: Prevent reset task killing itself. tcp: do_tcp_sendpages() must try to push data out on oom conditions
2012-05-17ACPI / PCI / PM: Fix device PM regression related to D3hot/D3coldRafael J. Wysocki
Commit 1cc0c998fdf2 ("ACPI: Fix D3hot v D3cold confusion") introduced a bug in __acpi_bus_set_power() and changed the behavior of acpi_pci_set_power_state() in such a way that it generally doesn't work as expected if PCI_D3hot is passed to it as the second argument. First off, if ACPI_STATE_D3 (equal to ACPI_STATE_D3_COLD) is passed to __acpi_bus_set_power() and the explicit_set flag is set for the D3cold state, the function will try to execute AML method called "_PS4", which doesn't exist. Fix this by adding a check to ensure that the name of the AML method to execute for transitions to ACPI_STATE_D3_COLD is correct in __acpi_bus_set_power(). Also make sure that the explicit_set flag for ACPI_STATE_D3_COLD will be set if _PS3 is present and modify acpi_power_transition() to avoid accessing power resources for ACPI_STATE_D3_COLD, because they don't exist. Second, if PCI_D3hot is passed to acpi_pci_set_power_state() as the target state, the function will request a transition to ACPI_STATE_D3_HOT instead of ACPI_STATE_D3. However, ACPI_STATE_D3_HOT is now only marked as supported if the _PR3 AML method is defined for the given device, which is rare. This causes problems to happen on systems where devices were successfully put into ACPI D3 by pci_set_power_state(PCI_D3hot) which doesn't work now. In particular, some unused graphics adapters are not turned off as a result. To fix this issue restore the old behavior of acpi_pci_set_power_state(), which is to request a transition to ACPI_STATE_D3 (equal to ACPI_STATE_D3_COLD) if either PCI_D3hot or PCI_D3cold is passed to it as the argument. This approach is not ideal, because generally power should not be removed from devices if PCI_D3hot is the target power state, but since this behavior is relied on, we have no choice but to restore it at the moment and spend more time on designing a better solution in the future. References: https://bugzilla.kernel.org/show_bug.cgi?id=43228 Reported-by: rocko <rockorequin@hotmail.com> Reported-by: Cristian Rodríguez <crrodriguez@opensuse.org> Reported-and-tested-by: Peter <lekensteyn@gmail.com> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-05-17e1000: Prevent reset task killing itself.Tushar Dave
Killing reset task while adapter is resetting causes deadlock. Only kill reset task if adapter is not resetting. Ref bug #43132 on bugzilla.kernel.org CC: stable@vger.kernel.org Signed-off-by: Tushar Dave <tushar.n.dave@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
2012-05-17Merge branch '3.4-urgent' of ↵Linus Torvalds
git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending Pull two more target-core updates from Nicholas Bellinger: "The first patch addresses a SPC-2 reservations RELEASE bug in a special (iscsi specific) multi-ISID setup case that was allowing the same initiator to be able to incorrect release it's own reservation on a different SCSI path with enforce_pr_isid=1 operation. This bug was caught by Bernhard Kohl. The second patch is to address a bug with FILEIO backends where the incorrect number of blocks for READ_CAPACITY was being reported after an underlying device-mapper block_device size change. This patch uses now i_size_read() in fd_get_blocks() for FILEIO backends with an underlying block_device, instead of trying to determine this value at setup time during fd_create_virtdevice(). (hch CC'ed) Both are CC'ed to stable." * '3.4-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: target: Fix bug in handling of FILEIO + block_device resize ops target: Fix SPC-2 RELEASE bug for multi-session iSCSI client setups