This patch series addresses the conversion of the RTC binding for
Atmel/Microchip SoCs to Device Tree Schema format. It also changes
the node names from some of the "dtsi" files from "rtt" to the more
generic "rtc", while moving some of the specific properties from the
"dts" files to the "dtsi" files as well as adding this required property to
the "dtsi" files that were missing it.
Changes since v1:
- Add the "start-year" property as suggested by Alexandre Belloni
- Fix the errors generated from not using the more generic "rtc" node
name for the example of the binding, as suggested by Krzysztof Kozlowski
- Replace the "uint32-array" type of the "atmel,rtt-rtc-time-reg"
property with "syscon", as suggested by Krzysztof Kozlowski
- Move the "atmel,rtt-rtc-time-reg" property from some of the
Atmel/Microchip board files to the SoC files
- Add the "atmel,rtt-rtc-time-reg" required property to the
Atmel/Microchip SoC files that were missing it
- Use the more generic "rtc" node name inside the Atmel/Microchip SoC
files that were using "rtt" instead
- Add SAMA7G5 compatible strings list to the DT binding
Sergiu Moga (5):
ARM: dts: at91: Move rtt node properties from "dts" file to "dtsi"
file
ARM: dts: at91: Add the required `atmel,rtt-rtc-time-reg` property
ARM: dts: at91: Use the generic "rtc" node name for the rtt IPs
dt-bindings: rtc: convert at91sam9 bindings to json-schema
dt-bindings: rtc: at91: Add SAMA7G5 compatible strings list
.../bindings/rtc/atmel,at91sam9-rtc.txt | 25 -------
.../bindings/rtc/atmel,at91sam9-rtc.yaml | 65 +++++++++++++++++++
arch/arm/boot/dts/at91-sam9x60ek.dts | 5 --
arch/arm/boot/dts/at91-sama7g5ek.dts | 4 --
arch/arm/boot/dts/at91sam9260.dtsi | 1 +
arch/arm/boot/dts/at91sam9260ek.dts | 1 -
arch/arm/boot/dts/at91sam9261.dtsi | 1 +
arch/arm/boot/dts/at91sam9263.dtsi | 2 +
arch/arm/boot/dts/at91sam9g45.dtsi | 1 +
arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 -
arch/arm/boot/dts/at91sam9rl.dtsi | 1 +
arch/arm/boot/dts/sam9x60.dtsi | 3 +-
arch/arm/boot/dts/sama7g5.dtsi | 3 +-
13 files changed, 75 insertions(+), 38 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt
create mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.yaml
--
2.25.1
Add the required `atmel,rtt-rtc-time-reg` property to the `rtt` nodes
of the RTT IPs.
Signed-off-by: Sergiu Moga <[email protected]>
---
arch/arm/boot/dts/at91sam9261.dtsi | 1 +
arch/arm/boot/dts/at91sam9263.dtsi | 2 ++
arch/arm/boot/dts/at91sam9rl.dtsi | 1 +
3 files changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 7adc36ca8a46..ac50b164138a 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -627,6 +627,7 @@ rtc@fffffd20 {
reg = <0xfffffd20 0x10>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&slow_xtal>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index fe45d96239c9..6be91df2a8b1 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -734,6 +734,7 @@ rtc@fffffd20 {
reg = <0xfffffd20 0x10>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&slow_xtal>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "disabled";
};
@@ -742,6 +743,7 @@ rtc@fffffd50 {
reg = <0xfffffd50 0x10>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&slow_xtal>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x4>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 730d1182c73e..80e41f115216 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -805,6 +805,7 @@ rtc@fffffd20 {
reg = <0xfffffd20 0x10>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&clk32k>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "disabled";
};
--
2.25.1
Move the properties of the rtt node of RTT IPs from the "dts" file to the
"dtsi" file, since it is more IP specific than it is board specific.
Signed-off-by: Sergiu Moga <[email protected]>
---
arch/arm/boot/dts/at91-sam9x60ek.dts | 5 -----
arch/arm/boot/dts/at91-sama7g5ek.dts | 4 ----
arch/arm/boot/dts/at91sam9260.dtsi | 1 +
arch/arm/boot/dts/at91sam9260ek.dts | 1 -
arch/arm/boot/dts/at91sam9g45.dtsi | 1 +
arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 -
arch/arm/boot/dts/sam9x60.dtsi | 1 +
arch/arm/boot/dts/sama7g5.dtsi | 1 +
8 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/arch/arm/boot/dts/at91-sam9x60ek.dts b/arch/arm/boot/dts/at91-sam9x60ek.dts
index b1068cca4228..97ff91346cb4 100644
--- a/arch/arm/boot/dts/at91-sam9x60ek.dts
+++ b/arch/arm/boot/dts/at91-sam9x60ek.dts
@@ -656,11 +656,6 @@ kernel@200000 {
};
};
-&rtt {
- atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
- status = "okay";
-};
-
&shutdown_controller {
debounce-delay-us = <976>;
status = "okay";
diff --git a/arch/arm/boot/dts/at91-sama7g5ek.dts b/arch/arm/boot/dts/at91-sama7g5ek.dts
index ccf9e224da78..b7416d9469e3 100644
--- a/arch/arm/boot/dts/at91-sama7g5ek.dts
+++ b/arch/arm/boot/dts/at91-sama7g5ek.dts
@@ -708,10 +708,6 @@ &pwm {
status = "disabled"; /* Conflict with leds. */
};
-&rtt {
- atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
-};
-
&sdmmc0 {
bus-width = <8>;
non-removable;
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 7368347c9357..66d11c8f1a9b 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -713,6 +713,7 @@ rtc@fffffd20 {
reg = <0xfffffd20 0x10>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&pmc PMC_TYPE_CORE PMC_SLOW>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9260ek.dts b/arch/arm/boot/dts/at91sam9260ek.dts
index ce96345d28a3..6932dab42f2e 100644
--- a/arch/arm/boot/dts/at91sam9260ek.dts
+++ b/arch/arm/boot/dts/at91sam9260ek.dts
@@ -118,7 +118,6 @@ shdwc@fffffd10 {
};
rtc@fffffd20 {
- atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 2ab730fd6472..fd308e2c15e8 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -929,6 +929,7 @@ rtc@fffffd20 {
reg = <0xfffffd20 0x10>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&clk32k>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "disabled";
};
diff --git a/arch/arm/boot/dts/at91sam9m10g45ek.dts b/arch/arm/boot/dts/at91sam9m10g45ek.dts
index b6256a20fbc7..07bfa8ef715d 100644
--- a/arch/arm/boot/dts/at91sam9m10g45ek.dts
+++ b/arch/arm/boot/dts/at91sam9m10g45ek.dts
@@ -220,7 +220,6 @@ pwm0: pwm@fffb8000 {
};
rtc@fffffd20 {
- atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
status = "okay";
};
diff --git a/arch/arm/boot/dts/sam9x60.dtsi b/arch/arm/boot/dts/sam9x60.dtsi
index ec45ced3cde6..57ba47c54043 100644
--- a/arch/arm/boot/dts/sam9x60.dtsi
+++ b/arch/arm/boot/dts/sam9x60.dtsi
@@ -693,6 +693,7 @@ rtt: rtt@fffffe20 {
reg = <0xfffffe20 0x20>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
clocks = <&clk32k 0>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
};
pit: timer@fffffe40 {
diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi
index eddcfbf4d223..1530d88ce80f 100644
--- a/arch/arm/boot/dts/sama7g5.dtsi
+++ b/arch/arm/boot/dts/sama7g5.dtsi
@@ -138,6 +138,7 @@ rtt: rtt@e001d020 {
reg = <0xe001d020 0x30>;
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clk32k 0>;
+ atmel,rtt-rtc-time-reg = <&gpbr 0x0>;
};
clk32k: clock-controller@e001d050 {
--
2.25.1
On 3/3/22 16:06, Sergiu Moga wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Add the required `atmel,rtt-rtc-time-reg` property to the `rtt` nodes
> of the RTT IPs.
>
> Signed-off-by: Sergiu Moga <[email protected]>
> ---
> arch/arm/boot/dts/at91sam9261.dtsi | 1 +
> arch/arm/boot/dts/at91sam9263.dtsi | 2 ++
> arch/arm/boot/dts/at91sam9rl.dtsi | 1 +
> 3 files changed, 4 insertions(+)
Now with Alexandre's feedback from patch 1/5, you should probably move the
atmel,rtt-rtc-time-reg prop to each of the board files that uses these SoCs.
cheers,
ta