2021-03-24 03:14:13

by Michael Walle

Subject: [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards

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 <[email protected]>
---
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

2021-03-29 01:57:29

by Shawn Guo

Subject: Re: [PATCH 1/2] arm64: dts: ls1028a: move rtc alias to individual boards

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 <[email protected]>

Applied both, thanks.