Skip to content

Commit df5df12

Browse files
Gabriel-Fernandzbebarino
Gabriel-Fernandz
authored and
bebarino
committed
dt-bindings: clocks: stm32mp25: add description of all parents
RCC driver uses '.index' to define all parent clocks instead '.names' because the use of a name to define a parent clock is discouraged. This is an ABI change, but the RCC driver has not yet merged, unlike all others drivers besides Linux. Fixes: b5be49d ("dt-bindings: stm32: add clocks and reset binding for stm32mp25 platform") Signed-off-by: Gabriel Fernandez <[email protected]> Acked-by: Krzysztof Kozlowski <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Stephen Boyd <[email protected]>
1 parent 239d5fb commit df5df12

File tree

2 files changed

+156
-16
lines changed

2 files changed

+156
-16
lines changed

‎Documentation/devicetree/bindings/clock/st,stm32mp25-rcc.yaml‎

Lines changed: 155 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,22 +38,88 @@ properties:
3838
- description: CK_SCMI_MSI Low Power Internal oscillator (~ 4 MHz or ~ 16 MHz)
3939
- description: CK_SCMI_LSE Low Speed External oscillator (32 KHz)
4040
- description: CK_SCMI_LSI Low Speed Internal oscillator (~ 32 KHz)
41-
42-
clock-names:
43-
items:
44-
- const: hse
45-
- const: hsi
46-
- const: msi
47-
- const: lse
48-
- const: lsi
41+
- description: CK_SCMI_HSE_DIV2 CK_SCMI_HSE divided by 2 (coud be gated)
42+
- description: CK_SCMI_ICN_HS_MCU High Speed interconnect bus clock
43+
- description: CK_SCMI_ICN_LS_MCU Low Speed interconnect bus clock
44+
- description: CK_SCMI_ICN_SDMMC SDMMC interconnect bus clock
45+
- description: CK_SCMI_ICN_DDR DDR interconnect bus clock
46+
- description: CK_SCMI_ICN_DISPLAY Display interconnect bus clock
47+
- description: CK_SCMI_ICN_HSL HSL interconnect bus clock
48+
- description: CK_SCMI_ICN_NIC NIC interconnect bus clock
49+
- description: CK_SCMI_ICN_VID Video interconnect bus clock
50+
- description: CK_SCMI_FLEXGEN_07 flexgen clock 7
51+
- description: CK_SCMI_FLEXGEN_08 flexgen clock 8
52+
- description: CK_SCMI_FLEXGEN_09 flexgen clock 9
53+
- description: CK_SCMI_FLEXGEN_10 flexgen clock 10
54+
- description: CK_SCMI_FLEXGEN_11 flexgen clock 11
55+
- description: CK_SCMI_FLEXGEN_12 flexgen clock 12
56+
- description: CK_SCMI_FLEXGEN_13 flexgen clock 13
57+
- description: CK_SCMI_FLEXGEN_14 flexgen clock 14
58+
- description: CK_SCMI_FLEXGEN_15 flexgen clock 15
59+
- description: CK_SCMI_FLEXGEN_16 flexgen clock 16
60+
- description: CK_SCMI_FLEXGEN_17 flexgen clock 17
61+
- description: CK_SCMI_FLEXGEN_18 flexgen clock 18
62+
- description: CK_SCMI_FLEXGEN_19 flexgen clock 19
63+
- description: CK_SCMI_FLEXGEN_20 flexgen clock 20
64+
- description: CK_SCMI_FLEXGEN_21 flexgen clock 21
65+
- description: CK_SCMI_FLEXGEN_22 flexgen clock 22
66+
- description: CK_SCMI_FLEXGEN_23 flexgen clock 23
67+
- description: CK_SCMI_FLEXGEN_24 flexgen clock 24
68+
- description: CK_SCMI_FLEXGEN_25 flexgen clock 25
69+
- description: CK_SCMI_FLEXGEN_26 flexgen clock 26
70+
- description: CK_SCMI_FLEXGEN_27 flexgen clock 27
71+
- description: CK_SCMI_FLEXGEN_28 flexgen clock 28
72+
- description: CK_SCMI_FLEXGEN_29 flexgen clock 29
73+
- description: CK_SCMI_FLEXGEN_30 flexgen clock 30
74+
- description: CK_SCMI_FLEXGEN_31 flexgen clock 31
75+
- description: CK_SCMI_FLEXGEN_32 flexgen clock 32
76+
- description: CK_SCMI_FLEXGEN_33 flexgen clock 33
77+
- description: CK_SCMI_FLEXGEN_34 flexgen clock 34
78+
- description: CK_SCMI_FLEXGEN_35 flexgen clock 35
79+
- description: CK_SCMI_FLEXGEN_36 flexgen clock 36
80+
- description: CK_SCMI_FLEXGEN_37 flexgen clock 37
81+
- description: CK_SCMI_FLEXGEN_38 flexgen clock 38
82+
- description: CK_SCMI_FLEXGEN_39 flexgen clock 39
83+
- description: CK_SCMI_FLEXGEN_40 flexgen clock 40
84+
- description: CK_SCMI_FLEXGEN_41 flexgen clock 41
85+
- description: CK_SCMI_FLEXGEN_42 flexgen clock 42
86+
- description: CK_SCMI_FLEXGEN_43 flexgen clock 43
87+
- description: CK_SCMI_FLEXGEN_44 flexgen clock 44
88+
- description: CK_SCMI_FLEXGEN_45 flexgen clock 45
89+
- description: CK_SCMI_FLEXGEN_46 flexgen clock 46
90+
- description: CK_SCMI_FLEXGEN_47 flexgen clock 47
91+
- description: CK_SCMI_FLEXGEN_48 flexgen clock 48
92+
- description: CK_SCMI_FLEXGEN_49 flexgen clock 49
93+
- description: CK_SCMI_FLEXGEN_50 flexgen clock 50
94+
- description: CK_SCMI_FLEXGEN_51 flexgen clock 51
95+
- description: CK_SCMI_FLEXGEN_52 flexgen clock 52
96+
- description: CK_SCMI_FLEXGEN_53 flexgen clock 53
97+
- description: CK_SCMI_FLEXGEN_54 flexgen clock 54
98+
- description: CK_SCMI_FLEXGEN_55 flexgen clock 55
99+
- description: CK_SCMI_FLEXGEN_56 flexgen clock 56
100+
- description: CK_SCMI_FLEXGEN_57 flexgen clock 57
101+
- description: CK_SCMI_FLEXGEN_58 flexgen clock 58
102+
- description: CK_SCMI_FLEXGEN_59 flexgen clock 59
103+
- description: CK_SCMI_FLEXGEN_60 flexgen clock 60
104+
- description: CK_SCMI_FLEXGEN_61 flexgen clock 61
105+
- description: CK_SCMI_FLEXGEN_62 flexgen clock 62
106+
- description: CK_SCMI_FLEXGEN_63 flexgen clock 63
107+
- description: CK_SCMI_ICN_APB1 Peripheral bridge 1
108+
- description: CK_SCMI_ICN_APB2 Peripheral bridge 2
109+
- description: CK_SCMI_ICN_APB3 Peripheral bridge 3
110+
- description: CK_SCMI_ICN_APB4 Peripheral bridge 4
111+
- description: CK_SCMI_ICN_APBDBG Peripheral bridge for degub
112+
- description: CK_SCMI_TIMG1 Peripheral bridge for timer1
113+
- description: CK_SCMI_TIMG2 Peripheral bridge for timer2
114+
- description: CK_SCMI_PLL3 PLL3 clock
115+
- description: clk_dsi_txbyte DSI byte clock
49116

50117
required:
51118
- compatible
52119
- reg
53120
- '#clock-cells'
54121
- '#reset-cells'
55122
- clocks
56-
- clock-names
57123

58124
additionalProperties: false
59125

@@ -66,11 +132,85 @@ examples:
66132
reg = <0x44200000 0x10000>;
67133
#clock-cells = <1>;
68134
#reset-cells = <1>;
69-
clock-names = "hse", "hsi", "msi", "lse", "lsi";
70-
clocks = <&scmi_clk CK_SCMI_HSE>,
71-
<&scmi_clk CK_SCMI_HSI>,
72-
<&scmi_clk CK_SCMI_MSI>,
73-
<&scmi_clk CK_SCMI_LSE>,
74-
<&scmi_clk CK_SCMI_LSI>;
135+
clocks = <&scmi_clk CK_SCMI_HSE>,
136+
<&scmi_clk CK_SCMI_HSI>,
137+
<&scmi_clk CK_SCMI_MSI>,
138+
<&scmi_clk CK_SCMI_LSE>,
139+
<&scmi_clk CK_SCMI_LSI>,
140+
<&scmi_clk CK_SCMI_HSE_DIV2>,
141+
<&scmi_clk CK_SCMI_ICN_HS_MCU>,
142+
<&scmi_clk CK_SCMI_ICN_LS_MCU>,
143+
<&scmi_clk CK_SCMI_ICN_SDMMC>,
144+
<&scmi_clk CK_SCMI_ICN_DDR>,
145+
<&scmi_clk CK_SCMI_ICN_DISPLAY>,
146+
<&scmi_clk CK_SCMI_ICN_HSL>,
147+
<&scmi_clk CK_SCMI_ICN_NIC>,
148+
<&scmi_clk CK_SCMI_ICN_VID>,
149+
<&scmi_clk CK_SCMI_FLEXGEN_07>,
150+
<&scmi_clk CK_SCMI_FLEXGEN_08>,
151+
<&scmi_clk CK_SCMI_FLEXGEN_09>,
152+
<&scmi_clk CK_SCMI_FLEXGEN_10>,
153+
<&scmi_clk CK_SCMI_FLEXGEN_11>,
154+
<&scmi_clk CK_SCMI_FLEXGEN_12>,
155+
<&scmi_clk CK_SCMI_FLEXGEN_13>,
156+
<&scmi_clk CK_SCMI_FLEXGEN_14>,
157+
<&scmi_clk CK_SCMI_FLEXGEN_15>,
158+
<&scmi_clk CK_SCMI_FLEXGEN_16>,
159+
<&scmi_clk CK_SCMI_FLEXGEN_17>,
160+
<&scmi_clk CK_SCMI_FLEXGEN_18>,
161+
<&scmi_clk CK_SCMI_FLEXGEN_19>,
162+
<&scmi_clk CK_SCMI_FLEXGEN_20>,
163+
<&scmi_clk CK_SCMI_FLEXGEN_21>,
164+
<&scmi_clk CK_SCMI_FLEXGEN_22>,
165+
<&scmi_clk CK_SCMI_FLEXGEN_23>,
166+
<&scmi_clk CK_SCMI_FLEXGEN_24>,
167+
<&scmi_clk CK_SCMI_FLEXGEN_25>,
168+
<&scmi_clk CK_SCMI_FLEXGEN_26>,
169+
<&scmi_clk CK_SCMI_FLEXGEN_27>,
170+
<&scmi_clk CK_SCMI_FLEXGEN_28>,
171+
<&scmi_clk CK_SCMI_FLEXGEN_29>,
172+
<&scmi_clk CK_SCMI_FLEXGEN_30>,
173+
<&scmi_clk CK_SCMI_FLEXGEN_31>,
174+
<&scmi_clk CK_SCMI_FLEXGEN_32>,
175+
<&scmi_clk CK_SCMI_FLEXGEN_33>,
176+
<&scmi_clk CK_SCMI_FLEXGEN_34>,
177+
<&scmi_clk CK_SCMI_FLEXGEN_35>,
178+
<&scmi_clk CK_SCMI_FLEXGEN_36>,
179+
<&scmi_clk CK_SCMI_FLEXGEN_37>,
180+
<&scmi_clk CK_SCMI_FLEXGEN_38>,
181+
<&scmi_clk CK_SCMI_FLEXGEN_39>,
182+
<&scmi_clk CK_SCMI_FLEXGEN_40>,
183+
<&scmi_clk CK_SCMI_FLEXGEN_41>,
184+
<&scmi_clk CK_SCMI_FLEXGEN_42>,
185+
<&scmi_clk CK_SCMI_FLEXGEN_43>,
186+
<&scmi_clk CK_SCMI_FLEXGEN_44>,
187+
<&scmi_clk CK_SCMI_FLEXGEN_45>,
188+
<&scmi_clk CK_SCMI_FLEXGEN_46>,
189+
<&scmi_clk CK_SCMI_FLEXGEN_47>,
190+
<&scmi_clk CK_SCMI_FLEXGEN_48>,
191+
<&scmi_clk CK_SCMI_FLEXGEN_49>,
192+
<&scmi_clk CK_SCMI_FLEXGEN_50>,
193+
<&scmi_clk CK_SCMI_FLEXGEN_51>,
194+
<&scmi_clk CK_SCMI_FLEXGEN_52>,
195+
<&scmi_clk CK_SCMI_FLEXGEN_53>,
196+
<&scmi_clk CK_SCMI_FLEXGEN_54>,
197+
<&scmi_clk CK_SCMI_FLEXGEN_55>,
198+
<&scmi_clk CK_SCMI_FLEXGEN_56>,
199+
<&scmi_clk CK_SCMI_FLEXGEN_57>,
200+
<&scmi_clk CK_SCMI_FLEXGEN_58>,
201+
<&scmi_clk CK_SCMI_FLEXGEN_59>,
202+
<&scmi_clk CK_SCMI_FLEXGEN_60>,
203+
<&scmi_clk CK_SCMI_FLEXGEN_61>,
204+
<&scmi_clk CK_SCMI_FLEXGEN_62>,
205+
<&scmi_clk CK_SCMI_FLEXGEN_63>,
206+
<&scmi_clk CK_SCMI_ICN_APB1>,
207+
<&scmi_clk CK_SCMI_ICN_APB2>,
208+
<&scmi_clk CK_SCMI_ICN_APB3>,
209+
<&scmi_clk CK_SCMI_ICN_APB4>,
210+
<&scmi_clk CK_SCMI_ICN_APBDBG>,
211+
<&scmi_clk CK_SCMI_TIMG1>,
212+
<&scmi_clk CK_SCMI_TIMG2>,
213+
<&scmi_clk CK_SCMI_PLL3>,
214+
<&clk_dsi_txbyte>;
75215
};
76216
...

‎include/dt-bindings/reset/st,stm32mp25-rcc.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
#define ADC3_R 59
7070
#define ETH1_R 60
7171
#define ETH2_R 61
72-
#define USB2_R 62
72+
#define USBH_R 62
7373
#define USB2PHY1_R 63
7474
#define USB2PHY2_R 64
7575
#define USB3DR_R 65

0 commit comments

Comments
 (0)