OSDN Git Service

ARM: dts: stm32: remove some timer duplicate unit-address on stm32f7 series
authorFabrice Gasnier <fabrice.gasnier@foss.st.com>
Wed, 9 Feb 2022 10:48:48 +0000 (11:48 +0100)
committerAlexandre Torgue <alexandre.torgue@foss.st.com>
Fri, 25 Feb 2022 09:53:15 +0000 (10:53 +0100)
Several unused "timer" are duplicate nodes of "timers" nodes.
There are two dt-schemas:
- timer/st,stm32-timer.yaml: A timer is needed on STM32F7 series, on all
  boards, to act as clockevent.
- mfd/st,stm32-timers.yaml: Timers can be used for other purpose.

By default, timer5 is left enabled to be used as clockevent. Remove all
other timer clockevent nodes that are currently unused and duplicated.

This removes several messages: Warning (unique_unit_address): /soc/timer@..
duplicate unit-address (also used in node /soc/timers@...)

Signed-off-by: Fabrice Gasnier <fabrice.gasnier@foss.st.com>
Signed-off-by: Alexandre Torgue <alexandre.torgue@foss.st.com>
arch/arm/boot/dts/stm32f746.dtsi

index 014b416..a4f5c6a 100644 (file)
        };
 
        soc {
-               timer2: timer@40000000 {
-                       compatible = "st,stm32-timer";
-                       reg = <0x40000000 0x400>;
-                       interrupts = <28>;
-                       clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM2)>;
-                       status = "disabled";
-               };
-
                timers2: timers@40000000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        };
                };
 
-               timer3: timer@40000400 {
-                       compatible = "st,stm32-timer";
-                       reg = <0x40000400 0x400>;
-                       interrupts = <29>;
-                       clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM3)>;
-                       status = "disabled";
-               };
-
                timers3: timers@40000400 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        };
                };
 
-               timer4: timer@40000800 {
-                       compatible = "st,stm32-timer";
-                       reg = <0x40000800 0x400>;
-                       interrupts = <30>;
-                       clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM4)>;
-                       status = "disabled";
-               };
-
                timers4: timers@40000800 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        };
                };
 
-               timer6: timer@40001000 {
-                       compatible = "st,stm32-timer";
-                       reg = <0x40001000 0x400>;
-                       interrupts = <54>;
-                       clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM6)>;
-                       status = "disabled";
-               };
-
                timers6: timers@40001000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
                        };
                };
 
-               timer7: timer@40001400 {
-                       compatible = "st,stm32-timer";
-                       reg = <0x40001400 0x400>;
-                       interrupts = <55>;
-                       clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM7)>;
-                       status = "disabled";
-               };
-
                timers7: timers@40001400 {
                        #address-cells = <1>;
                        #size-cells = <0>;