summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2012-06-04Merge topic branch 'ste-multimedia-framework' into integration-linux-ux500Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-06-04Merge topic branch 'wlan' into integration-linux-ux500Philippe Langlais
2012-06-04Merge topic branch 'st-mems-sensors' into integration-linux-ux500Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-06-04Merge topic branch 'audio' into integration-linux-ux500Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-06-04Merge topic branch 'security' into integration-linux-ux500Philippe Langlais
2012-06-04Merge topic branch 'video' into integration-linux-ux500Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-06-04Merge topic branch 'hwmem' into integration-linux-ux500Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-06-04Merge topic branch 'input' into integration-linux-ux500Philippe Langlais
2012-06-04Merge topic branch 'trace-debug' into integration-linux-ux500Philippe Langlais
2012-06-04Merge topic branch 'usb' into integration-linux-ux500Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-06-04Merge topic branch 'storage-mmc' into integration-linux-ux500Philippe Langlais
2012-06-04Merge topic branch 'dma' into integration-linux-ux500Philippe Langlais
2012-06-04Merge topic branch 'gpio' into integration-linux-ux500Philippe Langlais
2012-06-04Merge topic branch 'mach-plat' into integration-linux-ux500Philippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-06-04Merge topic branch 'core' into integration-linux-ux500Philippe Langlais
2012-06-04core: Fix for prcmu pending interrupt during suspendmach-platramesh.chandrasekaran
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
2012-06-04pm: Fix for prcmu pending interrupt during suspendpmramesh.chandrasekaran
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
2012-05-25core: Fix for Ethernet doesn't work after suspendramesh.chandrasekaran
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
2012-05-25pm: Fix for Ethernet doesn't work after suspendramesh.chandrasekaran
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
2012-05-23pm: Fix for Basic Suspend/Resume to workramesh.chandrasekaran
Signed-off-by: ramesh.chandrasekaran <ramesh.chandrasekaran@stericsson.com>
2012-05-22mmio: ux500: Add U8520 machineBengt Jonsson
ST-Ericsson ID: 371953 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
2012-05-22mmio: mach-ux500: Add support for 9540Yann Gautier
ST-Ericsson ID: 398896 Signed-off-by: Yann Gautier <yann.gautier@stericsson.com>
2012-05-22mmio: u5500: cleanup is_s5500_board()Philippe Langlais
Rename is_s5500_board() -> u5500_board_is_s5500() Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
2012-05-22mmio: ux500: Coding style fixesPhilippe Langlais
Fix the most obvious violations of the kernel coding style Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
2012-05-22ARM: ux500: mmio: Corrects disable mode pin configRajat Verma
Corrects disable mode pin configuration for xshutdown pins of camera in case of HREF v60 boards. XShutdown pins should be configured in mode (dir: out, value: low) when disabled. ST-Ericsson ID: 328427 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Change-Id: I6db2fafef8061d43f191f4d7ffef6a15d2063c16 Signed-off-by: Rajat Verma <rajat.verma@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33571 Reviewed-by: QABUILD Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2012-05-22u8500: mmio: fix gpio_set_value warningRajat Verma
gpio_set_value_cansleep() should be used in place of gpio_set_value() for setting xenon_charge gpio pin which is located on expander chip in case of href boards < v60. ST-Ericsson Linux next: NA ST-Ericsson ID: 361940 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I62676b374552a2fa86f273c9d006220436c0fe68 Signed-off-by: Rajat Verma <rajat.verma@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33338 Reviewed-by: QABUILD Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2012-05-22u5500: mmio: fix build failureRabin Vincent
The header was moved but 5500 was not updated. Change-Id: Ica5e1d5386c1a41797eaac87b2e04222d06866e3 Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33275 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22ARM: ux500: mmio: Removes gpio_set_value warningRajat Verma
mmio uses gpio pin (BASE + 5) located on gpio expander chip for XENON_CHARGE. For setting this pin to high safely gpio_set_value_cansleep() must be used instead of gpio_set_value(). ST-Ericsson Linux next: NA ST-Ericsson ID: 361940 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I02e06faa3d9c1862a649f6eb84336734490a7b2b Signed-off-by: Rajat Verma <rajat.verma@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32531 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
2012-05-22ux500: mmio: update supply nameMian Yousaf Kaukab
Regulator supply name update according to the mainline version of regulator framework. Change-Id: I6a20a1a03024880361d1fe3375d978ba00678554 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32123 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22mach-ux500: mmio: Enable Camera PMIC for S5500V2 BoardPhilippe Langlais
ST-Ericsson Id: 351836 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Nikhil Bhandary <nikhil.bhandary@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30969 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2012-05-22u5500: regulators: remove LDO S (VANA) controlRabin Vincent
The PRCMU will manage this automatically based on the ePOD requests. ST-Ericsson Linux next: - ST-Ericsson ID: 332226 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I33aae94be2860f24bf5c5702f86a49525458be7d Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/27028 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2012-05-22u5500: mmio: fix after move of mmio.h from include/linux to staging directoryPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-05-22ARM: ux500: mmio: Correct disable mode gpio configRajat Verma
Corrects the disable mode gpio configuration for XShutdown gpio pins of camera sensor. Change-Id: I040956a2b3b98d44270cd8374188aeb4339b467a Signed-off-by: Rajat Verma <rajat.verma@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/25470 Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com> Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22mach-ux500: Fix for gpio header movePhilippe Langlais
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-05-22mach-ux500: Adding Support for U5500 Camera BoardPhilippe Langlais
This change will allow users to use B5500/S5500 Camera ST-Ericsson Linux next: NA ST-Ericsson ID: ST-Ericsson FOSS-OUT ID: Trivial Change-Id: If26b76e2f400e2c67cdb555454e92cbcef5b65d4 Signed-off-by: Nikhil Bhandary <nikhil.bhandary@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/23087 Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22mach-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-05-22cw1200: Manage parent device during initializationwlanPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2012-05-22wlan: ux500: Add U8520 machineBengt Jonsson
ST-Ericsson ID: 371953 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com>
2012-05-22wlan: mach-ux500: Add support for 9540Yann Gautier
ST-Ericsson ID: 398896 Signed-off-by: Yann Gautier <yann.gautier@stericsson.com>
2012-05-22u5500: WLAN: Adds prcmu_ctrl callbackBartosz Markowski
Adds prcmu_ctrl callback to u5500 WLAN platform data file. In u5500 platform cw1200 reset pin is connected to PRCMU. prcmu_resetout is used to set/unset RESOUT2_N_PIN by writing to PRCMU register (platform callback) ST-Ericsson Linux next: NA ST-Ericsson ID: 375493 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Iedfa62dcec0b0bb9bc67abb6ff8dc00b1b78f375 Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/41359 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2012-05-22u5500: cw1200: Remove requesting SDIO pinsBartosz Markowski
The SDIO pins belongs to the SDIO driver and should be handled by the SDIO driver only. The reason that it has worked up until now is that the SDIO driver has just started using pm runtime. Since both WLAN and SDIO framework enable the pins, the number of users is set to two. SDIO tries to release the pins (after 50 ms of inactivity in order to save power), the usage count does not go down to 0 and therefore the pins are not reconfigured to GPIOs, which they must be when PL18X is not driving the pins due to power down). ST-Ericsson ID: 375493 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: NA Change-Id: Ibe3dfd32cb16a9d629a8c405e5723aec787a5ae6 Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/41183 Reviewed-by: QATOOLS Reviewed-by: QABUILD Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2012-05-22[U9500] Correct the GPIO configuration for WLANRejane Durand
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 Change-Id: I5880f617c65f7cf4ca9eeabf22a53f7a77c20133 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34320 Reviewed-by: Rejane DURAND <rejane.durand@stericsson.com> Tested-by: Rejane DURAND <rejane.durand@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: Baptiste CHAULOUX <baptiste.chauloux@stericsson.com> Tested-by: Baptiste CHAULOUX <baptiste.chauloux@stericsson.com> Reviewed-by: Christophe GUIBOUT <christophe.guibout@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2012-05-22wlan: Include module.h after 3.2 updatePhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
2012-05-22ux500: enable WLAN clock by requestBartosz Markowski
Change-Id: Icd8433b49939613801c40e50138e15a4b49869d9 Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34070 Tested-by: Robert MARKLUND <robert.marklund@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-05-22cw1200: Re add snowball supportRobert Marklund
Re add power ctrl and snowball support in the cw1200 driver Change-Id: I6a6b0279a05a419e62c0259d217361e43c855665 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34064 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-05-22u8500: Adding clock control callback into platform data.Dmitry Tarnyagin
cw1200 device has hardware clock control. However on some platforms it is required to explicitly enable clock for the device. The patch adds a clock control callback into the platform data. Change-Id: I5fd619a34a4dbeff8f1b25d55bcca9e912020c23 Signed-off-by: Dmitry Tarnyagin <dmitry.tarnyagin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34069 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com> Tested-by: Robert MARKLUND <robert.marklund@stericsson.com> Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2012-05-22mach-ux500: wlan: Add prefix to wlan board funcRobert Marklund
Change-Id: I844d5b2a3021616f082adf496f88645f534a9382 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2012-05-22WLAN: u5500: Add new wlan platform file for u5500Bartosz Markowski
* Split board config files for u8500 and u5500 * Set sdi3 and mmc2 for u5500 WLAN ST-Ericsson ID: 352334 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Change-Id: I9746591fe33c3c3748a50c86d01205fc0680f5d2 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31410 Reviewed-by: Stefan NILSSON9 <stefan.xk.nilsson@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2012-05-22WLAN: u5500: Add wlan init to u5500 board fileBartosz Markowski
Adds WLAN init to board-u5500 to have platform configuration in one place. ST-Ericsson ID: 352334 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Change-Id: Ica7a1f1e588c7beaf489bafda16a763cfb4dc929 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30924 Reviewed-by: Stefan NILSSON9 <stefan.xk.nilsson@stericsson.com> Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2012-05-22WLAN: remove GPIO_IRQ conditional checksBartosz Markowski
GPIO IRQs can be used also by UMAC driver, and the .config configuration is not being set then. ST-Ericsson ID: 352334 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Bartosz Markowski <bartosz.markowski@tieto.com> Change-Id: I8f103102dd004c69725afd40453f5296ea4f20bb Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/30845 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>