diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2015-01-15 11:49:58 +0000 |
|---|---|---|
| committer | Dan Handley <dan.handley@arm.com> | 2015-01-26 12:49:32 +0000 |
| commit | e8ca7d1e32c04f4a7f9679f7d09dbe0e49baa471 (patch) | |
| tree | bf7ceed4223789ef9f83a25a8e1cbd71d3e55c33 /fdts | |
| parent | 126866f0110c6096256cd580bc778539d16b06fd (diff) | |
Increment the PSCI VERSION to 1.0
This patch:
* Bumps the PSCI VERSION to 1.0. This means that
the PSCI_VERSION API will now return the value 0x00010000
to indicate the version as 1.0. The firmware remains
compatible with PSCI v0.2 clients.
* The firmware design guide is updated to document the
APIs supported by the Trusted Firmware generic code.
* The FVP Device Tree Sources (dts) and Blobs(dtb) are also
updated to add "psci-1.0" and "psci-0.2" to the list of
compatible PSCI versions.
Change-Id: Iafc2f549c92651dcd65d7e24a8aae35790d00f8a
Diffstat (limited to 'fdts')
| -rw-r--r-- | fdts/fvp-base-gicv2-psci.dtb | bin | 10082 -> 10106 bytes | |||
| -rw-r--r-- | fdts/fvp-base-gicv2-psci.dts | 2 | ||||
| -rw-r--r-- | fdts/fvp-base-gicv2legacy-psci.dtb | bin | 10082 -> 10106 bytes | |||
| -rw-r--r-- | fdts/fvp-base-gicv2legacy-psci.dts | 2 | ||||
| -rw-r--r-- | fdts/fvp-base-gicv3-psci.dtb | bin | 10710 -> 10734 bytes | |||
| -rw-r--r-- | fdts/fvp-base-gicv3-psci.dts | 2 | ||||
| -rw-r--r-- | fdts/fvp-foundation-gicv2-psci.dtb | bin | 7451 -> 7475 bytes | |||
| -rw-r--r-- | fdts/fvp-foundation-gicv2-psci.dts | 2 | ||||
| -rw-r--r-- | fdts/fvp-foundation-gicv2legacy-psci.dtb | bin | 7451 -> 7475 bytes | |||
| -rw-r--r-- | fdts/fvp-foundation-gicv2legacy-psci.dts | 2 | ||||
| -rw-r--r-- | fdts/fvp-foundation-gicv3-psci.dtb | bin | 8079 -> 8103 bytes | |||
| -rw-r--r-- | fdts/fvp-foundation-gicv3-psci.dts | 2 |
12 files changed, 6 insertions, 6 deletions
diff --git a/fdts/fvp-base-gicv2-psci.dtb b/fdts/fvp-base-gicv2-psci.dtb Binary files differindex ae3b4c55..b8a31ce3 100644 --- a/fdts/fvp-base-gicv2-psci.dtb +++ b/fdts/fvp-base-gicv2-psci.dtb diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts index 43518a3f..c1c9efbf 100644 --- a/fdts/fvp-base-gicv2-psci.dts +++ b/fdts/fvp-base-gicv2-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>; diff --git a/fdts/fvp-base-gicv2legacy-psci.dtb b/fdts/fvp-base-gicv2legacy-psci.dtb Binary files differindex 2d23968f..4270623b 100644 --- a/fdts/fvp-base-gicv2legacy-psci.dtb +++ b/fdts/fvp-base-gicv2legacy-psci.dtb diff --git a/fdts/fvp-base-gicv2legacy-psci.dts b/fdts/fvp-base-gicv2legacy-psci.dts index 06d33e74..7bd5ea26 100644 --- a/fdts/fvp-base-gicv2legacy-psci.dts +++ b/fdts/fvp-base-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>; diff --git a/fdts/fvp-base-gicv3-psci.dtb b/fdts/fvp-base-gicv3-psci.dtb Binary files differindex c2f63ebe..27c3f935 100644 --- a/fdts/fvp-base-gicv3-psci.dtb +++ b/fdts/fvp-base-gicv3-psci.dtb diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts index 6afa44c7..32e577ad 100644 --- a/fdts/fvp-base-gicv3-psci.dts +++ b/fdts/fvp-base-gicv3-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>; diff --git a/fdts/fvp-foundation-gicv2-psci.dtb b/fdts/fvp-foundation-gicv2-psci.dtb Binary files differindex df8e629f..5b92e5ee 100644 --- a/fdts/fvp-foundation-gicv2-psci.dtb +++ b/fdts/fvp-foundation-gicv2-psci.dtb diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts index 15ff4718..c04d535f 100644 --- a/fdts/fvp-foundation-gicv2-psci.dts +++ b/fdts/fvp-foundation-gicv2-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>; diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dtb b/fdts/fvp-foundation-gicv2legacy-psci.dtb Binary files differindex ed432541..71f6ae2c 100644 --- a/fdts/fvp-foundation-gicv2legacy-psci.dtb +++ b/fdts/fvp-foundation-gicv2legacy-psci.dtb diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dts b/fdts/fvp-foundation-gicv2legacy-psci.dts index a923c348..8dba04c1 100644 --- a/fdts/fvp-foundation-gicv2legacy-psci.dts +++ b/fdts/fvp-foundation-gicv2legacy-psci.dts @@ -83,7 +83,7 @@ }; idle-states { - entry-method = "arm,psci"; + entry-method = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; CPU_SLEEP_0: cpu-sleep-0 { compatible = "arm,idle-state"; diff --git a/fdts/fvp-foundation-gicv3-psci.dtb b/fdts/fvp-foundation-gicv3-psci.dtb Binary files differindex 724847c3..d7d9e141 100644 --- a/fdts/fvp-foundation-gicv3-psci.dtb +++ b/fdts/fvp-foundation-gicv3-psci.dtb diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts index 49290e4e..48a1afc0 100644 --- a/fdts/fvp-foundation-gicv3-psci.dts +++ b/fdts/fvp-foundation-gicv3-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>; |