diff mbox series

[v2,1/5] ARM: dts: at91: Move rtt node properties from "dts" file to "dtsi" file

Message ID 20220303140626.38129-2-sergiu.moga@microchip.com (mailing list archive)
State New, archived
Headers show
Series dt-bindings: rtc: convert at91sam9 bindings to | expand

Commit Message

Sergiu Moga March 3, 2022, 2:06 p.m. UTC
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 <sergiu.moga@microchip.com>
---
 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(-)

Comments

Alexandre Belloni March 3, 2022, 4:07 p.m. UTC | #1
On 03/03/2022 16:06:22+0200, Sergiu Moga wrote:
> 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.
> 

The fact that it uses a specific GPBR register makes it board specific
so I don't really agree with this patch.

> Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
> ---
>  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
>
Sergiu Moga March 4, 2022, 1:10 p.m. UTC | #2
On 03.03.2022 18:07, Alexandre Belloni wrote:
> On 03/03/2022 16:06:22+0200, Sergiu Moga wrote:
>> 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.
>>
> The fact that it uses a specific GPBR register makes it board specific
> so I don't really agree with this patch.
>
Ah, I see. I will remove this patch from the series then.

>> Signed-off-by: Sergiu Moga <sergiu.moga@microchip.com>
>> ---
>>   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
>>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com

Thank you for the feedback.

Sergiu
diff mbox series

Patch

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 {