Messages in this thread Patch in this message | | | Date | Mon, 10 Jan 2022 12:59:59 -0000 | From | "tip-bot2 for Jacky Bai" <> | Subject | [tip: timers/core] dt-bindings: timer: tpm-timer: Add imx8ulp compatible string |
| |
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 453e2cadc97ca52e423852435522eb7d4f4b5b6b Gitweb: https://git.kernel.org/tip/453e2cadc97ca52e423852435522eb7d4f4b5b6b Author: Jacky Bai <ping.bai@nxp.com> AuthorDate: Fri, 26 Nov 2021 15:39:58 +08:00 Committer: Daniel Lezcano <daniel.lezcano@linaro.org> CommitterDate: Mon, 29 Nov 2021 11:02:02 +01:00
dt-bindings: timer: tpm-timer: Add imx8ulp compatible string
The tpm timer on i.MX8ULP is derived from i.MX7ULP, it use two compatible strings, so update the compatible string for it.
Reviewed-by: Dong Aisheng <aisheng.dong@nxp.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Jacky Bai <ping.bai@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> Link: https://lore.kernel.org/r/20211126074002.1535696-4-peng.fan@oss.nxp.com Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml b/Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml index edd9585..f69773a 100644 --- a/Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml +++ b/Documentation/devicetree/bindings/timer/nxp,tpm-timer.yaml @@ -19,7 +19,11 @@ description: | properties: compatible: - const: fsl,imx7ulp-tpm + oneOf: + - const: fsl,imx7ulp-tpm + - items: + - const: fsl,imx8ulp-tpm + - const: fsl,imx7ulp-tpm reg: maxItems: 1
| |