From 09a81af91ec465a89611eb0540e8ba1b74917850 Mon Sep 17 00:00:00 2001
From: Sandrine Bailleux <sandrine.bailleux@arm.com>
Date: Thu, 16 Apr 2015 11:05:47 +0100
Subject: [PATCH 1/2] Move up dependency versions in user guide

Move up the version numbers in the user guide of:

 * DS-5 (to v5.21)
 * EDK2 (to v3.0)
 * Linux Kernel (to 1.6-Juno)
 * Linaro file-system (to 15.03)
 * Juno SCP binary (to v1.7.0 within board recovery image 0.11.3).

Change-Id: Ieb09e633acc2b33823ddf35f77f44e7da60b99ba
---
 docs/user-guide.md | 39 +++++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/docs/user-guide.md b/docs/user-guide.md
index 00feacc5d5..c1cadbbe8c 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -62,7 +62,7 @@ The following tools are required to use the ARM Trusted Firmware:
 *   `libssl-dev` package to build the certificate generation tool when support
     for Trusted Board Boot is needed.
 
-*   (Optional) For debugging, ARM [Development Studio 5 (DS-5)][DS-5] v5.20.
+*   (Optional) For debugging, ARM [Development Studio 5 (DS-5)][DS-5] v5.21.
 
 
 4.  Building the Trusted Firmware
@@ -546,7 +546,7 @@ Juno platform, follow these steps:
 
         cd edk2
         git remote add -f --tags arm-software https://github.com/ARM-software/edk2.git
-        git checkout --detach v2.1-rc0
+        git checkout --detach v3.0
 
 2.  Copy build config templates to local workspace
 
@@ -625,7 +625,7 @@ Preparing a Linux kernel for use on the FVPs can be done as follows
 
         cd linux
         git remote add -f --tags arm-software https://github.com/ARM-software/linux.git
-        git checkout --detach 1.3-Juno
+        git checkout --detach 1.6-Juno
 
 2.  Build with the Linaro GCC tools.
 
@@ -700,8 +700,8 @@ To prepare a VirtioBlock file-system, do the following:
 
     NOTE: The unpacked disk image grows to 3 GiB in size.
 
-        wget http://releases.linaro.org/14.12/openembedded/aarch64/vexpress64-openembedded_lamp-armv8-gcc-4.9_20141211-701.img.gz
-        gunzip vexpress64-openembedded_lamp-armv8-gcc-4.9_20141211-701.img.gz
+        wget http://releases.linaro.org/15.03/members/arm/openembedded/aarch64/vexpress64-openembedded_lamp-armv8-gcc-4.9_20150324-715.img.gz
+        gunzip vexpress64-openembedded_lamp-armv8-gcc-4.9_20150324-715.img.gz
 
 2.  Make sure the Linux kernel has Virtio support enabled using
     `make ARCH=arm64 menuconfig`.
@@ -763,14 +763,14 @@ To prepare a RAM-disk root file-system, do the following:
 
 1.  Download the file-system image:
 
-        wget http://releases.linaro.org/14.12/openembedded/aarch64/linaro-image-lamp-genericarmv8-20141212-729.rootfs.tar.gz
+        wget http://releases.linaro.org/15.03/members/arm/openembedded/aarch64/linaro-image-lamp-genericarmv8-20150323-747.rootfs.tar.gz
 
 2.  Modify the Linaro image:
 
         # Prepare for use as RAM-disk. Normally use MMC, NFS or VirtioBlock.
         # Be careful, otherwise you could damage your host file-system.
         mkdir tmp; cd tmp
-        sudo sh -c "zcat ../linaro-image-lamp-genericarmv8-20141212-729.rootfs.tar.gz | cpio -id"
+        sudo sh -c "zcat ../linaro-image-lamp-genericarmv8-20150323-747.rootfs.tar.gz | cpio -id"
         sudo ln -s sbin/init .
         sudo sh -c "echo 'devtmpfs /dev devtmpfs mode=0755,nosuid 0 0' >> etc/fstab"
         sudo sh -c "find . | cpio --quiet -H newc -o | gzip -3 -n > ../filesystem.cpio.gz"
@@ -1068,10 +1068,19 @@ have an earlier version installed or are unsure which version is installed,
 follow the recovery image update instructions in the [Juno Software Guide]
 on the [ARM Connected Community] website.
 
-The Juno platform requires a BL3-0 image to boot up. This image contains the
-runtime firmware that runs on the SCP (System Control Processor). This image is
-embedded within the [Juno Board Recovery Image] but can also be
-[downloaded directly][Juno SCP Firmware].
+Note that you must use the board recovery image provided in the Juno R1 Initial
+Alpha release, even for Juno R0. This is because the Trusted Firmware now
+supports the new [SCPI v1.0 final protocol][Juno SCP Protocols v1.0]
+exclusively, which is not compatible with the SCP firmware provided in the
+latest Juno R0 release. Although the Juno R1 Initial Alpha release is generally
+not recommended for use with Juno R0 boards, it is suitable for Trusted Firmware
+development.
+
+The Juno platform requires a BL0 and a BL3-0 image to boot up. The BL0 image
+contains the ROM firmware that runs on the SCP (System Control Processor),
+whereas the BL3-0 image contains the SCP Runtime firmware. Both images are
+embedded within the [Juno Board Recovery Image] but they can also be downloaded
+directly: [Juno SCP ROM Firmware] and [Juno SCP Runtime Firmware].
 
 Rebuild the Trusted Firmware specifying the BL3-0 image. Refer to the section
 "Building the Trusted Firmware". Alternatively, the FIP image can be updated
@@ -1083,7 +1092,7 @@ manually with the BL3-0 image:
 
 Juno's device tree blob is built along with the kernel. It is located in:
 
-    <path-to-linux>/arch/arm64/boot/dts/juno.dtb
+    <path-to-linux>/arch/arm64/boot/dts/arm/juno.dtb
 
 ### Other Juno software information
 
@@ -1104,8 +1113,10 @@ _Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved._
 [ARM FVP website]:             http://www.arm.com/fvp
 [ARM Connected Community]:     http://community.arm.com
 [Juno Software Guide]:         http://community.arm.com/docs/DOC-8396
-[Juno Board Recovery Image]:   http://community.arm.com/servlet/JiveServlet/download/9427-1-15432/board_recovery_image_0.10.1.zip
-[Juno SCP Firmware]:           http://community.arm.com/servlet/JiveServlet/download/9427-1-15422/bl30.bin.zip
+[Juno Board Recovery Image]:   http://community.arm.com/servlet/JiveServlet/download/10177-1-18236/board_recovery_image_0.11.3.zip
+[Juno SCP ROM Firmware]:       http://community.arm.com/servlet/JiveServlet/download/10177-1-18187/bl0.bin.zip
+[Juno SCP Runtime Firmware]:   http://community.arm.com/servlet/JiveServlet/download/10177-1-18193/bl30.bin.zip
+[Juno SCP Protocols v1.0]:     http://community.arm.com/servlet/JiveServlet/download/8401-40-18262/DUI0922A_scp_message_interface.pdf
 [Linaro Toolchain]:            http://releases.linaro.org/14.07/components/toolchain/binaries/
 [EDK2]:                        http://github.com/tianocore/edk2
 [DS-5]:                        http://www.arm.com/products/tools/software-tools/ds-5/index.php

From 6136f372db1d57c5780aef88d4722a880a927724 Mon Sep 17 00:00:00 2001
From: Juan Castillo <juan.castillo@arm.com>
Date: Thu, 16 Apr 2015 14:17:49 +0100
Subject: [PATCH 2/2] FVP: update device tree idle state entries

Device tree idle state bindings changed in kernel v3.18. This patch
updates the FVP DT files to use PSCI suspend as idle state.

The patch also updates the 'compatible' property in the PSCI node
and the 'entry-method' property in the idle-states node in the FVP
Foundation GICv2-legacy device tree.

Change-Id: Ie921d497c579f425c03d482f9d7b90e166106e2f
---
 fdts/fvp-base-gicv2-psci.dtb             | Bin 10106 -> 10151 bytes
 fdts/fvp-base-gicv2-psci.dts             |   6 ++++--
 fdts/fvp-base-gicv2legacy-psci.dtb       | Bin 10106 -> 10151 bytes
 fdts/fvp-base-gicv2legacy-psci.dts       |   6 ++++--
 fdts/fvp-base-gicv3-psci.dtb             | Bin 10734 -> 10779 bytes
 fdts/fvp-base-gicv3-psci.dts             |   6 ++++--
 fdts/fvp-foundation-gicv2-psci.dtb       | Bin 7475 -> 7520 bytes
 fdts/fvp-foundation-gicv2-psci.dts       |   6 ++++--
 fdts/fvp-foundation-gicv2legacy-psci.dtb | Bin 7475 -> 7520 bytes
 fdts/fvp-foundation-gicv2legacy-psci.dts |  10 ++++++----
 fdts/fvp-foundation-gicv3-psci.dtb       | Bin 8103 -> 8148 bytes
 fdts/fvp-foundation-gicv3-psci.dts       |   6 ++++--
 12 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/fdts/fvp-base-gicv2-psci.dtb b/fdts/fvp-base-gicv2-psci.dtb
index b8a31ce33beabb6165c45eaa796d1de07131986f..89318c1874f35951c1ee93c7ca6c219808045294 100644
GIT binary patch
delta 3131
zcmbVOO>7%Q7~Qd*x@jCj5+_b-VmooFIt2^YDF|w+rU)>SlNtmnEv*odYiOwLSaHgq
z5G|sJOAl2BAr3k8P}FNskf=ltIUrPVX{vJIfKU!O^iU8;NFaoO_hxszlWZcCjI_J+
z&3x~D@B3zUcK<qht(aPF|L14R+I!8itY<B2ID=;jS0}FfaiRI&vaICYFH*t4Bu#qy
zaRqQ)w*>C4eG7e}_52F@rw#j8^gnfNLG&)e4$6yx!`>*$&t*jv@w<z%Rxowfuo0#8
z8`oCoHp33ezLp`M=#a}Tdnclp(2cTNKpw9*N>k1t$97^YjVGm=M3nEt<)kZua-k*W
z5LY!Zowh?vOq1B@GngpV&y8i#LDTbVQ_+&PnhIA`GX~`kJ9H||8fi&eC5FF2TnVlx
zW{H%;R*83*#B)0}udcmXd5YdDZ_wmLpLVnM`!lNgx>9RuFSc8IY%!xmsaBneuD#f9
z?OWFn-)P;}D>|y>>h#Pzn6P6eu&JW*@79mghnx{7H*1J4XtdG9QQX)cQ;3CKg^?16
zaUo2HxqmpOcRt4PY7DpKL`lAidri)_<p<RJvF`);vC-G9Ky5Dcuy|i)Lh;UzoJoca
z!4DLn2;{yU%A>y&IuF0G_76uWT?eG!9BkbVqXT^4ON@WMc(46dKrG4|T_-zD5PU$D
z>MoMJJ1M@E^WAy$SG$Y-)av8XuG3kP<Kf)IZBC$3B6F>Y+N0WThyBx=+3LYk<!tsq
z^~}4RK-0dIe4k+l<@e#-poh`wcyi3~>L8=c^z80Z+ZzFzWI=hVX9GEwbpcMw3rD&w
zXQuob6pd!j+KNm$sGh;N+B1!^yx3bj619_8Uj_Q3iQjN@us)`uw?E538)Ef5w!ms{
zAstmd_P2#dMDsBRM&(l%BZBd;JQYcHvKV@0Gt@6HM-JM_cVbFQ56T}S`A4GayX4YS
zNC{rXv8}@CFxa;Ub0HR%mA>3alqZGr;Ug~(exmsj>F*Q;C**QpWMTxPOpxN(93{T2
z^_AM(+8)CktL88^<7*9gLc@Xn7aosVJkh-B^^!o32i>jEOZ_ha&2!3&)>~wA^mDt3
zW|m$wE3%n#)E~-M6q@z%qV);AQEVGsk1{sb$BWkI@TTaw2MA_)ykLO-NBCuh<`R0*
z95mBr4835s@WjB$JyG?e<VEZEAj}1mR|aA})M;tpbpX1^+<b}j{$wa#HefvF08;Xk
zSPq*SZ^H&4fE5VO=C&Y-yQ%x)In*b<AzEjni%Vg8%+ByqJicfA__6#E;?c;>SkEiV
zt<MR$953`lEo{a0DrF{7m?)1P8|9S7&sy1+uNd|v!^W`hsynAn5&iNYHcpY7iGsK;
z!-KiWJMiPnr%wlFa!<TbuKREPvSM)DMxTxGv5xi$INd1W1l+I3$xR+s!O_Y8xxu`+
zBmW#M;QrK5@%%>B_ydS1T$Jx$``=iz_`yuVrj6A(bkVRG@iW7Yp^tN}>Hi@5Tz`-}
z!}9wdb0!^`{-<G|amF}bL?6#4!3p%)=no?QEAn_UDNf7xl5sI5=aZxOA}{0Kkb&W^
n6P4-GWF<X2RV~k?8?)1OYjURg5Pyi%jdP89xwiP-@Ph9@P)!7|

delta 3077
zcmbVOTTC2P7(O$*47a7+mV1}mq6M|d7E%?q2HK)P5Vnc67TZWHpj6qiLA=z&V4{h>
ziJrvx&=?XQ+J`>altiPZ@xcd(5Ax7N5`CyXHBG&Q)Yy=E`MxuAb`A_Yz$CMC{{Nis
z`~UNufBxBvsrBL3m7;%t6Jp<+LWq7LTB`AE#a)WK1UIhG86n~;S6Xw!PlsV%6qf78
zFYT{z6A|+4@9`Wr?4L0H*syP7TwvI1az5PcGFt&=>yEJ!%%Pix4d(ps44ce_hP@^e
zInB0MmnFITh8#@ji>c-aVHIRv89VDa>C1zU0x&(3h{QH-y~Q=TlvBT%n7QwUm>8e<
zv=boKk$0Lg5636|GfSM-Qs~G#CB}N67-QN@(i+RW+H)Y0z%V<%L40+*jJnf^%-G*b
zb>3!;RN?G~IClf_<sk8H#YZU_8TaG|GTyED`5TC@=RZ&>*3%Q|>6!DGaAP*&C>$9r
zc+YB;7YZ7RIz4}n@-Gz(whhC>!vI;aStcxWUB~pV$wP%nYgoR4-x0Z3*azNwg>^Y2
zIe+~kK3s^)?ns_>R`y34+A;<-0v3kgRf}7PKtln+e54PQtC2Y%PZqt?#^#}e68RQk
z-qnpKlnO7xKYum6=ZCQMsk~lxs?-Ew4XAp`QzS2sTUX>_xyrOWRl~}$d59ak77`eb
zCY!$D1TL?(tP$(n!`dzaWLbV2tt}IjWskoMvfPd)hXP<xe5A))RZQ?}?dh(Wi5JGE
zUOteXWP{BHQj7?o1A}q4VvBTycw3{W-LhP%@X~=$2KZjZG!&SsOdWRIePXpckB9ZM
zzt-YbbWQVEXd_vZt8#F^qt>_|0BVD1)?N20n6?(93jY7(Y*oCJV(3FmV7M$VRdu<_
z@l)anjD6mz>O1JDity=?h^iN(=c;fz49XN?GS%E3n~jfT$7ZGRt<WD8Bx{q2+tQb}
z2|M~xP1V7e_@a&zUQ+gh7*jCXB;-yRT8GCI;h(H|s?!mwcV^Yqi6i8;=yHW#t$7A$
zwi`crjn;**RcseMSxYoG8AR)DycHVKBlEioO?iT7-C4IszhB4L6f}s|?Q?r{^<JW>
zPY?~%wyL?AUs7mwkO9p}X`UEk=o53%kH${j=cs=&!Pxp8i1NJUm$7;qLaoMLeB2Rb
zWDbO5DBcQyC##wyeA2H&$K2zNwaUx&NmM#skuBKx>Jh~f(B(#3S9(+?8j^F4Xn-%6
zi;ksbXU5v6wmvpBHjcI<p3j^a&2ZpejDT{nA31rV@37%R7WN^-2Cv;)E#$3+feJ^U
z1UKg(`x^&`j&+>q;FPxydsMVPyI|O_8#dhb2mYLDJNlKQ7HjfG<Dm7Ke5fhec?~vO
ziEby%=11$LiA-qe_Z#qQ-OT=r!$-?mXsUEu4h8X+fqJQ_&$=c{ng{WFx;Zts)%Je{
zf)eP>+;YEKS^E!nDr@6^>0|F2>;J*{6W<Q;T}>EvCB`fT@IS#*55>JnFJOp^Cp{nM
zyD+9QdcGH9UbI0J8jzWIyeV~jV5oic$kAS*1_Q^Aszqwm{aAHeF2+0X>As2I=j7g&
XuL~#6&CZ<PpPrbVoWA;Z%jfq056?Gn

diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts
index c1c9efbf15..1d26541c3a 100644
--- a/fdts/fvp-base-gicv2-psci.dts
+++ b/fdts/fvp-base-gicv2-psci.dts
@@ -102,7 +102,8 @@
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x0010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x0010000>;
 				entry-latency-us = <40>;
 				exit-latency-us = <100>;
 				min-residency-us = <150>;
@@ -110,7 +111,8 @@
 
 			CLUSTER_SLEEP_0: cluster-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x1010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
 				entry-latency-us = <500>;
 				exit-latency-us = <1000>;
 				min-residency-us = <2500>;
diff --git a/fdts/fvp-base-gicv2legacy-psci.dtb b/fdts/fvp-base-gicv2legacy-psci.dtb
index 4270623b56a3c3eaf132bea4ea3cb5b91af71465..0d176201d72dcaf4d40573220e9750ecb03dac0e 100644
GIT binary patch
delta 3131
zcmbVOO>7%Q7~Qd*x@jCj5+_b-VmooFIt2^YDF|w+rU)>SlNtmnEv*odYiOwLSaHgq
z5G|sJOAl2BAr3k8P}FNskf=ltIUrPVX{vJIfKU!O^iU8;NFaoO_hxszlWZcCjI_J+
z&3x~D@B3zUcK<qht(aPF|L14R+I!8itY<B2ID=;jS0}FfaiRI&vaICYFH*t4Bu#qy
zaRqQ)w*>C4eG7e}_52F@rw#j8^gnfNLG&)e4$6yx!`>*$&t*jv@w<z%Rxowfuo0#8
z8`oCoHp33ezLp`M=#a}Tdnclp(2cTNKpw9*N>k1t$97^YjVGm=M3nEt<)kZua-k*W
z5LY!Zowh?vOq1B@GngpV&y8i#LDTbVQ_+&PnhIA`GX~`kJ9H||8fi&eC5FF2TnVlx
zW{H%;R*83*#B)0}udcmXd5YdDZ_wmLpLVnM`!lNgx>9RuFSc8IY%!xmsaBneuD#f9
z?OWFn-)P;}D>|y>>h#Pzn6P6eu&JW*@79mghnx{7H*1J4XtdG9QQX)cQ;3CKg^?16
zaUo2HxqmpOcRt4PY7DpKL`lAidri)_<p<RJvF`);vC-G9Ky5Dcuy|i)Lh;UzoJoca
z!4DLn2;{yU%A>y&IuF0G_76uWT?eG!9BkbVqXT^4ON@WMc(46dKrG4|T_-zD5PU$D
z>MoMJJ1M@E^WAy$SG$Y-)av8XuG3kP<Kf)IZBC$3B6F>Y+N0WThyBx=+3LYk<!tsq
z^~}4RK-0dIe4k+l<@e#-poh`wcyi3~>L8=c^z80Z+ZzFzWI=hVX9GEwbpcMw3rD&w
zXQuob6pd!j+KNm$sGh;N+B1!^yx3bj619_8Uj_Q3iQjN@us)`uw?E538)Ef5w!ms{
zAstmd_P2#dMDsBRM&(l%BZBd;JQYcHvKV@0Gt@6HM-JM_cVbFQ56T}S`A4GayX4YS
zNC{rXv8}@CFxa;Ub0HR%mA>3alqZGr;Ug~(exmsj>F*Q;C**QpWMTxPOpxN(93{T2
z^_AM(+8)CktL88^<7*9gLc@Xn7aosVJkh-B^^!o32i>jEOZ_ha&2!3&)>~wA^mDt3
zW|m$wE3%n#)E~-M6q@z%qV);AQEVGsk1{sb$BWkI@TTaw2MA_)ykLO-NBCuh<`R0*
z95mBr4835s@WjB$JyG?e<VEZEAj}1mR|aA})M;tpbpX1^+<b}j{$wa#HefvF08;Xk
zSPq*SZ^H&4fE5VO=C&Y-yQ%x)In*b<AzEjni%Vg8%+ByqJicfA__6#E;?c;>SkEiV
zt<MR$953`lEo{a0DrF{7m?)1P8|9S7&sy1+uNd|v!^W`hsynAn5&iNYHcpY7iGsK;
z!-KiWJMiPnr%wlFa!<TbuKREPvSM)DMxTxGv5xi$INd1W1l+I3$xR+s!O_Y8xxu`+
zBmW#M;QrK5@%%>B_ydS1T$Jx$``=iz_`yuVrj6A(bkVRG@iW7Yp^tN}>Hi@5Tz`-}
z!}9wdb0!^`{-<G|amF}bL?6#4!3p%)=no?QEAn_UDNf7xl5sI5=aZxOA}{0Kkb&W^
n6P4-GWF<X2RV~k?8?)1OYjURg5Pyi%jdP89xwiP-@Ph9@P)!7|

delta 3077
zcmbVOTTC2P7(O$*47a7+mV1}mq6M|d7E%?q2HK)P5Vnc67TZWHpj6qiLA=z&V4{h>
ziJrvx&=?XQ+J`>altiPZ@xcd(5Ax7N5`CyXHBG&Q)Yy=E`MxuAb`A_Yz$CMC{{Nis
z`~UNufBxBvsrBL3m7;%t6Jp<+LWq7LTB`AE#a)WK1UIhG86n~;S6Xw!PlsV%6qf78
zFYT{z6A|+4@9`Wr?4L0H*syP7TwvI1az5PcGFt&=>yEJ!%%Pix4d(ps44ce_hP@^e
zInB0MmnFITh8#@ji>c-aVHIRv89VDa>C1zU0x&(3h{QH-y~Q=TlvBT%n7QwUm>8e<
zv=boKk$0Lg5636|GfSM-Qs~G#CB}N67-QN@(i+RW+H)Y0z%V<%L40+*jJnf^%-G*b
zb>3!;RN?G~IClf_<sk8H#YZU_8TaG|GTyED`5TC@=RZ&>*3%Q|>6!DGaAP*&C>$9r
zc+YB;7YZ7RIz4}n@-Gz(whhC>!vI;aStcxWUB~pV$wP%nYgoR4-x0Z3*azNwg>^Y2
zIe+~kK3s^)?ns_>R`y34+A;<-0v3kgRf}7PKtln+e54PQtC2Y%PZqt?#^#}e68RQk
z-qnpKlnO7xKYum6=ZCQMsk~lxs?-Ew4XAp`QzS2sTUX>_xyrOWRl~}$d59ak77`eb
zCY!$D1TL?(tP$(n!`dzaWLbV2tt}IjWskoMvfPd)hXP<xe5A))RZQ?}?dh(Wi5JGE
zUOteXWP{BHQj7?o1A}q4VvBTycw3{W-LhP%@X~=$2KZjZG!&SsOdWRIePXpckB9ZM
zzt-YbbWQVEXd_vZt8#F^qt>_|0BVD1)?N20n6?(93jY7(Y*oCJV(3FmV7M$VRdu<_
z@l)anjD6mz>O1JDity=?h^iN(=c;fz49XN?GS%E3n~jfT$7ZGRt<WD8Bx{q2+tQb}
z2|M~xP1V7e_@a&zUQ+gh7*jCXB;-yRT8GCI;h(H|s?!mwcV^Yqi6i8;=yHW#t$7A$
zwi`crjn;**RcseMSxYoG8AR)DycHVKBlEioO?iT7-C4IszhB4L6f}s|?Q?r{^<JW>
zPY?~%wyL?AUs7mwkO9p}X`UEk=o53%kH${j=cs=&!Pxp8i1NJUm$7;qLaoMLeB2Rb
zWDbO5DBcQyC##wyeA2H&$K2zNwaUx&NmM#skuBKx>Jh~f(B(#3S9(+?8j^F4Xn-%6
zi;ksbXU5v6wmvpBHjcI<p3j^a&2ZpejDT{nA31rV@37%R7WN^-2Cv;)E#$3+feJ^U
z1UKg(`x^&`j&+>q;FPxydsMVPyI|O_8#dhb2mYLDJNlKQ7HjfG<Dm7Ke5fhec?~vO
ziEby%=11$LiA-qe_Z#qQ-OT=r!$-?mXsUEu4h8X+fqJQ_&$=c{ng{WFx;Zts)%Je{
zf)eP>+;YEKS^E!nDr@6^>0|F2>;J*{6W<Q;T}>EvCB`fT@IS#*55>JnFJOp^Cp{nM
zyD+9QdcGH9UbI0J8jzWIyeV~jV5oic$kAS*1_Q^Aszqwm{aAHeF2+0X>As2I=j7g&
XuL~#6&CZ<PpPrbVoWA;Z%jfq056?Gn

diff --git a/fdts/fvp-base-gicv2legacy-psci.dts b/fdts/fvp-base-gicv2legacy-psci.dts
index 7bd5ea2681..58d3159328 100644
--- a/fdts/fvp-base-gicv2legacy-psci.dts
+++ b/fdts/fvp-base-gicv2legacy-psci.dts
@@ -102,7 +102,8 @@
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x0010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x0010000>;
 				entry-latency-us = <40>;
 				exit-latency-us = <100>;
 				min-residency-us = <150>;
@@ -110,7 +111,8 @@
 
 			CLUSTER_SLEEP_0: cluster-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x1010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
 				entry-latency-us = <500>;
 				exit-latency-us = <1000>;
 				min-residency-us = <2500>;
diff --git a/fdts/fvp-base-gicv3-psci.dtb b/fdts/fvp-base-gicv3-psci.dtb
index 27c3f9353ba97a34e087cb1a299ceaf62501b84b..f1dc75eeb8b7cac39a82f0f5db655473a4dbd501 100644
GIT binary patch
delta 3182
zcmbVOO-x)>7=3q!zkwMFIxq}SX6V557fYcjO|gQF0bA(UN<&OrO%Z5XnPDajHEJ}F
z$f7YWNUt#_)<lyonzW0WE@Y)Hh_R^)7fqvy3l=V_iFFoD9FxX)&VBE`_l6l3aFaXt
ze&4<4eBV9y=gs4>&(C!I9Qf}q!`Rbe7{<$n5x<Rg7iv9f9V&`94gVB-i*lg0_3Pt5
zcqeErqk2)xP`@$+ejR%SebVUhd+3uw+rOg!smuNo{c4w;lT&2_#Zg326!FA`LKN>K
zmyIaCRhP{uH7+|R^JOuSmv_qJ3BhIP!ZgbbLsVt5lb0<geO2%^qGhUXA`*L0_40CZ
zxjbSL&)USyeJjMo*u++!!Ng?d%3u#VD0+O|T69jET?@6)lsUOlVXegxN$0d#V$63D
zk5;ZHR{Klx%@S7>5U*)sTYYtMwnAL#CPtsOt^R>-rN5S{P<^pg^>NBvB31c{MB1wQ
zz5?RwzP%0k)O0F6_b&Wq$S96gnf%Q+Qy!;Bp7QSv_gQ0T#0yscl$y6(eQx&{-KgYt
z9~)i?ed6iQ$zaVu;0^ScJ)RcCxll7A#^mjqevy)oYKA;;b^BXjjQaPBKKZ^svik!U
zjUOO}V`)a!;Y_ks|1ik>fdwEx4t!Y81?U8b{76P?L*k3Ohii9Mh+FbP@La(Z&hC>x
z1ryAowIL?Hm4gi`rK=5zW_5`@+|a^@4iR$={q1;oRIv_%NQv1)bkGg}@=%U8w$xLS
zTFYxn@=jy_$s(+=?bx6-Ya6j|_oR-@O<$Z$&KyWxdJiKeFB!-Pe&@7Y3zbL)4>#u6
zx<8cXLuN9N#evGJp)?f8hZ4uIT6Ga2tT_RV_`{hj{zYG(Zk-2mb(1xncn&m5F`EYQ
zJbVEdmuYJ;Lh$>qg=6*9Lho6(((PclU+Kp0k)<w<(qee%5ZD>o{7Pxzc|2SXvx=sp
z_!vb#4JQ@=Wf~5Y?>eEFVt<C1Y!hs*OBaTrza1_8N+q;bc+Vc=8-7S_`!M=kJ;xEl
zN(V@t6I$f-OY^HokQ3i9CnqdU<wUUx@ecf11)pjeC!8-+F<c)HC;WQ&6BEw07sK^~
zT?&ppLGnwjDtdKExPF#5h6lGRI5(|0x_*2&hTkyZ6sZ^v*oM-X$scS}(bXQ?$5bm%
zPPg(5qBqWjueO~Xg7Q3^#nJTz30fPkW?>>*9vn@zUCCG%-6hxBDy59{#X<QDCKOXL
z8&*XrbCEU=HlQy0CNBdnQ3(XE2oY#YT!x#`1W!(+Bvj|8#b-*|XD+|HJ<|EoYvaQ&
z5|5$-9XCx|ywh^N{X`=I;k>TTQ9fuNIr)0;crS-ELDJ|s`=!fXa@lZut~+Du4b*px
ztIf&ejuCN3uI%WaxDT6Bvyz)j`CYs<o$>zoc+K*0x9_3P!a3Mw^UY0XC;8@TKe_qd
zQU)te#5xlj5clOLu@U^Pso#Aa!|2a<(DQxAD+{Fr`Wqb2J3O9$%#WGo^*l90XxoeY
zk1jd$y}WFnxorL?#d~SbkD<@=fINq|^<F(_CGI_n!AmZ{F#24e9zTsf3vCd2$K`|0
zm^d%<oe?o1o8rCVq8!EVj9iT0h$hpM6Unam%c<$PuIzj|V@%AY_VKTCSN2LaGd+8E
J|IY6`{{z#<C{_Rf

delta 3137
zcmbVNO-x)>7=8B*P==otlo|e%8D{8o(3(yM(ip%(8v|4*Qh$)pE+ljaN{1n|HLYoa
z#wNO8fxV_7sSA>JQ4=?&O}jBslP=uJLKEY3p|(j~AWUK#yE2}0-@Ef3ykP-1xpVJ#
z?>*-`_xtYq=Gt3pZ^l<D|NGl8TGtH2=r@em7Z~H{)#z2|XudJ54}KGW<a@ga=At32
zW&F~<j!uNnwr^uR?XvG-e${3Ff_a(C&dS-MZi`uXn8jn)Nih5Va@k<^lU;izbGggT
z%Bte1cp!5nu_0p}8@drtjQ-E;*@^e;MXr?^hLS*eZXyz!=-N?M-YgDnCZ_hC5EJ7N
zca?aEwdd_BF4{o6qKRknq0pYUOU(0m#hBBkNHH;czUN>ffoXn!WAs&i3Ei&C5*KAw
zKHarBNGfeRA>Ortc%jroywm98E#-rdm0`b!c&E|#Zy>(ye=+bNol0lsE@Its8OFFS
zAN!|8wS2eiKz+ns#~@nm`LH^3v+QK+VJ@SS*ZpMp==GcCdRFc)@2)(C8I`j(tji1K
z1LCl}SKcW`uT=C#te5q|$Jk?2+15c2qs34DFg{<7o*<mNlqDwT#?z^u<oL^N2{g6A
zeK-_T+()NffhmQuHK1#umW=xqeUQ;oIWHpeM&&21EM9KpdBW`0jS-9`Wc=*b@a}yj
z;;Ot*bF$hE!WmFKtQj(K$@V~0d?iN%y)>2sYAqM2g~!rh=W&)hHm!P8%pB5oC1`&5
zAeru%I5VAWPfvZQPUg=V4DoIUix4jcJDWX>#-5`+_NhH&l&itUYGT2!{Q_H8TR@Fr
ze1t>l6k=tmnM+MVP+M}^5@ah^Y7i9{<8o~VVW_GbI*QDyY%<>J00!~1b67mYTz@J|
z4&_0to2>4&AZU2V`e)I3&0VPvn&MwsS0AnB-F4>h8gSRa`c8FMrbjEy%BA|=Lm;Ck
zhYXf_B(BmeayXzvj28|!i=i4BZ|Il@oK?tyv-<Om@k7vmP>6>~ue^$Gwr-QL;<^e9
zMq8a3Fzz<;thS?=Gj6o$!;%D~)`bzeat&{EKocvSqe)*$=f%N0@MjhLQsW5WtY==h
zekfbRE1pwu-rWn=1-}p+d4c#ZEjYvGh3n$IHGKc`$~zP1h3gW%HT+u(&LDZ=fNcuB
z6FN)$V3YE$a?C{O%;hVNJ9BiR6KBEiH;u&*c|K6Dcl}M&F!AzKsEIHAQfQKhX9^<d
zjNL+%hHXS#4u?DV=4%V0_$3g<2jhM7--n0zI6?)X`ZhYgl%?0K8}>Jc_8u4=={rI^
zn(fGJw@hUNZFb3pX7!QdNp6mXTx}jW-rqLT#w|_oj*%Q&cG(%1jb-ywXHQiW{TcDL
zS$R1!Ag;-kNay$+*!&E2>7baO#QUjP-;Zm*V_ipv<%Nwl5^0sg%-IQ)!-IOA+^k*<
zgN=i)Gtq8wM}8e0!0%J_`)W%c<_j%c`L*Ts`9cBu4IEt#kNKzd&!u_IN0y7cy=oY*
zTy~v*g87nT`*^>E%VwJR9-y<AsrRw)P_!-F7sq_cWhXJ`1@%6~vC#&R?}%L88x?)B
nDi#uhG7)PNC**1Tj>x6hjq=pYxw(rkrBmmoGPh3c`_B9y>j_;9

diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts
index 32e577ada7..da090f5c32 100644
--- a/fdts/fvp-base-gicv3-psci.dts
+++ b/fdts/fvp-base-gicv3-psci.dts
@@ -100,7 +100,8 @@
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x0010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x0010000>;
 				entry-latency-us = <40>;
 				exit-latency-us = <100>;
 				min-residency-us = <150>;
@@ -108,7 +109,8 @@
 
 			CLUSTER_SLEEP_0: cluster-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x1010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
 				entry-latency-us = <500>;
 				exit-latency-us = <1000>;
 				min-residency-us = <2500>;
diff --git a/fdts/fvp-foundation-gicv2-psci.dtb b/fdts/fvp-foundation-gicv2-psci.dtb
index 5b92e5ee8288926bd72503e35def261ed4b3f189..e45791813acf9562a198dd8ba4fc24c772867e92 100644
GIT binary patch
delta 1939
zcmbVNOK4L;6rD-ayuN<Ox6S9ZHCDy680-h7CQ9Q6QV7*9M8SfzyjELmJ|wN8h*pZ|
z!i6{>E?jgYx~!xN7cNDYEr`1=vJmM;=%TnP;<+zxl2_9TbztVr{hWL5y)&5<W2IPR
zt>yPm#yZ9sW5bMvKH(d|bYr?OF>J4)zyCgRr*4A8x0rR9cFYfqW39@o*b`dXOW03Z
z<W1~fR%K3ThecMzR^3o7i{V#|3KqUqMX?f08x|QXD%D|TVW1U@tca)fE*p1>ME%hb
z4F)*~P><jTas_?HRFbX%x+uPssx=U$Z^M*CiU`+tnt{_YFgg8CV8T=an|mVTdTu_^
zj}3;j?<_^8wBJ(bL}f%p3_D~gl^)5I_8S=fmcZ+do;L1GPo=Z@yHtc>3ZpPhv@1`d
zXH1Qm3F{&k43aVUMJ%*W7>G3`)vc2nQ)SF)t$}p1`_OYmTxf`MT`XYDh>s1)4&#h^
z9>I?W`BoFnh_HH`KM<qp0rz9mO1#Z*L=4rBd|#<a>`UrH_>DI%c2n+>k^EjjmSYGT
z;O#5WzbQ61t=f4}tUJftRuFs;YS=Xtq||J5l7FS8izQe5;Ab*mP(oB%hG$Mnxdrl9
zvF!?ZjGNzRaZ^OZ9UrLyGv~R4>E$Hw?f!HuKXpT&z15eVz6VQ{h^j-ME5wRecJGo7
zV+(LHyzq)3oo0`j4t`4(@SrD)df$02oz=>98gC9&g~5Mdkrn>JUS4dfm=ZyYD|ST;
zdQ(x&@F~AsgoKCDL}I11Wi$NHt76%E$W6_VN7iek`rR8VcdiL0Nw0`rU-Fb@1gVCn
zM09w`3l18Cj%XwmUQ(j+T?LwSwP**F#IrX#(Mo8_rxq<Aq`lE=2AY~xi>Ai>n|r*C
zxN$FbL6g#orf56s-fSB?q8a}twcPSJebhCP^LN_NsOSEh0C*^J<u1rJ6BW%epgmv$
zB4RQSKcO)k>MkIF4G_MSv!Nik4xk$i_{2sa-l{QgEm{l)Q+=%iR|d#L7>aS2^<P`E
z$fqqb)V9lFC79&XVmo-AFN#Dch4oqJOL#V`Ps~Q=X3|snXkjj!V-xxGG5Vv47Um1N
LsZ8;@_Kp7mFy^VN

delta 1855
zcmbVNO-NKx6ux&H-^}xenKv^!I_6J*I0iwD7CEyRD`JE}6Qa^=A?TE1qheATg+dF1
zHsOV65#b`pMGM6i5fLqdgoF%g)h2f?ax+X2647_wdpEB=UD$*B-aF@=?>pyy=gggN
z@x^#_rS$hYW7Um}u~x<+&+&|68CZTST&`*O`xc@%3(mV?K4aW;7vN6zD=b1t`vczl
z6#FaQA1d~DylaY`n{g*CV(uX3c_k3U1#5~8V*Q<B6R}6Jb7I!L&&4*xlvdwH8RbQl
z7Ba?*My~e`*iQ0!;j6%tVpSp{c45gK=ERA@ntzF@_WvO!%qH=&lUQcnZN=1^P2wKS
zQL)UtTVlj3#Ch#dIorr)vcsbj_+WjigOZwP@=Wunc<rezZMOX_rhm<oZfJ*xB-0u5
zsg;t}QcCjY#AR=Sw~I%(cZtv56nOXORqn3BAFE>0RVTXj5<VdM_1cCJ1zG|YN<miy
zOQyg`gJ51yf%2z53FLUu-3A(8nUs)s2xebNJfW2P1^f>d4-|iN^Cu$j>o!ynVnEg7
zPl9~b9|rkLf1+){rm(xfyZF#?a*<sM#G4zjY`pi{V5}+Ie`{+jBOQwDSWAZ%BeB=P
z$b6?->?j{GipNGIV1gm6(xoM1n{pVNLXa6nx|rpRX0D*3#@L`$kzKmUh@XeT*bx}U
zmfr@>p46-Z!8|P}9vA<Fo80y)-sKR}R%mNbS$;>0JA&yl&5W_m970kb*2R3V+{N=^
zDY)ODy~`#Yp>oBqVBFek@fNn$P^wv@!Lm;<SqII7oL%~<<JdDLmNFagAyw!i(B#{!
z1y!5VB#*6~(Vb<4rh1%cd8F)&UNh08jT0@^-x)n#PPs7#+n~uwI!H9JZQZvw+<j0p
zk9}uu*}V{{Chmo6s3&vbt7kM8Am+cVmqJl0S|$Kb5`;)(qh#u8Q}VfRRNSse9Mf1B
zF-|rb8rekIG_uiR)Ugr@%~U2ZKS3v0bX2B~vc?Pa?<Of+J{G$)tJw954Yw;PmMc^I
joCrlu^C8h0N#p)B^1e7TG&VYMIGY*kA6~p)^@aZd87Ix!

diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts
index c04d535f29..5f93daa278 100644
--- a/fdts/fvp-foundation-gicv2-psci.dts
+++ b/fdts/fvp-foundation-gicv2-psci.dts
@@ -87,7 +87,8 @@
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x0010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x0010000>;
 				entry-latency-us = <40>;
 				exit-latency-us = <100>;
 				min-residency-us = <150>;
@@ -95,7 +96,8 @@
 
 			CLUSTER_SLEEP_0: cluster-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x1010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
 				entry-latency-us = <500>;
 				exit-latency-us = <1000>;
 				min-residency-us = <2500>;
diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dtb b/fdts/fvp-foundation-gicv2legacy-psci.dtb
index 71f6ae2c9cfc907e6fd60d715ca0e7c6d5533213..ac7555d91ec1dc00d75f0fe190746308a8cc9635 100644
GIT binary patch
delta 1974
zcmbVNOK4L;6rD+vyrv)0q@SdH{lr#jEC&0bQWK@|0}YgF7ouQ6T3)NIHXo8!P(&+5
zbm2lA5D^#Mh%PJX!iC^QblHNq>mm!0ZiFt18;f}E<W2HwTA>ciyt$uq&%JjhlWaH_
z4z5-I{=rzwIAbivSkp&*gP0!78cYn^OX%;s4SwK`4v0<>E9=bu;xX=aL3}Zhjvq;7
zj2Xtn^|Jm6LcGQ-!?a_*V;pNyUd5gWls$+2q($Du{#jAxgmzkFO>C77ma<5{VpOp3
zts;u$VA`<AU~y5YW)>2yS!7K-vbWo~TSOh5BRULf5Ws=pZTXU=nsnvRh47_Rt$`?g
z8>S-CM8MH%29B%1<n%v*2~!Ac?um>WsrhIxHW<pjvlNxmeoLVfRS`82bE;AbJyI#{
zH!%Dyf!Cc~4cr}{iYL>zs0e8apfFuDYY#&wO^uleYbO^Bk}>!>EVPeG#F{pI*dR3~
zZmio{1L;)vq34=7TOQ$tSiqVP@5_f;<Qa9{haU~{Ehd@}0oPG}SB$#aJP%AO@m9eR
zF<d_6``k5zea>|ce&ZF3hbec(NPbTtt1*ZT@b(qxUuCN*SM5A2*4<+sD+oRa6{{I+
zq||J5l7FRTh^3myflp+>poFNj1Wz1Oay8^HV!NivD{p><#Z41IPh_M7%-pA=rk9(*
zH+$pZ^wd>j_C`;9`Zg>@BC3vF21TriWzR0@Ftz|E>4k>|=~Q{mbnsiUfCs!u)ceMJ
z{*<1tQ$9-+9D{$yqKJNCuP!!KOo^by1-m8&YKKF*^vOSNgoKA|BC%51su@1$U1GVm
z!$ZwbN7gM<{Z<>!cdim9MX!nOx}oE`3{nhFi5T!w7aTN_j%XAW9$TWSy96}pO3_Xz
ziDz$gw4TtEPbpeGNPDB#B$}F4il)Z=n|r*0xN$FbL6g#orf56s-fS2<q{}~?Qf_se
zb<{PH^0nH~s3*Q_0C*{K;V!5)6BW%opxJK%f@0Di>DL(!br%r85`=HzY$yn>1L#Km
zbz;LGsn=O;DOwCP4)@geUF;(hVJOBy)_Zx$BA>9xP}?qumBt}HEw&ra@I?`A8pis#
k>2qK<X-v$9=4Rqk=}=}anPTd{HI$jpq^1(tEBaUd2Wr2v9smFU

delta 1890
zcmbVNO-NKx6u$R4^Jd1M=2u6@{3#2^D6r8YXBJ~c7z~;am1YY=rxY7UCJBu~p@l)4
z@IpjHxCnC5LYWp3Q7wXmgbZrcCU-7$GfWT?(Rbc^H=jLS*oFJvJLjG6JLi7)y!*aK
zv(fNU$?rABs+t&Mrx^=9$32Yc#q?leC{ytF&xhY~w+p6vIg>g#a=mYmvFt9To!jf+
zd?Z$Ry+{`{p0mMv#yGBw6=0J63X@2s{SnXoCi@$nADHY_JgX)<H*JgS#N0y6^QJ%$
z7p$0U5WC)+Y$A4;?3|df?N!*im{jZADWe=zshu%is4rA=lg|lXIqno|CL&@5Q?4*4
zj@hgKC8pZ{hnO%M#EVv9nR%xb)81?l_o|kPW#*j{Bi=-uR}Yl2^;9yI&Wz)Q{;C#A
zs-oF3#lzyYqo$<A@V9FI6-T0>10IqLP3JaON?J=P$)6LKoH5=Z9^%?9zBt>!yW3T1
z>$d+`786RX=y4VEK{4Q}X&5m<i@`!EXoN6j3UoaP=3H%{{OOtia;)%91GTSAO32#;
zGe#VDC}n#A|NZQ~qE9ydMC9E)UNZ<Wpz8I+K|bRNg8Zc?);@1g7`wo``S4M4kzE4B
zn;Vf-wC~zbq&YQkb8{>s9SV(DU58e0Y>$PJxlgnjQEp-skG&zE2BxpsNDL7dyjzsR
z*d&6qDAGkMCzHH_ikc!rdPS0f%E9MhV(j##vE+BYGsji^K+p~pipSueaWSxb8PBqb
zX(_}7mF0U>*Xd7`s#=VGED;hBd`-;x%M_j$3;sGUtzB+XBb6(D`J?(;i#D;H4z#tX
z)L6zLC+nbokiAQvI!;DSVkxs1KBNj<0GfOowV-OPo8+;zJ-Vxu&{U5VEsvD#(JLC7
zw6UV4`rD(&$|yJ5U<))kNe780w$1By27C6a+MmIiTkc+fR1<fD)wCzG!K<fK<|F36
zTQ7y8R5UdJ?j#72$c>Vzt2D`HgJE&2Ja$B7LBv?usA=RT%1t91TZ}rE0)gp@82ZO=
z1&hv##9`KSo_>ImLUFUm#Tk=bZ?fT5;$pF)jh_{P&`CZlx<UzDpN2jZC5J~d<A+ko
M(SdaKUgcN*2a>MV2mk;8

diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dts b/fdts/fvp-foundation-gicv2legacy-psci.dts
index 8dba04c1e2..4238b33074 100644
--- a/fdts/fvp-foundation-gicv2legacy-psci.dts
+++ b/fdts/fvp-foundation-gicv2legacy-psci.dts
@@ -52,7 +52,7 @@
 	};
 
 	psci {
-		compatible = "arm,psci";
+		compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
 		method = "smc";
 		cpu_suspend = <0xc4000001>;
 		cpu_off = <0x84000002>;
@@ -83,11 +83,12 @@
 		};
 
 		idle-states {
-			entry-method = "arm,psci-1.0", "arm,psci-0.2", "arm,psci";
+			entry-method = "arm,psci";
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x0010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x0010000>;
 				entry-latency-us = <40>;
 				exit-latency-us = <100>;
 				min-residency-us = <150>;
@@ -95,7 +96,8 @@
 
 			CLUSTER_SLEEP_0: cluster-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x1010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
 				entry-latency-us = <500>;
 				exit-latency-us = <1000>;
 				min-residency-us = <2500>;
diff --git a/fdts/fvp-foundation-gicv3-psci.dtb b/fdts/fvp-foundation-gicv3-psci.dtb
index d7d9e1412ca6ef9c100db1682a1999a1309c9ec2..f3e0c5d3aa0b47bdb278d044f3f010b382336eab 100644
GIT binary patch
delta 1987
zcmbVNT}V?=9KYx8!_75pn^X6dhF}w2A5$DSa6>{%O$0?mp|Z75+}zk^^g$%_5<Nvn
zdMdD|9_qpHr3Z<iUP2#w*h?_N2OlCT_RxbwM8E&t&UWqUgB|$a`~RPFe!u_Mx#vEQ
z<RgKP)<54RsW~r6(m6@;Me+7SY>=Z640%P8yt||=^Gg=*tMfg&S+X8NbPzq{nZ)p{
z+OMG#jadHx{i@3T1pTqf{tDfwvWq;gi)g(tjTiP)g@PB|7nKb!=JzU_yws@dBA?T@
zvR&R{Xd7jeh8PsKL6Vp$osG?xCuz=vxdyx`R5cM1%Mg)n@sXjq#JgDGrO^L}moOFH
zvQEBOEWH#BLctL0|D+;9I&3Ob3PD-qeq%Y8YK=rphb6{-74e3#!?~M`CsUc5l!UU<
zg2eRvw{gMHMl(EZ?r??5Yk0A~vOcElTdSFAAE#-E8KMrHdLn90^F`imidZi~qv&zA
z;b+-2%*OeaDa?}GWFC+)HD>m}NSIHt5PxEBZoi|VIRX&5qv3`KcO|kN^B~ANYwrU2
zvi6>h5)c6p@&S)p8rjqJDa#2Xd%>4&Gkdns?hyZG>vJndMyBTN{i?uz)*e3oh88f&
z9b!qg*duH!Ae(&E?y*t&wbflnf6E@eputLY{n7HSI>KHLCVMmSYq7+_ndICptW^9+
z#7IT1o{R~{KGEQsz@|!(H~E^Q6b(Ke6}I3=A>EPs(SD>$Whz}aM2^8e;~^6K0bLwr
zDmev$f{JydR;V932^ytjXhvy?YW@p4`K7o;H5$Rj_=L07M%54<I!)R0`_8aZISW>*
zdFGu1y`U$OYLtjXISk@V)7?Ps$c=D?Ta;WiOcI<XwQzCk9Sq+o!6_syT--tj!*h*_
zcPf|`PPL&t4~FZT6gUpYK5&{;!-;Nh?ki2x1IV3zCtB~KsrBX3DJfzjy{RvP%BPfZ
z+vVqLO*K5`3bldKjtyE$iiSj?<ZoTaWHeygb)^RgG=3k1_=u^WqJPAIZUcJ5J=y@M
zLkr~v_fSx_c1?EC8X>?Sd!^v?s><$G*_f6`_>^amUFNHvFuTnQo?$%wUV7%dgLrNz
py2-cJl1Rm76M@`(GM))!bE&j6n@M)k|0s}M%BJIs>+gI!>@VF@(3AiG

delta 1978
zcmbVM%}Z2K6u)<7oDWTGzWkUOb5yXgPnih|2WAEdEj4MQi3TM(gQ24`SzsHDHZ5ET
z7sRE|LIM|sA^ia^YS+S`n2n)93&S9T780G`dvj;5zHwm}?z{J#dw#$3yXU<3HsdSt
z(8uz>KNzc9VT|2itTsd|rjzDrnlwzaj0LvdgzlL8EMzV)uDQ+hg#D5x5Ym22`w_+7
zp#7p^f1<rrv9n^!9M_q-ftl|sk;H8NuGqxv0K3c#W}9MX#hj&)Z;SiZre3y32XX*V
zLi5+uqX!RjPWbGMX%Zk$B?7UDrc9I-)g^UDiJ|>}h=C~(uNsME=94P693oCw4T@#v
zlM*Aopm@`I-n*SnrYAEq<kwGvwC)LyZHzm`ob7T=L(WeNZ_e#+YccO_L(MU`X*y`C
zqEU8PRrs@_#~v@gNjqf6+qox}?A<&jcI;6;AcBsLdcDu*p3xx&;CZoppyc;ganBU&
zlO;t2wDDACIGs#{hp$CiXaFN`$VYLWvro|$YB78?rCMFffuobOTrZvF4PvA8c{9Et
z75Nyj+=$akx3Gfo#oAQaSu0-@OU@yu3ZfXIvbbVC?OG<tK60g)xa*4EdW8cTxvua5
zKG7=ea)PWs38&j0jE{w{q(`4>k@;ALDwh_pROKC4wBEqTD%umds0uKOgxl`~7F{d6
z4dd=2Y8acNAT5e2rK`y#QzR%79@7O$1~AfRs4(ukC#eV{p5AsUg4Rz|TMM9te<%d=
zFSM7fMQcDt1y;#CU6+VPD`cJqJ@`gp$cx*^YE+SbSB!fbov4QFWD9NA#j-c5-M)-Y
zr1q@X^>(xoJxKJwr)&sb8u{7aFN1VQBU4e=k*cyEa5#-{`OiEaexSo4$q1MKv*Y3O
zRa$lw%m_zqaGB%bfocs-FGmqLoGKi2hwr{xJ=jEd$Lnv*E}QB>>BNPaGbXB5PfZF4
zS5X9#Vd{v_5)l$XUt24osJBJ($nTlfe2c(B4W)z&zTQfLx{Xk=@9PTlKau_j&VV2W
zlZ}N3mleBCvB_<^DyICMyj#5UM|n!@`@89x2;ey%=%nYSwhz|6E=x{KXJ#&@lhdP<
JYd>pu_&+){<Rt(A

diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts
index 48a1afc061..daad1fbcee 100644
--- a/fdts/fvp-foundation-gicv3-psci.dts
+++ b/fdts/fvp-foundation-gicv3-psci.dts
@@ -85,7 +85,8 @@
 
 			CPU_SLEEP_0: cpu-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x0010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x0010000>;
 				entry-latency-us = <40>;
 				exit-latency-us = <100>;
 				min-residency-us = <150>;
@@ -93,7 +94,8 @@
 
 			CLUSTER_SLEEP_0: cluster-sleep-0 {
 				compatible = "arm,idle-state";
-				entry-method-param = <0x1010000>;
+				local-timer-stop;
+				arm,psci-suspend-param = <0x1010000>;
 				entry-latency-us = <500>;
 				exit-latency-us = <1000>;
 				min-residency-us = <2500>;