linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Li Yang <leoyang.li@nxp.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Rob Herring <robh+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>
Cc: linux-pci@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org, Biwen Li <biwen.li@nxp.com>,
	Li Yang <leoyang.li@nxp.com>
Subject: [PATCH 04/11] arm64: dts: ls1028a: add ftm_alarm1 node to be used as wakeup source
Date: Fri, 12 Nov 2021 16:34:50 -0600	[thread overview]
Message-ID: <20211112223457.10599-5-leoyang.li@nxp.com> (raw)
In-Reply-To: <20211112223457.10599-1-leoyang.li@nxp.com>

From: Biwen Li <biwen.li@nxp.com>

Add flextimer2 based ftm_alarm1 node and enable it to be the default rtc
wakeup source for rdb and qds boards instead of the original flextimer1
based ftm_alarm0.  The ftm_alarm0 node hence is disabled by default.

Signed-off-by: Biwen Li <biwen.li@nxp.com>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
---
 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 6 +++++-
 arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 6 +++++-
 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi    | 9 +++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
index bfd14b64567e..0a8f68ff578f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -25,7 +25,7 @@ aliases {
 		serial1 = &duart1;
 		mmc0 = &esdhc;
 		mmc1 = &esdhc1;
-		rtc1 = &ftm_alarm0;
+		rtc1 = &ftm_alarm1;
 	};
 
 	chosen {
@@ -234,6 +234,10 @@ mt35xu02g0: flash@0 {
 	};
 };
 
+&ftm_alarm1 {
+	status = "okay";
+};
+
 &i2c0 {
 	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 d7b527272500..49ec2821d15f 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -21,7 +21,7 @@ aliases {
 		serial1 = &duart1;
 		mmc0 = &esdhc;
 		mmc1 = &esdhc1;
-		rtc1 = &ftm_alarm0;
+		rtc1 = &ftm_alarm1;
 	};
 
 	chosen {
@@ -132,6 +132,10 @@ mt35xu02g0: flash@0 {
 	};
 };
 
+&ftm_alarm1 {
+	status = "okay";
+};
+
 &i2c0 {
 	status = "okay";
 
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index 424dc9e5c4e4..51d165440ce9 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -1160,6 +1160,15 @@ ftm_alarm0: timer@2800000 {
 			reg = <0x0 0x2800000 0x0 0x10000>;
 			fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0 0x0>;
 			interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
+			status = "disabled";
+		};
+
+		ftm_alarm1: timer@2810000 {
+			compatible = "fsl,ls1028a-ftm-alarm";
+			reg = <0x0 0x2810000 0x0 0x10000>;
+			fsl,rcpm-wakeup = <&rcpm 0x0 0x0 0x0 0x0 0x4000 0x0 0x0>;
+			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+			status = "disabled";
 		};
 	};
 
-- 
2.25.1


  parent reply	other threads:[~2021-11-12 22:35 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-12 22:34 [PATCH 00/11] ls1028a device tree updates Li Yang
2021-11-12 22:34 ` [PATCH 01/11] dt-bindings: pci: layerscape-pci: Add EP mode compatible strings for ls1028a Li Yang
2021-11-12 22:34 ` [PATCH 02/11] dt-bindings: pci: layerscape-pci: define aer/pme interrupts Li Yang
2021-11-12 22:34 ` [PATCH 03/11] arm64: dts: ls1028a: Add PCIe EP nodes Li Yang
2021-11-12 22:34 ` Li Yang [this message]
2021-11-12 22:34 ` [PATCH 05/11] arm64: dts: ls1028a: add flextimer based pwm nodes Li Yang
2021-11-12 22:34 ` [PATCH 06/11] arm64: dts: ls1028a-rdb: reorder nodes to be alphabetic Li Yang
2021-11-12 22:34 ` [PATCH 07/11] arm64: dts: ls1028a-rdb: enable pwm0 Li Yang
2021-11-12 22:34 ` [PATCH 08/11] arm64: dts: ls1028a-qds: move rtc node to the correct i2c bus Li Yang
2021-11-12 22:34 ` [PATCH 09/11] arm64: dts: ls1028a-qds: enable lpuart1 Li Yang
2021-11-12 22:34 ` [PATCH 10/11] arm64: dts: ls1028a-qds: add overlays for various serdes protocols Li Yang
2021-11-12 22:34 ` [PATCH 11/11] arm64: dts: ls1028a-qds: enable optee node Li Yang
2021-11-13  6:36   ` Sahil Malhotra
2021-11-13  7:05     ` Leo Li

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=20211112223457.10599-5-leoyang.li@nxp.com \
    --to=leoyang.li@nxp.com \
    --cc=bhelgaas@google.com \
    --cc=biwen.li@nxp.com \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    --cc=shawnguo@kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).