aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2018-08-01 05:48:33 -0400
committerJens Wiklander <jens.wiklander@linaro.org>2018-08-24 05:55:18 -0400
commitdb878f76b9ff7487da9bb0f686153f81829f1230 (patch)
treebb7d90f7e7cf95cb371644964dc1d3219ec74328
parent94710cac0ef4ee177a63b5227664b38c95bbf703 (diff)
tee: optee: take DT status property into account
DT nodes may have a 'status' property which, if set to anything other than 'ok' or 'okay', indicates to the OS that the DT node should be treated as if it was not present. So add that missing logic to the OP-TEE driver. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
-rw-r--r--drivers/tee/optee/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c
index e5fd5ed217da..69ea1efbb051 100644
--- a/drivers/tee/optee/core.c
+++ b/drivers/tee/optee/core.c
@@ -696,7 +696,7 @@ static int __init optee_driver_init(void)
696 return -ENODEV; 696 return -ENODEV;
697 697
698 np = of_find_matching_node(fw_np, optee_match); 698 np = of_find_matching_node(fw_np, optee_match);
699 if (!np) 699 if (!np || !of_device_is_available(np))
700 return -ENODEV; 700 return -ENODEV;
701 701
702 optee = optee_probe(np); 702 optee = optee_probe(np);