ARM: dts: stm32: Use clock DT binding definition on stm32f429 family

This patch uses clock DT binding definition instead numerical values
for stm32f429 board.

Signed-off-by: Gabriel Fernandez <gabriel.fernandez@st.com>
Signed-off-by: Alexandre TORGUE <alexandre.torgue@st.com>

diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts
index eedb27d33f6662ab48d90771067a26dbd2709520..9ed28ecb2ff2927ab1c4507656e957e54fb2ed2e 100644 (file)
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -121,7 +121,7 @@ button@1 {
        usbotg_hs_phy: usbphy {
                #phy-cells = <0>;
                compatible = "usb-nop-xceiv";
-               clocks = <&rcc 0 30>;
+               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(OTGHSULPI)>;
                clock-names = "main_clk";
        };
 };

diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi
index 07979d0523ce24a8547b84364315a09c70a66517..3f441fbedb8ff19bc8ed59f1ff5b5ae3c69dd89c 100644 (file)
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -49,6 +49,7 @@
 #include "armv7-m.dtsi"
 #include <dt-bindings/pinctrl/stm32f429-pinfunc.h>
 #include <dt-bindings/clock/stm32fx-clock.h>
+#include <dt-bindings/mfd/stm32f4-rcc.h>
 
 / {
        clocks {
@@ -82,7 +83,7 @@ timer2: timer@40000000 {
                        compatible = "st,stm32-timer";
                        reg = <0x40000000 0x400>;
                        interrupts = <28>;
-                       clocks = <&rcc 0 128>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM2)>;
                        status = "disabled";
                };
 
@@ -91,7 +92,7 @@ timers2: timers@40000000 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40000000 0x400>;
-                       clocks = <&rcc 0 128>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM2)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -111,7 +112,7 @@ timer3: timer@40000400 {
                        compatible = "st,stm32-timer";
                        reg = <0x40000400 0x400>;
                        interrupts = <29>;
-                       clocks = <&rcc 0 129>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM3)>;
                        status = "disabled";
                };
 
@@ -120,7 +121,7 @@ timers3: timers@40000400 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40000400 0x400>;
-                       clocks = <&rcc 0 129>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM3)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -140,7 +141,7 @@ timer4: timer@40000800 {
                        compatible = "st,stm32-timer";
                        reg = <0x40000800 0x400>;
                        interrupts = <30>;
-                       clocks = <&rcc 0 130>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM4)>;
                        status = "disabled";
                };
 
@@ -149,7 +150,7 @@ timers4: timers@40000800 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40000800 0x400>;
-                       clocks = <&rcc 0 130>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM4)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -169,7 +170,7 @@ timer5: timer@40000c00 {
                        compatible = "st,stm32-timer";
                        reg = <0x40000c00 0x400>;
                        interrupts = <50>;
-                       clocks = <&rcc 0 131>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM5)>;
                };
 
                timers5: timers@40000c00 {
@@ -177,7 +178,7 @@ timers5: timers@40000c00 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40000C00 0x400>;
-                       clocks = <&rcc 0 131>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM5)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -197,7 +198,7 @@ timer6: timer@40001000 {
                        compatible = "st,stm32-timer";
                        reg = <0x40001000 0x400>;
                        interrupts = <54>;
-                       clocks = <&rcc 0 132>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM6)>;
                        status = "disabled";
                };
 
@@ -206,7 +207,7 @@ timers6: timers@40001000 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40001000 0x400>;
-                       clocks = <&rcc 0 132>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM6)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -221,7 +222,7 @@ timer7: timer@40001400 {
                        compatible = "st,stm32-timer";
                        reg = <0x40001400 0x400>;
                        interrupts = <55>;
-                       clocks = <&rcc 0 133>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM7)>;
                        status = "disabled";
                };
 
@@ -230,7 +231,7 @@ timers7: timers@40001400 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40001400 0x400>;
-                       clocks = <&rcc 0 133>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM7)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -246,7 +247,7 @@ timers12: timers@40001800 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40001800 0x400>;
-                       clocks = <&rcc 0 134>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM12)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -267,7 +268,7 @@ timers13: timers@40001c00 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40001C00 0x400>;
-                       clocks = <&rcc 0 135>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM13)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -282,7 +283,7 @@ timers14: timers@40002000 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40002000 0x400>;
-                       clocks = <&rcc 0 136>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM14)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -310,7 +311,7 @@ usart2: serial@40004400 {
                        compatible = "st,stm32-usart", "st,stm32-uart";
                        reg = <0x40004400 0x400>;
                        interrupts = <38>;
-                       clocks =  <&rcc 0 145>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART2)>;
                        status = "disabled";
                };
 
@@ -318,7 +319,7 @@ usart3: serial@40004800 {
                        compatible = "st,stm32-usart", "st,stm32-uart";
                        reg = <0x40004800 0x400>;
                        interrupts = <39>;
-                       clocks = <&rcc 0 146>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART3)>;
                        status = "disabled";
                        dmas = <&dma1 1 4 0x400 0x0>,
                               <&dma1 3 4 0x400 0x0>;
@@ -329,7 +330,7 @@ usart4: serial@40004c00 {
                        compatible = "st,stm32-uart";
                        reg = <0x40004c00 0x400>;
                        interrupts = <52>;
-                       clocks = <&rcc 0 147>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART4)>;
                        status = "disabled";
                };
 
@@ -337,7 +338,7 @@ usart5: serial@40005000 {
                        compatible = "st,stm32-uart";
                        reg = <0x40005000 0x400>;
                        interrupts = <53>;
-                       clocks = <&rcc 0 148>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART5)>;
                        status = "disabled";
                };
 
@@ -345,7 +346,7 @@ usart7: serial@40007800 {
                        compatible = "st,stm32-usart", "st,stm32-uart";
                        reg = <0x40007800 0x400>;
                        interrupts = <82>;
-                       clocks = <&rcc 0 158>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART7)>;
                        status = "disabled";
                };
 
@@ -353,7 +354,7 @@ usart8: serial@40007c00 {
                        compatible = "st,stm32-usart", "st,stm32-uart";
                        reg = <0x40007c00 0x400>;
                        interrupts = <83>;
-                       clocks = <&rcc 0 159>;
+                       clocks = <&rcc 0 STM32F4_APB1_CLOCK(UART8)>;
                        status = "disabled";
                };
 
@@ -362,7 +363,7 @@ timers1: timers@40010000 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40010000 0x400>;
-                       clocks = <&rcc 0 160>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM1)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -383,7 +384,7 @@ timers8: timers@40010400 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40010400 0x400>;
-                       clocks = <&rcc 0 161>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM8)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -403,7 +404,7 @@ usart1: serial@40011000 {
                        compatible = "st,stm32-usart", "st,stm32-uart";
                        reg = <0x40011000 0x400>;
                        interrupts = <37>;
-                       clocks = <&rcc 0 164>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(USART1)>;
                        status = "disabled";
                        dmas = <&dma2 2 4 0x400 0x0>,
                               <&dma2 7 4 0x400 0x0>;
@@ -414,7 +415,7 @@ usart6: serial@40011400 {
                        compatible = "st,stm32-usart", "st,stm32-uart";
                        reg = <0x40011400 0x400>;
                        interrupts = <71>;
-                       clocks = <&rcc 0 165>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(USART6)>;
                        status = "disabled";
                };
 
@@ -422,7 +423,7 @@ adc: adc@40012000 {
                        compatible = "st,stm32f4-adc-core";
                        reg = <0x40012000 0x400>;
                        interrupts = <18>;
-                       clocks = <&rcc 0 168>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(ADC1)>;
                        clock-names = "adc";
                        interrupt-controller;
                        #interrupt-cells = <1>;
@@ -434,7 +435,7 @@ adc1: adc@0 {
                                compatible = "st,stm32f4-adc";
                                #io-channel-cells = <1>;
                                reg = <0x0>;
-                               clocks = <&rcc 0 168>;
+                               clocks = <&rcc 0 STM32F4_APB2_CLOCK(ADC1)>;
                                interrupt-parent = <&adc>;
                                interrupts = <0>;
                                status = "disabled";
@@ -444,7 +445,7 @@ adc2: adc@100 {
                                compatible = "st,stm32f4-adc";
                                #io-channel-cells = <1>;
                                reg = <0x100>;
-                               clocks = <&rcc 0 169>;
+                               clocks = <&rcc 0 STM32F4_APB2_CLOCK(ADC2)>;
                                interrupt-parent = <&adc>;
                                interrupts = <1>;
                                status = "disabled";
@@ -454,7 +455,7 @@ adc3: adc@200 {
                                compatible = "st,stm32f4-adc";
                                #io-channel-cells = <1>;
                                reg = <0x200>;
-                               clocks = <&rcc 0 170>;
+                               clocks = <&rcc 0 STM32F4_APB2_CLOCK(ADC3)>;
                                interrupt-parent = <&adc>;
                                interrupts = <2>;
                                status = "disabled";
@@ -479,7 +480,7 @@ timers9: timers@40014000 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40014000 0x400>;
-                       clocks = <&rcc 0 176>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM9)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -500,7 +501,7 @@ timers10: timers@40014400 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40014400 0x400>;
-                       clocks = <&rcc 0 177>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM10)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -515,7 +516,7 @@ timers11: timers@40014800 {
                        #size-cells = <0>;
                        compatible = "st,stm32-timers";
                        reg = <0x40014800 0x400>;
-                       clocks = <&rcc 0 178>;
+                       clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM11)>;
                        clock-names = "int";
                        status = "disabled";
 
@@ -543,7 +544,7 @@ gpioa: gpio@40020000 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x0 0x400>;
-                               clocks = <&rcc 0 0>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOA)>;
                                st,bank-name = "GPIOA";
                        };
 
@@ -551,7 +552,7 @@ gpiob: gpio@40020400 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x400 0x400>;
-                               clocks = <&rcc 0 1>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOB)>;
                                st,bank-name = "GPIOB";
                        };
 
@@ -559,7 +560,7 @@ gpioc: gpio@40020800 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x800 0x400>;
-                               clocks = <&rcc 0 2>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOC)>;
                                st,bank-name = "GPIOC";
                        };
 
@@ -567,7 +568,7 @@ gpiod: gpio@40020c00 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0xc00 0x400>;
-                               clocks = <&rcc 0 3>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOD)>;
                                st,bank-name = "GPIOD";
                        };
 
@@ -575,7 +576,7 @@ gpioe: gpio@40021000 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x1000 0x400>;
-                               clocks = <&rcc 0 4>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOE)>;
                                st,bank-name = "GPIOE";
                        };
 
@@ -583,7 +584,7 @@ gpiof: gpio@40021400 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x1400 0x400>;
-                               clocks = <&rcc 0 5>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOF)>;
                                st,bank-name = "GPIOF";
                        };
 
@@ -591,7 +592,7 @@ gpiog: gpio@40021800 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x1800 0x400>;
-                               clocks = <&rcc 0 6>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOG)>;
                                st,bank-name = "GPIOG";
                        };
 
@@ -599,7 +600,7 @@ gpioh: gpio@40021c00 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x1c00 0x400>;
-                               clocks = <&rcc 0 7>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOH)>;
                                st,bank-name = "GPIOH";
                        };
 
@@ -607,7 +608,7 @@ gpioi: gpio@40022000 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x2000 0x400>;
-                               clocks = <&rcc 0 8>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOI)>;
                                st,bank-name = "GPIOI";
                        };
 
@@ -615,7 +616,7 @@ gpioj: gpio@40022400 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x2400 0x400>;
-                               clocks = <&rcc 0 9>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOJ)>;
                                st,bank-name = "GPIOJ";
                        };
 
@@ -623,7 +624,7 @@ gpiok: gpio@40022800 {
                                gpio-controller;
                                #gpio-cells = <2>;
                                reg = <0x2800 0x400>;
-                               clocks = <&rcc 0 10>;
+                               clocks = <&rcc 0 STM32F4_AHB1_CLOCK(GPIOK)>;
                                st,bank-name = "GPIOK";
                        };
 
@@ -737,7 +738,7 @@ dma1: dma-controller@40026000 {
                                     <16>,
                                     <17>,
                                     <47>;
-                       clocks = <&rcc 0 21>;
+                       clocks = <&rcc 0 STM32F4_AHB1_CLOCK(DMA1)>;
                        #dma-cells = <4>;
                };
 
@@ -752,7 +753,7 @@ dma2: dma-controller@40026400 {
                                     <68>,
                                     <69>,
                                     <70>;
-                       clocks = <&rcc 0 22>;
+                       clocks = <&rcc 0 STM32F4_AHB1_CLOCK(DMA2)>;
                        #dma-cells = <4>;
                        st,mem2mem;
                };
@@ -764,7 +765,9 @@ mac: ethernet@40028000 {
                        interrupts = <61>;
                        interrupt-names = "macirq";
                        clock-names = "stmmaceth", "mac-clk-tx", "mac-clk-rx";
-                       clocks = <&rcc 0 25>, <&rcc 0 26>, <&rcc 0 27>;
+                       clocks = <&rcc 0 STM32F4_AHB1_CLOCK(ETHMAC)>,
+                                       <&rcc 0 STM32F4_AHB1_CLOCK(ETHMACTX)>,
+                                       <&rcc 0 STM32F4_AHB1_CLOCK(ETHMACRX)>;
                        st,syscon = <&syscfg 0x4>;
                        snps,pbl = <8>;
                        snps,mixed-burst;
@@ -775,7 +778,7 @@ usbotg_hs: usb@40040000 {
                        compatible = "snps,dwc2";
                        reg = <0x40040000 0x40000>;
                        interrupts = <77>;
-                       clocks = <&rcc 0 29>;
+                       clocks = <&rcc 0 STM32F4_AHB1_CLOCK(OTGHS)>;
                        clock-names = "otg";
                        status = "disabled";
                };
@@ -784,12 +787,13 @@ rng: rng@50060800 {
                        compatible = "st,stm32-rng";
                        reg = <0x50060800 0x400>;
                        interrupts = <80>;
-                       clocks = <&rcc 0 38>;
+                       clocks = <&rcc 0 STM32F4_AHB2_CLOCK(RNG)>;
+
                };
        };
 };
 
 &systick {
-       clocks = <&rcc 1 0>;
+       clocks = <&rcc 1 SYSTICK>;
        status = "okay";
 };