linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards
@ 2021-03-23 15:07 Michael Walle
  2021-03-23 15:07 ` [PATCH 2/2] arm64: dts: fsl-ls1028a-kontron-sl28: add rtc0 alias Michael Walle
  2021-03-29  1:55 ` [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards Shawn Guo
  0 siblings, 2 replies; 3+ messages in thread
From: Michael Walle @ 2021-03-23 15:07 UTC (permalink / raw)
  To: linux-arm-kernel, devicetree, linux-kernel
  Cc: Shawn Guo, Li Yang, Rob Herring, Michael Walle

The aliases are board-specific and shouldn't be included in the common
SoC dtsi. Move them over to the boards.

Signed-off-by: Michael Walle <michael@walle.cc>
---
 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts | 1 +
 arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts          | 1 +
 arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts          | 1 +
 arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi             | 4 ----
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
index 576fc04cbce4..09f0b11d5705 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
@@ -25,6 +25,7 @@
 		spi1 = &dspi2;
 		mmc0 = &esdhc1;
 		mmc1 = &esdhc;
+		rtc1 = &ftm_alarm0;
 	};
 
 	buttons0 {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
index fbcba9cb8503..bfd14b64567e 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts
@@ -25,6 +25,7 @@
 		serial1 = &duart1;
 		mmc0 = &esdhc;
 		mmc1 = &esdhc1;
+		rtc1 = &ftm_alarm0;
 	};
 
 	chosen {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
index 41ae6e7675ba..9322c6ad8e4a 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts
@@ -21,6 +21,7 @@
 		serial1 = &duart1;
 		mmc0 = &esdhc;
 		mmc1 = &esdhc1;
+		rtc1 = &ftm_alarm0;
 	};
 
 	chosen {
diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
index c1b33ac7d887..9506f0669ead 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -18,10 +18,6 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
-	aliases {
-		rtc1 = &ftm_alarm0;
-	};
-
 	cpus {
 		#address-cells = <1>;
 		#size-cells = <0>;
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] arm64: dts: fsl-ls1028a-kontron-sl28: add rtc0 alias
  2021-03-23 15:07 [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards Michael Walle
@ 2021-03-23 15:07 ` Michael Walle
  2021-03-29  1:55 ` [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Walle @ 2021-03-23 15:07 UTC (permalink / raw)
  To: linux-arm-kernel, devicetree, linux-kernel
  Cc: Shawn Guo, Li Yang, Rob Herring, Michael Walle

For completeness, add the rtc0 alias.

Signed-off-by: Michael Walle <michael@walle.cc>
---
 arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
index 09f0b11d5705..79a1224035c4 100644
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a-kontron-sl28.dts
@@ -25,6 +25,7 @@
 		spi1 = &dspi2;
 		mmc0 = &esdhc1;
 		mmc1 = &esdhc;
+		rtc0 = &rtc;
 		rtc1 = &ftm_alarm0;
 	};
 
@@ -202,7 +203,7 @@
 &i2c0 {
 	status = "okay";
 
-	rtc@32 {
+	rtc: rtc@32 {
 		compatible = "microcrystal,rv8803";
 		reg = <0x32>;
 	};
-- 
2.20.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards
  2021-03-23 15:07 [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards Michael Walle
  2021-03-23 15:07 ` [PATCH 2/2] arm64: dts: fsl-ls1028a-kontron-sl28: add rtc0 alias Michael Walle
@ 2021-03-29  1:55 ` Shawn Guo
  1 sibling, 0 replies; 3+ messages in thread
From: Shawn Guo @ 2021-03-29  1:55 UTC (permalink / raw)
  To: Michael Walle
  Cc: linux-arm-kernel, devicetree, linux-kernel, Li Yang, Rob Herring

On Tue, Mar 23, 2021 at 04:07:56PM +0100, Michael Walle wrote:
> The aliases are board-specific and shouldn't be included in the common
> SoC dtsi. Move them over to the boards.
> 
> Signed-off-by: Michael Walle <michael@walle.cc>

Applied both, thanks.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-03-29 18:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-23 15:07 [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards Michael Walle
2021-03-23 15:07 ` [PATCH 2/2] arm64: dts: fsl-ls1028a-kontron-sl28: add rtc0 alias Michael Walle
2021-03-29  1:55 ` [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards Shawn Guo

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).