Re: [PATCH] arm64: dts: ls1028a: fix optee node
From: Li Yang <hidden>
Date: 2021-03-22 23:13:28
Also in:
linux-arm-kernel, lkml
On Thu, Mar 18, 2021 at 3:36 AM Michael Walle [off-list ref] wrote:
Don't enable the optee node in the SoC include. It is an optional component and actually, if enabled, breaks boards which doesn't have it.
Hi Shawn, Shall we make this a general rule? I see quite a few SoC dtsi files are having the optee node enabled by default. Regards, Leo
quoted hunk ↗ jump to hunk
This reverts commit 48787485f8de ("arm64: dts: ls1028a: enable optee node") and enables the node per board, assuming the intend of the original author was to enable OPTEE for the LS1028A-RDB and the LS1028A-QDS. Fixes: 48787485f8de ("arm64: dts: ls1028a: enable optee node") Reported-by: Guillaume Tucker <redacted> Reported-by: "kernelci.org bot" <redacted> Tested-by: Michael Walle <redacted> Signed-off-by: Michael Walle <redacted> --- arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 4 ++++ arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 4 ++++ arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 3 ++- 3 files changed, 10 insertions(+), 1 deletion(-)diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts index fbcba9cb8503..060d3c79244d 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts@@ -327,6 +327,10 @@ status = "okay"; }; +&optee { + status = "okay"; +}; + &sai1 { status = "okay"; };diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts index 41ae6e7675ba..1bdf0104d492 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts@@ -274,6 +274,10 @@ status = "okay"; }; +&optee { + status = "okay"; +}; + &sai4 { status = "okay"; };diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi index 50d277eb2a54..e2007ebacd69 100644 --- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi@@ -92,9 +92,10 @@ }; firmware { - optee { + optee: optee { compatible = "linaro,optee-tz"; method = "smc"; + status = "disabled"; }; }; --2.20.1