summaryrefslogtreecommitdiff
path: root/arch/arm/mach-ux500/board-mop500.c
AgeCommit message (Collapse)Author
2012-03-21snowball: removing GPIO161 config for external connectorstable-android-ux500-3.2Mathieu J. Poirier
On snwoball V5 and up GPIO161 is routed to PMU_EN of the cg2900 and as such shouldn't be configured to handle an event from the external connector (J23). Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
2012-02-15mach-ux500:Configure Proximity GPIO based on UIBNaga RADHESH Y
Move proximity platform data from board-mop500 to board-mop500-uib and configure the GPIO pin depending on UIB ST-Ericsson ID: 374970 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id:Ie61cc1f24ec1c80cb2659eacd7bff6f10e9ccbea Signed-off-by: Naga Radhesh <naga.radheshy@stericsson.com>
2012-02-15ARM: ux500: gpio-keys: Remove dynamic handling of pinsJonas Aaberg
Dynamic handling of pins does not work properly if done manually from suspend/resume hooks, so let's remove it for the time beeing. ST-Ericsson Linux next: - ST-Ericsson ID: 369952 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3b130256b19af7feae9db0e4a1bd72c7856bb88c Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
2012-02-15ARM: ux500: Remove outdated sensors1p driverJonas Aaberg
Replaced by gpio-keyboard implementation. ST-Ericsson Linux next: - ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ic6c8ea1d83c4b3d8ad6bbd9aa06ff30213cab6be Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
2012-02-15ARM: ux500: sensors: Update with gpio handlingJonas Aaberg
Update the gpio-keyboard use of hal and proximity sensors to use the ux500 pin framework. ST-Ericsson Linux next: - ST-Ericsson ID: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I409d9734c3995d6cfdfff8c7196624a4f89b3e2d Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
2012-01-05Automatically merging tracking-igloo_kernel-usb into ↵Lee Jones
merge-integration-linux-ux500 Conflicting files: arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/board-u5500.c
2012-01-05ux500:USB:Generic USB GPIO frame workSakethram Bommisetti
Making the existing U8500 usb gpio framework to generic. This allows other platforms to use the same structure. ST-Ericsson ID: NA ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: I3d5edc139e247b2373d1dd77243421e74783a0ea Signed-off-by: Sakethram Bommisetti <sakethram.bommisetti@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30790
2012-01-05mach-ux500: board: Fix initializations for HREF & Snowball boardsPhilippe Langlais
This patch fixes regressions introduced after board initialization redesign on mainline Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-01-05ux500: Detect accelerometer i2c address on snowballRobert Marklund
Snowball V7 and above the accelerometer changed i2c address and there is now way to detect that in runtime. So between V7 and V10 we need to probe for the right address. Change-Id: I39528ca40952a8a868b7aff6c3abd7668420850d Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-01-05mach-ux500: Update boards for topic branches isolationPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-01-05u9500: fix HSI configuration to match with M7400Christophe Guibout
HSI paramters need to be updated to fit with M7400 HSI config. ST-Ericsson ID: 364664 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I06f7d62fb82212b8b864a8b90bc00b328af215b7 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32766 Reviewed-by: Christophe GUIBOUT <christophe.guibout@stericsson.com> Tested-by: Christophe GUIBOUT <christophe.guibout@stericsson.com> Reviewed-by: QABUILD Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-01-05regulators: ab8500: Add support of low voltage batteryBengt Jonsson
Low voltage batteries have a wider voltage range with lower operating voltages. Some consumers in the platform may not work with the lower voltages and therefore need an extra regulator to boost the voltage in this case. This driver adds support for checking the consumers that need higher voltage (Vaux1, 2 and 3 regulators, 3 V SIM) and control the external buck/boost regulator accordingly. Note that to utilize the low voltage battery support, the battery voltage thresholds must be changed. This applies for the low battery voltage threshold of the battery manager and the OTP setting for the AB8500 BattOk levels. ST-Ericsson ID: 282517, 363432 ST-Ericsson Linux next: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ife07a622ec9748c027dbbd78b01e4ee7e92629ec Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33616 Reviewed-by: QABUILD
2012-01-05ab8500: Separate regulator and MFD platform dataBengt Jonsson
The ab8500 MFD should not have knowledge about regulator- specific platform data like number of regulators and regulator registers. As the regulator platform data is about to grow with external regulators, this information is moved to a new structure provided by the regulator driver. ST-Ericsson ID: 282517 ST-Ericsson Linux next: - ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I77d03ffcc3273b0659dea3cffd8191b8c94b83d2 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33615 Reviewed-by: QABUILD Reviewed-by: Yvan FILLION <yvan.fillion@stericsson.com>
2012-01-05ux500: Add sensors for snowballRobert Marklund
Add sensors for snowball board, u8500 get the sensors included in the uib. Change-Id: I2a9327a6dc2eae84ab62529fc2818f2ace25e7a2 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35358 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-01-05ux500: Remove i2c devices not avalible in snowballRobert Marklund
Dont add i2c devices not avalible for snowball. Change-Id: I454eb8b097f7bb6b530f5bc0f73251444930a975 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/35355 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-01-05mach-ux500: video: machine video part addingPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-01-05mach-ux500: gpio/nomadik: move the Nomadik GPIO headerPhilippe Langlais
This takes the Nomadik GPIO header out of the plat-nomadik directory and pushes it down into <gpio/nomadik> where it belongs. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
2012-01-05mach-ux500: arm: add ST-E HSI controllerPhilippe Langlais
Signed-off-by: Pawel Szyszuk <pawel.szyszuk@stericsson.com>
2012-01-05mach-ux500: Add en_3v3 regulator to snowballRobert Marklund
Change-Id: I83345d352096ba807f2132cc1560913fc2cb00dc Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-01-05ux500: Add start up time to wlan regulatorRobert Marklund
Add 3.5 ms start up delay so the voltage have the time to stabilize. Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: Ibd769578ef1519fbd08d01b0e0085148547d239d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25038 Reviewed-by: Dmitry TARNYAGIN <dmitry.tarnyagin@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-01-05mach-ux500: reg: Add snowball wlan regulatorPhilippe Langlais
Add snowball wlan regulator to regulators and add the device to snowball. Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24085 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-01-05mach-ux500: Change device names for ux500Robert Marklund
Fix the device names to they dont collide for u5500 and u8500. This way they can be built in the same build. Change-Id: I4e109532c7ff58fc6d75792378ec782a8ac52f26 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-01-05mach-ux500: use updated gpio driverPhilippe Langlais
AB8500 gpio driver is now exporting its gpios directly. 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-01-05mach-ux500: regulator: restore ab8500 and db8500 regulators to linux-next statePhilippe Langlais
State is restored to the following patch in linux-next tree: commit 4b8f00480cecabdffd80d7a7bf79a99508422666 Author: Linus Walleij <linus.walleij@linaro.org> Date: Mon Aug 29 14:49:49 2011 +0200 Merge branch 'mfd-prcmu' into next Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32091 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-01-05mach-ux500:input:misc: Add accessory driverPhilippe Langlais
Add driver for the accessory detection block of the ab5500 PMIC. The common functions from the 8500 accessory driver are moved to abx500-accdet generic driver. This generic driver uses callbacks registerd from the 8500 and 5500 specific driver to work as a accessory driver for a perticluar platform. ST Ericsson ID: 353610 ST Ericsson FOSS-OUT ID: Trivial ST Ericsson Linux next: NA Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-01-05board-mop500: Correct the video_ctrl_gpio initializationVirupax Sadashivpetimath
add ab8500 gpio_base to the video_ctrl_gpio offset 34, i.e the 35th pin in ab8500 pins. Change-Id: I9f8dd79a1237921f5517fea43ca535cadd229504 Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30771
2012-01-05mach-ux500: dynamic detection of uibsAvinash A
Detect the uibs dynamically and resolve the conflict between the pins used for SPI with the cypress touchscreen and the keypad pins on other boards ref commit-id: I3bb7672cebe4e9696c7df6846d6031841f87ea58 Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: I661a0939e1b10dc4e1e8f21ff07f3070a7dc6963 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30589 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2012-01-05mach-ux500: Thermal power offPhilippe Langlais
To determine whether the system had a thermal power off or a regular software power off upon the next boot, the system must utilize the thermal power off bit, ThDB8500SWoff, in AB8500 register STw4500Ctrl1. Signed-off-by: Daniel Willerud <daniel.willerud@stericsson.com>
2012-01-05mach-ux500: touchscreen: Add Cypress driverPhilippe Langlais
Add the Cypress SPI based touchscreen for ux500. Signed-off-by: Avinash A <Avinash.a@stericsson.com>
2012-01-05board-mop500: change the ssp0 bus idVirupax Sadashivpetimath
Use ssp0 bus id same as that used in previous kernel. Change-Id: I4b57bc3b78aae9fbe74ff12951d5d2f99b87ec3d Signed-off-by: Virupax Sadashivpetimath <virupax.sadashivpetimath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30478
2012-01-05mach-ux500: cryp/hash: Updated for both u8500 & u5500Philippe Langlais
cryp1 & hash1 updated to be compatible on both u8500 and u5500: - added to u5500_defconfig. - settings from devices.c to board-mop500.c & board-u5500.c. - dynamic driver registration in board-mop500.c & board-u5500.c. - added cryp1 to clock-db5500.c and renamed cryp to cryp0. - added function dbx500_add_platform_device_noirq to devices-common.c. - added cryp1 and hash1 inline functions to devices-common.h (dbx500_add_cryp1). - defines added to devices-db5500.h and devices-db8500.h. - u8500_cryp/hash changed to ux500_cryp/hash. - update to handle different value for CRYP_PERIPHERAL_ID2 between u8500 and u5500 (more info in ER336742). Signed-off-by: Avinash A <Avinash.a@stericsson.com>
2012-01-05pl011: migrate pl011 changes from 2.3v3.2Philippe Langlais
Ref: ARM: ux500: uart: context save/restore uses relaxed pl011: add ifdef pl011: don't touch registers when clock is off ux500: pl011: Workaround for UART registers lockup Migrated Changes from: e1f512c, 852b78d, c2195fa, ac87c0e
2012-01-05vibrator: Force feedback vibrator driverMarcin Mielczarczyk
Implementation of ST-Ericsson's force feedback vibrator driver. ST-Ericsson ID: WP261766 Ref: Commit-id: 3f5213a6837ad774628c20b006958183b2c1932a Signed-off-by: Avinash A <Avinash.a@stericsson.com> Change-Id: Iadea56106111af2f7b05b3f74a4aa58cda6721b1 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29682 Reviewed-by: Avinash A <avinash.a@stericsson.com> Tested-by: Avinash A <avinash.a@stericsson.com>
2012-01-05hwmon: dbx500: Migrate to kernel3.0Rajagopala V
Patch includes following commits u5500: prcmu: add irqs for db5500 temperature sensor dbx500: hwmon: temperature monitor support for DB5500 ST-Ericsson ID: 352334 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Rajagopala V <rajagopala.v@stericsson.com> Change-Id: I4df816759c0f8d039b88788e35372c05990c11ce Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29681
2012-01-05mcde: mach-ux500: Migrate to kernel 3.0Rajagopala V
rename the mcde and b2r2 platform data to generic names ST-Ericsson ID: 352334 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Signed-off-by: Rajagopala V <rajagopala.v@stericsson.com> Change-Id: I84bebd98006808639390f47a97ad0a35eadfc74d Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29660
2012-01-05mach-ux500: Platform data for skeNaga Radhesh
Platform data for ske keypad ST-Ericsson ID: - ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Naga Radhesh <naga.radheshy@stericsson.com> Change-Id: I2e22219a6f5508e54136fcca1427c78f386c36e4 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29577
2012-01-05ux500: regulators: updateRabin Vincent
Regulator updates from: commit 7ff261a375cf1da4b9a701b7106d42f11df50b3d Author: Avinash A <Avinash.a@stericsson.com> Date: Fri Aug 12 16:01:23 2011 +0530 mach-ux500:ts-cypress add support on u8500 platform related changes to add support for the cypress touchscreen on u8500 ST-Ericsson ID: CR321190 commit c7f9ac5e687f8df6f2b48f48370d2cd4479237fa Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Date: Wed Jul 13 14:19:41 2011 +0200 regulators: ab8500: Removed initialization of body biasing Body biasing is handled by PRCMU and should not be overwritten by the kernel. ST-Ericsson ID: 350693 commit 2b74dbcb79a288e709b18dbda9cf592209ad1cdf Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Date: Fri Jul 1 18:18:18 2011 +0200 regulator: change vsmps3 from 1.0V to 0.925V ST-Ericsson ID: 350469 commit fcfcc8a7e23970134aeb557d23726e3213e5c79d Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Date: Tue May 31 15:43:29 2011 +0200 regulators: ab8500: Added more configurable bits ST Ericsson ID: 334602 commit 4faa6311bef9c32ebc39d7318ec8d1ced45dce31 Author: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Date: Tue May 31 15:54:25 2011 +0200 ARM: ux500: regulators: add mask for configuration There is already before a register mask in the regulator driver to allow some bits of a register to be initialized. The register value is defined in the board configuration. This patch puts a mask in the board configuration to specify which bits should actually be altered. The purpose with this patch is to avoid future mistakes when updating the allowed bits in the regulator driver. ST Ericsson ID: 334602 commit a8d27ada3b9bed3f57691fa6a32c831dd48a8e3b Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Date: Thu Jun 30 14:22:57 2011 +0200 regulator: update suspend force value for ExtSupplyRegu For HREFP_2.2 Vext1 needs to be on otherwise AB8500 looses its register contents during suspend. Vext2 is not connected to any regulator. Vext3 must be turned off. Rework is need on HREFP_2.2 in order to turn off VSMPS4_EXT_3V4 ST-Ericsson ID: 349114 commit a5dcb7001a7a42812f92461401675168943e2806 Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Date: Tue Jun 28 16:45:26 2011 +0200 regulators: update VextSupplies fix VextSupplies fix is not need on boards with DB8500v2.1. Add check to remove forcing of the VextSupply only for DB8500v2.2. ST-Ericsson ID: 349724 Change-Id: Ied04ee6546d3ddcda28635d221ec1b9b5306439c
2012-01-05mach-ux500: ste support for Osram SFH7741 and Samsung HED54XXU11Jonas Aaberg
sensors1p: added include slab.h One pin Sensor driver added. Support for proximity sensor (Osram SFH7741) and HAL switch (Samsung HED54XXU11). Signed-off-by: Olle Trank <olle.trank@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Change-Id: I4914ffe434d97cf57ebc45e62be572f2acfe5a66 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29482 Reviewed-by: Naga RADHESH Y <naga.radheshy@stericsson.com> Tested-by: Naga RADHESH Y <naga.radheshy@stericsson.com>
2012-01-05ux500_ing05160_sim_detect_0.1:change GPIO for SIM activity detection driverBibek Basu
Commit ID:Idd4c2b08: U8500: change GPIO for SIM activity detection driver Compile and booting OK Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Change-Id: Ie755214528173677e6c1ecae15b2b43ea928acac Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/28930
2012-01-05Snowball: Change initial GPIO26 directionFrans Gifford
Signed-off-by: Frans Gifford <frans.gifford@linaro.org>
2012-01-05Correcting machine name for proper parsing in Android's init.Mathieu J. Poirier
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
2012-01-05U8500: change GPIO for SIM activity detection driverBibek Basu
This patch solves two things. One is to move to AB8500 GPIO for sim activity detection and another is to fix the missing return in driver probe. ST-Ericsson Linux next: 336280 ST-Ericsson ID: 349042 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Change-Id: Idd4c2b0877c9d8a1590b4e866efa61377963fb93 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25770 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-01-05U8500 : driver for awaking modem on sim hot swap activityBibek Basu
This driver uses GPIO to detect SIM hot swap and uses Modem Access Framework to wake up modem. ST-Ericsson Linux next: 336280 ST-Ericsson ID: 329459 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ib4b1f67422317850f5d859ddf4c5e457f4cb616c Signed-off-by: Bibek Basu <bibek.basu@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23543 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-01-05drivers: modem: Add modem access driver for STE U8500Philippe Langlais
Adds platform driver which implements mechanism for accessing modem on STE U8500 platform which uses Shared Memory for communicating between Modem and Application processor. The driver also registers itself with the Modem Access framework. ST-Ericsson ID: CR329459 Change-Id: Id5bc18f6f974b026f9be2d3e2756e03417e01e07 Signed-off-by: Kumar Sanghvi <kumar.sanghvi@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23554 Reviewed-by: QATEST Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com> Conflicts: arch/arm/mach-ux500/board-mop500.c drivers/modem/Kconfig drivers/modem/Makefile
2012-01-05ux500: fix PRCMU boot problem, use new MFD driver & code cleanupPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-01-05mach-ux500: Fix board merge & cleanupPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-01-05mach-ux500: Fix for gpio header movePhilippe Langlais
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-01-05mach-ux500: Fix build problems temporaryRobert Marklund
Very temporary fixes to make it build until we have proper fixes for this issues. Change-Id: I881502ddcfb84452515e82c700507994c1289a2c Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-01-05mach-ux500: Add mmio device files and deviceRobert Marklund
Updates board_mop500.c so that mmio driver can obtain gpio config from platform Adds sensor clock configuration to board specific file. Adds support for impplementing different power cycling schemes for primary and secondary camera sensors. Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-01-05ab8500-gpio: Allow initial configuration of GPIO registersChris Kimber
Allows the setting of the initial GPIO direction & pullup registers. ST-Ericsson Linux next: Ported & patch created ST-Ericsson ID: 334609 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I676ed8129a96a2fe41865117e4c864edc09d01ce Signed-off-by: Chris Kimber <chris.kimber@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23339 Reviewed-by: Andrew LYNN <andrew.lynn@stericsson.com>