tee: optee: take DT status property into account
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Wed, 1 Aug 2018 09:48:33 +0000 (11:48 +0200)
committerJens Wiklander <jens.wiklander@linaro.org>
Fri, 24 Aug 2018 09:55:18 +0000 (11:55 +0200)
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>
drivers/tee/optee/core.c

index e5fd5ed217dac9562bb7ccf10c2ac96053d7a991..69ea1efbb051d032bf68e6f867549d61550b912d 100644 (file)
@@ -696,7 +696,7 @@ static int __init optee_driver_init(void)
                return -ENODEV;
 
        np = of_find_matching_node(fw_np, optee_match);
-       if (!np)
+       if (!np || !of_device_is_available(np))
                return -ENODEV;
 
        optee = optee_probe(np);