LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "tip-bot2 for Jacky Bai" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Dong Aisheng <aisheng.dong@nxp.com>,
	Rob Herring <robh@kernel.org>, Jacky Bai <ping.bai@nxp.com>,
	Peng Fan <peng.fan@nxp.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] dt-bindings: timer: tpm-timer: Add imx8ulp compatible string
Date: Mon, 10 Jan 2022 12:59:59 -0000	[thread overview]
Message-ID: <164181959930.16921.12955922537675364828.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20211126074002.1535696-4-peng.fan@oss.nxp.com>

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

  parent reply	other threads:[~2022-01-10 13:02 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-26  7:39 [PATCH V6 0/7] dt-bindinds/dts: support i.MX8ULP Peng Fan (OSS)
2021-11-26  7:39 ` [PATCH V6 1/7] dt-bindings: i2c: imx-lpi2c: Add imx8ulp compatible string Peng Fan (OSS)
2021-11-29  8:43   ` Wolfram Sang
2021-11-26  7:39 ` [PATCH V6 2/7] dt-bindings: serial: fsl-lpuart: " Peng Fan (OSS)
2021-11-26  7:39 ` [PATCH V6 3/7] dt-bindings: timer: tpm-timer: " Peng Fan (OSS)
2021-11-29 10:02   ` Daniel Lezcano
2022-01-10 12:59   ` tip-bot2 for Jacky Bai [this message]
2021-11-26  7:39 ` [PATCH V6 4/7] dt-bindings: watchdog: imx7ulp-wdt: " Peng Fan (OSS)
2021-11-26  7:40 ` [PATCH V6 5/7] dt-bindings: arm: fsl: Add binding for imx8ulp evk Peng Fan (OSS)
2021-12-06  3:10   ` Shawn Guo
2021-11-26  7:40 ` [PATCH V6 6/7] arm64: dts: imx8ulp: Add the basic dtsi file for imx8ulp Peng Fan (OSS)
2021-12-06  2:17   ` Shawn Guo
2021-12-06  3:01     ` Peng Fan
2021-12-06  3:07       ` Shawn Guo
2021-12-06  3:10   ` Shawn Guo
2021-11-26  7:40 ` [PATCH V6 7/7] arm64: dts: imx8ulp: Add the basic dts for imx8ulp evk board Peng Fan (OSS)
2021-12-06  3:11   ` Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=164181959930.16921.12955922537675364828.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=aisheng.dong@nxp.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=peng.fan@nxp.com \
    --cc=ping.bai@nxp.com \
    --cc=robh@kernel.org \
    --cc=x86@kernel.org \
    --subject='Re: [tip: timers/core] dt-bindings: timer: tpm-timer: Add imx8ulp compatible string' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).