| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 1 | From d022d0c3c6cadacf8a3a5fd2bb42c465834eef26 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 2 | From: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 3 | Date: Fri, 14 Jan 2022 14:22:42 +0000 |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 31/40] ANDROID: trusty: Modify device compatible string |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 5 | |
| 6 | Drop smc keyword from device tree node as Trusty can use SMC or FFA |
| 7 | based transport. |
| 8 | |
| 9 | Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 10 | Change-Id: Id99b52f32a2122434a22f1991c0b4cd52b0676ed |
| 11 | Upstream-Status: Pending [Not submitted to upstream yet] |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 12 | Signed-off-by: Rupinderjit Singh <rupinderjit.singh@arm.com |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 13 | --- |
| 14 | Documentation/devicetree/bindings/trusty/trusty-irq.txt | 2 +- |
| 15 | Documentation/devicetree/bindings/trusty/trusty-smc.txt | 2 +- |
| 16 | drivers/trusty/trusty.c | 2 +- |
| 17 | 3 files changed, 3 insertions(+), 3 deletions(-) |
| 18 | |
| 19 | diff --git a/Documentation/devicetree/bindings/trusty/trusty-irq.txt b/Documentation/devicetree/bindings/trusty/trusty-irq.txt |
| 20 | index cbb545ad452b..ae02030be4e7 100644 |
| 21 | --- a/Documentation/devicetree/bindings/trusty/trusty-irq.txt |
| 22 | +++ b/Documentation/devicetree/bindings/trusty/trusty-irq.txt |
| 23 | @@ -48,7 +48,7 @@ Example: |
| 24 | }; |
| 25 | ... |
| 26 | trusty { |
| 27 | - compatible = "android,trusty-smc-v1"; |
| 28 | + compatible = "android,trusty-v1"; |
| 29 | ranges; |
| 30 | #address-cells = <2>; |
| 31 | #size-cells = <2>; |
| 32 | diff --git a/Documentation/devicetree/bindings/trusty/trusty-smc.txt b/Documentation/devicetree/bindings/trusty/trusty-smc.txt |
| 33 | index 1b39ad317c67..8d02a31ba814 100644 |
| 34 | --- a/Documentation/devicetree/bindings/trusty/trusty-smc.txt |
| 35 | +++ b/Documentation/devicetree/bindings/trusty/trusty-smc.txt |
| 36 | @@ -3,4 +3,4 @@ Trusty smc interface |
| 37 | Trusty is running in secure mode on the same (arm) cpu(s) as the current os. |
| 38 | |
| 39 | Required properties: |
| 40 | -- compatible: "android,trusty-smc-v1" |
| 41 | +- compatible: "android,trusty-v1" |
| 42 | diff --git a/drivers/trusty/trusty.c b/drivers/trusty/trusty.c |
| 43 | index 0486827a45ca..757dd7b2c527 100644 |
| 44 | --- a/drivers/trusty/trusty.c |
| 45 | +++ b/drivers/trusty/trusty.c |
| 46 | @@ -615,7 +615,7 @@ static int trusty_remove(struct platform_device *pdev) |
| 47 | } |
| 48 | |
| 49 | static const struct of_device_id trusty_of_match[] = { |
| 50 | - { .compatible = "android,trusty-smc-v1", }, |
| 51 | + { .compatible = "android,trusty-v1", }, |
| 52 | {}, |
| 53 | }; |
| 54 | |
| 55 | -- |
| Patrick Williams | 2194f50 | 2022-10-16 14:26:09 -0500 | [diff] [blame^] | 56 | 2.34.1 |
| Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 57 | |