From patchwork Thu Dec 27 19:01:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [RFC,2/2] optee: add ACPI support X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 154575 Message-Id: <20181227190122.23149-3-ard.biesheuvel@linaro.org> To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , Jens Wiklander , Sumit Garg , Graeme Gregory , Jerome Forissier Date: Thu, 27 Dec 2018 20:01:22 +0100 From: Ard Biesheuvel List-Id: Add support for devices that expose the presence of OPTEE via device object in the ACPI namespace. Signed-off-by: Ard Biesheuvel --- drivers/tee/optee/core.c | 10 ++++++++++ 1 file changed, 10 insertions(+) -- 2.19.2 diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 61ea65cfaedd..94b2fd08b446 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -14,6 +14,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#include #include #include #include @@ -689,12 +690,21 @@ static const struct of_device_id optee_dt_match[] = { }; MODULE_DEVICE_TABLE(of, optee_dt_match); +#ifdef CONFIG_ACPI +static const struct acpi_device_id optee_acpi_match[] = { + { "LNRO0020" }, + { } +}; +MODULE_DEVICE_TABLE(acpi, optee_acpi_match); +#endif + static struct platform_driver optee_driver = { .probe = optee_probe, .remove = optee_remove, .driver = { .name = "optee", .of_match_table = optee_dt_match, + .acpi_match_table = ACPI_PTR(optee_acpi_match), }, }; module_platform_driver(optee_driver);