summaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)Author
2011-10-07mach-ux500:u8500: Temporarily disable DMA for mmc and sdUlf Hansson
Due to problem with suspend and resume for mmc/sd, directly related to the DMA support in the MMCI driver, we temporarily disable DMA. Change-Id: I92d1090b7190503f4a136be2361495f11215a3ab Signed-off-by: Ulf Hansson <ulf.hansson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32763 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/33233 Tested-by: John FREDRIKSSON <john.xj.fredriksson@stericsson.com>
2011-10-05mach-ux500: Add en_3v3 regulator to snowballRobert Marklund
Change-Id: I83345d352096ba807f2132cc1560913fc2cb00dc Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-10-05mach-ux500: reg: Add snowball en_3v3 regulatorRobert Marklund
Change-Id: I4684914897f888a5c61823e003788d3b91c4c226 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-10-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>
2011-10-05mach-ux500: reg: Add snowball wlan regulatorRobert Marklund
Add snowball wlan regulator to regulators and add the device to snowball. ST-Ericsson Linux next: 340134 ST-Ericsson ID: 340139 ST-Ericsson FOSS-OUT ID: Trivial Signed-off-by: Robert Marklund <robert.marklund@stericsson.com> Change-Id: I80aef0e8d005822bbd7c23f226155b5404292d5a Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24085 Reviewed-by: Philippe LANGLAIS <philippe.langlais@stericsson.com>
2011-10-05u5500: mcde: Fix build errorsRobert Marklund
Make id build even without CONFIG_MCDE_DISPLAY_HDMI_FB_AUTO_CREATE Change-Id: I831fba4be5c12fd44f1228ac01ae943dcc17a911 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-10-05mach-ux500: mcde: Add prefix to mcde board funcRobert Marklund
Change-Id: Ia0e4f9ba5df5fe369df61dc1b843811990834e09 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-10-05mach-ux500: wlan: Add prefix to wlan board funcRobert Marklund
Change-Id: I844d5b2a3021616f082adf496f88645f534a9382 Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-10-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>
2011-10-05mach-ux500: Re-introduce specific mmc init for Snowball boardsPhilippe Langlais
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
2011-10-05config: Update the u8500 def configRobert Marklund
Change-Id: I6f0959ab3d5496d54d35cdf74354b27d616ba8cf Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
2011-10-05gpio: nomadik: support low EMI modeRabin Vincent
ST-Ericsson ID: 345488 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I88f6c92f199e52186acf6899e14ed399aba657ac Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32354 Reviewed-by: Srinidhi KASAGAR <srinidhi.kasagar@stericsson.com>
2011-10-05u5500: clock: remove some 8500 specific codeRabin Vincent
ST-Ericsson ID: 343921 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I63642a359193340b92838758fc6cc0f582a1cfba Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/31969
2011-10-05u8500_defconfig: Enable ip rule supportChristian Nilsson
Added support for multiple routing tables used for Dial Up Networking and enabled the usage of ip rule command to configure them. ST-Ericsson ID: 339665 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I3a570cdf0dbdbea2b2279428fa10d8a1fc63f659 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32428 Reviewed-by: Christian NILSSON <christian.c.nilsson@stericsson.com> Tested-by: Christian NILSSON <christian.c.nilsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05u5500: defconfig: enable new PRCMU driverVenkata Biswanath
Change-Id: I89fc75a7d42708e742e6da02dd6110232dad82fb Signed-off-by: Venkata Biswanath <venkata.biswanath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32451 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05u5500: prcmu: fix path to header fileRabin Vincent
Change-Id: If55cc0a33e026a6662d7b067a09b1900bd292a6a 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>
2011-10-05u5500: prcmu: move and update power state/epod consumersVenkata Biswanath
Change-Id: Ieb54928cd12ed2fe8129b58d546f165ac58d9d00 Signed-off-by: Venkata Biswanath <venkata.biswanath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32447 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05u5500: delete old regulator fileVenkata Biswanath
This is moved to the PRCMU driver. Change-Id: I4056436f94c1c07830df2757f82156348a366e02 Signed-off-by: Venkata Biswanath <venkata.biswanath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32446 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05u5500: clock: fix SDMMCCLK and SPARE1CLK clock rateVenkata Biswanath
Change-Id: I856323c20bd947fb1039b77a0579093e551a0812 Signed-off-by: Venkata Biswanath <venkata.biswanath@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32445 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: gpio: move gpio base numbers to platform headerMian Yousaf Kaukab
Gpio numbers starts with DB gpios followed by gpio-expander gpios and then AB gpios. Change-Id: Iba0d0c24d36278afeeaaffb509650b60084985b2 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32346 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: clocks: switch u8500 to use common debug codeMian Yousaf Kaukab
Also move the debug initialization to clock-debug.c Change-Id: I7898721c17a6ceb9f711c1edcc2d209b03428191 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32150 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ARM: u8500: clocks: Change to mdelayJonas Aaberg
The resolution of msleep is related to HZ, so with HZ set to 100 any msleep of less than 10ms will become ~10ms. ST-Ericsson ID: - ST-Ericsson Linux next: Not tested ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I595c8c41948221705c63e7540167ca34416f7b0d Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32149
2011-10-05ux500: clocks: update clocks state initializationMian Yousaf Kaukab
Remove code related to boot clock configurations and add all the clocks to init_clock_states(). Change-Id: I7c964321f34f09a7bcf7508018c8cf9a5d099df3 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32148 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: clocks: remove workaround for u5500 v1Mian Yousaf Kaukab
Change-Id: I31761cef055ef1c7e7093c01aa1a5545a3625b05 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32147 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: clocks: fix compiler warning in clock-debug.cMian Yousaf Kaukab
Change-Id: I1ae4ef83a6da91a70903afd36a72d7f914f8218d Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32146 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: clocks: move common macros to clock.hMian Yousaf Kaukab
Change-Id: Iae6b959e8232f318d4ae379f1b8499c7ca4a1272 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32145 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: clocks: add clocks with clkdev_add_table()Mian Yousaf Kaukab
Remove the previous custom function used to add clocks. Change-Id: Ib8ca60eba80b08b3ca5f41f6774c71aaeb19e915 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32144 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: clocks: swtich to new version of prcmu driverMian Yousaf Kaukab
Change-Id: I1fdd575538c20ce0e5015e63520a56ef4091f916 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32143 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: jtag: consolidate jtag enabled checksMian Yousaf Kaukab
Jtag debugging can be disabled from the secure world or form kernel configuration. Consolidate all jtag enabled checks for both u8500 and u5500. Change-Id: Ife5f4c47dd6470d2d9e31cbb83438c73131a4db5 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32141 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: regulator: add debugging support for dbx500 regulatorsMian Yousaf Kaukab
ST-Ericsson ID: 360515 ST-Ericsson Linux next: NA ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I71dbb5bc63e08998486a7c3a699a4d90da59df4e Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32137 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: Move atomic regulator header fileJonas Aaberg
Atomic regulators should be placed in a regulator include file, not in mfd. Change-Id: I5fecdfd4f0aaed48b30b119cd22ab13a8b740417 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32136
2011-10-05ARM: u5500: prcmu-qos: Add DDR limitsJonas Aaberg
Change-Id: Icf6d6c68909c9e16f83c1d0d72ad6bc15459cb62 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32135
2011-10-05ARM: ux500: Save/restore localtimers contextJonas Aaberg
Change-Id: Ie7c60fbf61024fb80bb7b2c1857df5b0bb607d62 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32134
2011-10-05ARM: kernel: smp_twd: Add save/restore functionsJonas Aaberg
Add simple save and restore functions which needs to be called before/after the core(s) are powered off. Change-Id: I95b7e5205d067e3c4949ba09370ea099633ca54e Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32133
2011-10-05Reset to linux-next patch:Jonas Aaberg
commit 774959368b9b567685179682cebfcf63e540b17b Author: Colin Cross <ccross@android.com> Date: Thu May 19 17:24:51 2011 -0700 ARM: smp_twd: Reconfigure clockevents after cpufreq change Change-Id: If31593fe23c00df528af597e6fd2baaf0c102753 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32132
2011-10-05ARM: ux500: Add usecase governorJonas Aaberg
Change-Id: I159454b9a5507090f707e6d60c5b75adc82d4e71 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32131
2011-10-05ux500: 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>
2011-10-05ux500: mcde: update supply namesMian Yousaf Kaukab
Regulator supply name update according to the mainline version of regulator framework. Change-Id: I4ab2cd0b2d015a8ce2e67ae5c040e81e6bdf78aa Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32125 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: mcde: use constant device idsMian Yousaf Kaukab
Changing device ids based on the current configuration makes it difficult to define regulator and clocks mappings. Change-Id: I0229ac3c2096a9621cd5aacdfc40a92423a10b83 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32124 Reviewed-by: Marcus LORENTZON <marcus.xm.lorentzon@stericsson.com> Reviewed-by: Jimmy RUBIN <jimmy.rubin@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: 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>
2011-10-05ARM: config: u8500: Enable DB8500 regulatorsJonas Aaberg
Change-Id: Ieb69b0092465a71e7233cc63bddb149998f96410 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32110
2011-10-05ux500: regulator: allow mode switching for vaux1, vaux2 and vintcoreMian Yousaf Kaukab
So that ab8500 regulators vaux1, vaux2 and vintcore can be switched to low power mode when high current is not required. Dynamic mode switching is currently only allowed for vintcore. Change-Id: Ifeb834572a00fc03fcea05cb547120f0bf63a424 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32108 Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: regulator: update ab8500 vaux1 regulator for cypress displayMian Yousaf Kaukab
Voltage range is adjusted. Always-on configuration is removed as it is not needed anymore. Change-Id: Ib43f8906c4439b3abeea11ea883a3c5a66c98fff Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32107 Tested-by: Jonas ABERG <jonas.aberg@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: regulator: put ab8500 vrf1 regulator in hardware controlBengt Jonsson
Vrf1 regulator is put in hardware control at initialization. Change-Id: I96ab9eef5e7e062a995766fec704aab07c72c616 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32106 Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: regulator: add and update ab8500 consumersMian Yousaf Kaukab
Change-Id: Ia6ebbface5178f9464f8b123e960d9f9d1fe3bcc Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32105 Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ux500: regulator: ExtSupply3LPn in low powerMattias Wallin
This patch sets the ExtSupply3LPn in low power mode at startup. ExtSupply3LPn can control the ExtSmps4 and ExtSmps3. On HREF the ExtSupply3LPn is configured to control only ExtSmps4. Change-Id: I43bc26185e7d1ad64d0b8d0d2301cc72c01c8f9e Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32104 Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05regulator: ab8500: add regulators for sysclkreqMian Yousaf Kaukab
These regulators control power to the wireless LAN and bluetooth chips. Change-Id: I08a7a57080ed714eb16d5532cf5ec02eb45dc2a7 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32099 Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05ARM: ux500: regulators: add mask for configurationBengt Jonsson
There is already 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. Change-Id: I55c531c9258854dbaf9c4ecb5786ca5d7bfdfcf2 Signed-off-by: Bengt Jonsson <bengt.g.jonsson@stericsson.com> Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32096 Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05regulator: ab8500: add initialization of vsmps regulatorsMian Yousaf Kaukab
Add initialization of Vsmps 1 2 and 3 regulators. Also update vsmps1 voltage level and high-power/low-power control through sysclk-request. Vpll high-power/low-power control through sysclk-request is updated as well. Please note that all vsmps3 related registers that is AB8500_VSMPS3SEL1 AB8500_VSMPS3SEL2 AB8500_VSMPS3SEL3 AB8500_VSMPS3REGU are PRCMU register and not supposed to be updated directly. Please remove them once soc-settings is fully mature. Change-Id: I746d4a8928d724e5e5922df8704ede9cb2ceac21 Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32095 Reviewed-by: Bengt JONSSON <bengt.g.jonsson@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Tested-by: Jonas ABERG <jonas.aberg@stericsson.com>
2011-10-05regulator: restore ab8500 and db8500 regulators to linux-next stateMian Yousaf Kaukab
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 Change-Id: I603d50f61f99ccec89c1f6e32f7d95e6c925cb87 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>