openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: dts: uniphier: switch over to PSCI enable method 

At the first system bring-up, I chose to use spin-table because ARM
Trusted Firmware was not ready for this platform at that moment.

Actually, these SoCs are equipped with EL3 and able to provide PSCI.
Now I finished porting the ATF BL31 for the UniPhier platform, so it
is ready to migrate to PSCI enable method.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
Masahiro Yamada 2016-10-16 23:59:16 +09:00
parent a909d3e636
commit 2f81137f03
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi
View File

@ -43,7 +43,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
/memreserve/ 0x80000000 0x00000008; /* cpu-release-addr */ /memreserve/ 0x80000000 0x00080000;
/ { / {
compatible = "socionext,uniphier-ld11"; compatible = "socionext,uniphier-ld11";
@ -70,19 +70,22 @@ cpu0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "arm,cortex-a53", "arm,armv8";
reg = <0 0x000>; reg = <0 0x000>;
enable-method = "spin-table"; enable-method = "psci";
cpu-release-addr = <0 0x80000000>;
}; };
cpu1: cpu@1 { cpu1: cpu@1 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "arm,cortex-a53", "arm,armv8";
reg = <0 0x001>; reg = <0 0x001>;
enable-method = "spin-table"; enable-method = "psci";
cpu-release-addr = <0 0x80000000>;
}; };
}; };
psci {
compatible = "arm,psci-1.0";
method = "smc";
};
clocks { clocks {
refclk: ref { refclk: ref {
compatible = "fixed-clock"; compatible = "fixed-clock";

19
arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi
View File

@ -43,7 +43,7 @@
* OTHER DEALINGS IN THE SOFTWARE. * OTHER DEALINGS IN THE SOFTWARE.
*/ */
/memreserve/ 0x80000000 0x00000008; /* cpu-release-addr */ /memreserve/ 0x80000000 0x00080000;
/ { / {
compatible = "socionext,uniphier-ld20"; compatible = "socionext,uniphier-ld20";
@ -79,35 +79,36 @@ cpu0: cpu@0 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8"; compatible = "arm,cortex-a72", "arm,armv8";
reg = <0 0x000>; reg = <0 0x000>;
enable-method = "spin-table"; enable-method = "psci";
cpu-release-addr = <0 0x80000000>;
}; };
cpu1: cpu@1 { cpu1: cpu@1 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a72", "arm,armv8"; compatible = "arm,cortex-a72", "arm,armv8";
reg = <0 0x001>; reg = <0 0x001>;
enable-method = "spin-table"; enable-method = "psci";
cpu-release-addr = <0 0x80000000>;
}; };
cpu2: cpu@100 { cpu2: cpu@100 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "arm,cortex-a53", "arm,armv8";
reg = <0 0x100>; reg = <0 0x100>;
enable-method = "spin-table"; enable-method = "psci";
cpu-release-addr = <0 0x80000000>;
}; };
cpu3: cpu@101 { cpu3: cpu@101 {
device_type = "cpu"; device_type = "cpu";
compatible = "arm,cortex-a53", "arm,armv8"; compatible = "arm,cortex-a53", "arm,armv8";
reg = <0 0x101>; reg = <0 0x101>;
enable-method = "spin-table"; enable-method = "psci";
cpu-release-addr = <0 0x80000000>;
}; };
}; };
psci {
compatible = "arm,psci-1.0";
method = "smc";
};
clocks { clocks {
refclk: ref { refclk: ref {
compatible = "fixed-clock"; compatible = "fixed-clock";