Skip to content

Commit f6b8731

Browse files
RichardSWheatleyAlessandroLuo
RichardSWheatley
authored and
AlessandroLuo
committed
dts: bindings: move clk-source to parent
Move clk-source from pwm to timer change associated files to match Signed-off-by: Richard Wheatley <richard.wheatley@ambiq.com>
1 parent 322dde4 commit f6b8731

File tree

15 files changed

+167
-147
lines changed

15 files changed

+167
-147
lines changed

‎boards/ambiq/apollo3_evb/apollo3_evb.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@
178178
&timer2 {
179179
pwm2: pwm {
180180
timer-segment = "SEGMENT_B";
181-
clock-select = "CLK_SELECT_HFRC_187_5KHZ";
182181
pwm-type = "PWM_REPEAT";
183182
pinctrl-0 = <&pwm2_default>;
184183
pinctrl-names = "default";

‎boards/ambiq/apollo3p_evb/apollo3p_evb.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@
156156
&timer2 {
157157
pwm2: pwm {
158158
timer-segment = "SEGMENT_B";
159-
clock-select = "CLK_SELECT_HFRC_187_5KHZ";
160159
pwm-type = "PWM_REPEAT";
161160
pinctrl-0 = <&pwm2_default>;
162161
pinctrl-names = "default";

‎boards/ambiq/apollo4p_blue_kxr_evb/apollo4p_blue_kxr_evb.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@
9393

9494
&timer2 {
9595
pwm2: pwm {
96-
clock-select = "CLK_SELECT_HFRC_DIV64";
9796
pinctrl-0 = <&pwm2_default>;
9897
pinctrl-names = "default";
9998
status = "disabled";

‎boards/ambiq/apollo4p_evb/apollo4p_evb.dts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@
9797

9898
&timer2 {
9999
pwm2: pwm {
100-
clock-select = "CLK_SELECT_HFRC_DIV64";
101100
pinctrl-0 = <&pwm2_default>;
102101
pinctrl-names = "default";
103102
status = "disabled";

‎drivers/counter/counter_ambiq_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ static void counter_ambiq_isr(void *arg)
443443
static const struct counter_ambiq_config counter_config_##idx = { \
444444
.instance = (DT_REG_ADDR(DT_INST_PARENT(idx)) - SOC_TIMER_BASE) / \
445445
DT_REG_SIZE(DT_INST_PARENT(idx)), \
446-
.clk_src = DT_PROP(DT_INST_PARENT(idx), clk_source), \
446+
.clk_src = DT_ENUM_IDX(DT_INST_PARENT(idx), clk_source), \
447447
.counter_info = {.max_top_value = UINT32_MAX, \
448448
.flags = COUNTER_CONFIG_INFO_COUNT_UP, \
449449
.channels = 1}, \

‎drivers/pwm/pwm_ambiq_ctimer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ static DEVICE_API(pwm, pwm_ambiq_timer_driver_api) = {
233233
.timer_num = (DT_REG_ADDR(DT_INST_PARENT(n)) - CTIMER_BASE) / \
234234
DT_REG_SIZE(DT_INST_PARENT(n)), \
235235
.timer_seg = DT_INST_ENUM_IDX(n, timer_segment), \
236-
.clock_sel = DT_INST_ENUM_IDX(n, clock_select), \
236+
.clock_sel = DT_ENUM_IDX(DT_INST_PARENT(n), clk_source), \
237237
.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n), \
238238
.pwm_type = DT_INST_ENUM_IDX(n, pwm_type)}; \
239239
\

‎drivers/pwm/pwm_ambiq_timer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static DEVICE_API(pwm, pwm_ambiq_timer_driver_api) = {
185185
static const struct pwm_ambiq_timer_config pwm_ambiq_timer_config_##n = { \
186186
.timer_num = (DT_REG_ADDR(DT_INST_PARENT(n)) - TIMER_BASE) / \
187187
DT_REG_SIZE(DT_INST_PARENT(n)), \
188-
.clock_sel = DT_INST_ENUM_IDX(n, clock_select), \
188+
.clock_sel = DT_ENUM_IDX(DT_INST_PARENT(n), clk_source), \
189189
.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n)}; \
190190
\
191191
DEVICE_DT_INST_DEFINE(n, ambiq_timer_pwm_init, NULL, &pwm_ambiq_timer_data_##n, \

‎dts/arm/ambiq/ambiq_apollo3_blue.dtsi

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
compatible = "ambiq,ctimer";
103103
reg = <0x40008000 0x20>;
104104
interrupts = <14 0>;
105-
clk-source = <2>;
105+
clk-source = "CLK_SELECT_HFRC_3MHZ";
106106
status = "disabled";
107107
counter {
108108
compatible = "ambiq,counter";
@@ -119,7 +119,7 @@
119119
compatible = "ambiq,ctimer";
120120
reg = <0x40008020 0x20>;
121121
interrupts = <14 0>;
122-
clk-source = <2>;
122+
clk-source = "CLK_SELECT_HFRC_3MHZ";
123123
status = "disabled";
124124
counter {
125125
compatible = "ambiq,counter";
@@ -136,7 +136,24 @@
136136
compatible = "ambiq,ctimer";
137137
reg = <0x40008040 0x20>;
138138
interrupts = <14 0>;
139-
clk-source = <2>;
139+
clk-source = "CLK_SELECT_HFRC_187_5KHZ";
140+
status = "disabled";
141+
counter {
142+
compatible = "ambiq,counter";
143+
status = "disabled";
144+
};
145+
pwm {
146+
compatible = "ambiq,ctimer-pwm";
147+
status = "disabled";
148+
#pwm-cells = <3>;
149+
};
150+
};
151+
152+
timer3: timer@40008060 {
153+
compatible = "ambiq,ctimer";
154+
reg = <0x40008060 0x20>;
155+
interrupts = <14 0>;
156+
clk-source = "CLK_SELECT_HFRC_3MHZ";
140157
status = "disabled";
141158
counter {
142159
compatible = "ambiq,counter";
@@ -153,7 +170,7 @@
153170
compatible = "ambiq,ctimer";
154171
reg = <0x40008080 0x20>;
155172
interrupts = <14 0>;
156-
clk-source = <2>;
173+
clk-source = "CLK_SELECT_HFRC_3MHZ";
157174
status = "disabled";
158175
counter {
159176
compatible = "ambiq,counter";
@@ -170,7 +187,7 @@
170187
compatible = "ambiq,ctimer";
171188
reg = <0x400080A0 0x20>;
172189
interrupts = <14 0>;
173-
clk-source = <2>;
190+
clk-source = "CLK_SELECT_HFRC_3MHZ";
174191
status = "disabled";
175192
counter {
176193
compatible = "ambiq,counter";
@@ -187,7 +204,7 @@
187204
compatible = "ambiq,ctimer";
188205
reg = <0x400080C0 0x20>;
189206
interrupts = <14 0>;
190-
clk-source = <2>;
207+
clk-source = "CLK_SELECT_HFRC_3MHZ";
191208
status = "disabled";
192209
counter {
193210
compatible = "ambiq,counter";
@@ -204,7 +221,7 @@
204221
compatible = "ambiq,ctimer";
205222
reg = <0x400080E0 0x20>;
206223
interrupts = <14 0>;
207-
clk-source = <2>;
224+
clk-source = "CLK_SELECT_HFRC_3MHZ";
208225
status = "disabled";
209226
counter {
210227
compatible = "ambiq,counter";

‎dts/arm/ambiq/ambiq_apollo3p_blue.dtsi

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
compatible = "ambiq,ctimer";
121121
reg = <0x40008000 0x20>;
122122
interrupts = <14 0>;
123-
clk-source = <2>;
123+
clk-source = "CLK_SELECT_HFRC_3MHZ";
124124
status = "disabled";
125125
counter {
126126
compatible = "ambiq,counter";
@@ -137,7 +137,7 @@
137137
compatible = "ambiq,ctimer";
138138
reg = <0x40008020 0x20>;
139139
interrupts = <14 0>;
140-
clk-source = <2>;
140+
clk-source = "CLK_SELECT_HFRC_3MHZ";
141141
status = "disabled";
142142
counter {
143143
compatible = "ambiq,counter";
@@ -154,7 +154,24 @@
154154
compatible = "ambiq,ctimer";
155155
reg = <0x40008040 0x20>;
156156
interrupts = <14 0>;
157-
clk-source = <2>;
157+
clk-source = "CLK_SELECT_HFRC_187_5KHZ";
158+
status = "disabled";
159+
counter {
160+
compatible = "ambiq,counter";
161+
status = "disabled";
162+
};
163+
pwm {
164+
compatible = "ambiq,ctimer-pwm";
165+
status = "disabled";
166+
#pwm-cells = <3>;
167+
};
168+
};
169+
170+
timer3: timer@40008060 {
171+
compatible = "ambiq,ctimer";
172+
reg = <0x40008060 0x20>;
173+
interrupts = <14 0>;
174+
clk-source = "CLK_SELECT_HFRC_3MHZ";
158175
status = "disabled";
159176
counter {
160177
compatible = "ambiq,counter";
@@ -171,7 +188,7 @@
171188
compatible = "ambiq,ctimer";
172189
reg = <0x40008080 0x20>;
173190
interrupts = <14 0>;
174-
clk-source = <2>;
191+
clk-source = "CLK_SELECT_HFRC_3MHZ";
175192
status = "disabled";
176193
counter {
177194
compatible = "ambiq,counter";
@@ -188,7 +205,7 @@
188205
compatible = "ambiq,ctimer";
189206
reg = <0x400080A0 0x20>;
190207
interrupts = <14 0>;
191-
clk-source = <2>;
208+
clk-source = "CLK_SELECT_HFRC_3MHZ";
192209
status = "disabled";
193210
counter {
194211
compatible = "ambiq,counter";
@@ -205,7 +222,7 @@
205222
compatible = "ambiq,ctimer";
206223
reg = <0x400080C0 0x20>;
207224
interrupts = <14 0>;
208-
clk-source = <2>;
225+
clk-source = "CLK_SELECT_HFRC_3MHZ";
209226
status = "disabled";
210227
counter {
211228
compatible = "ambiq,counter";
@@ -222,7 +239,7 @@
222239
compatible = "ambiq,ctimer";
223240
reg = <0x400080E0 0x20>;
224241
interrupts = <14 0>;
225-
clk-source = <2>;
242+
clk-source = "CLK_SELECT_HFRC_3MHZ";
226243
status = "disabled";
227244
counter {
228245
compatible = "ambiq,counter";

‎dts/arm/ambiq/ambiq_apollo4p.dtsi

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@
104104
compatible = "ambiq,timer";
105105
reg = <0x40008000 0x20>;
106106
interrupts = <67 0>;
107-
clk-source = <2>;
107+
clk-source = "CLK_SELECT_HFRC_DIV64";
108108

109109
counter {
110110
compatible = "ambiq,counter";
@@ -121,7 +121,7 @@
121121
compatible = "ambiq,timer";
122122
reg = <0x40008020 0x20>;
123123
interrupts = <68 0>;
124-
clk-source = <2>;
124+
clk-source = "CLK_SELECT_HFRC_DIV64";
125125

126126
counter {
127127
compatible = "ambiq,counter";
@@ -138,7 +138,7 @@
138138
compatible = "ambiq,timer";
139139
reg = <0x40008040 0x20>;
140140
interrupts = <69 0>;
141-
clk-source = <2>;
141+
clk-source = "CLK_SELECT_HFRC_DIV64";
142142

143143
counter {
144144
compatible = "ambiq,counter";
@@ -155,7 +155,7 @@
155155
compatible = "ambiq,timer";
156156
reg = <0x40008060 0x20>;
157157
interrupts = <70 0>;
158-
clk-source = <2>;
158+
clk-source = "CLK_SELECT_HFRC_DIV64";
159159

160160
counter {
161161
compatible = "ambiq,counter";
@@ -172,7 +172,7 @@
172172
compatible = "ambiq,timer";
173173
reg = <0x40008080 0x20>;
174174
interrupts = <71 0>;
175-
clk-source = <2>;
175+
clk-source = "CLK_SELECT_HFRC_DIV64";
176176

177177
counter {
178178
compatible = "ambiq,counter";
@@ -189,7 +189,7 @@
189189
compatible = "ambiq,timer";
190190
reg = <0x400080A0 0x20>;
191191
interrupts = <72 0>;
192-
clk-source = <2>;
192+
clk-source = "CLK_SELECT_HFRC_DIV64";
193193

194194
counter {
195195
compatible = "ambiq,counter";
@@ -206,7 +206,7 @@
206206
compatible = "ambiq,timer";
207207
reg = <0x400080C0 0x20>;
208208
interrupts = <73 0>;
209-
clk-source = <2>;
209+
clk-source = "CLK_SELECT_HFRC_DIV64";
210210

211211
counter {
212212
compatible = "ambiq,counter";
@@ -223,7 +223,7 @@
223223
compatible = "ambiq,timer";
224224
reg = <0x400080E0 0x20>;
225225
interrupts = <74 0>;
226-
clk-source = <2>;
226+
clk-source = "CLK_SELECT_HFRC_DIV64";
227227

228228
counter {
229229
compatible = "ambiq,counter";
@@ -240,7 +240,7 @@
240240
compatible = "ambiq,timer";
241241
reg = <0x40008100 0x20>;
242242
interrupts = <75 0>;
243-
clk-source = <2>;
243+
clk-source = "CLK_SELECT_HFRC_DIV64";
244244

245245
counter {
246246
compatible = "ambiq,counter";
@@ -257,7 +257,7 @@
257257
compatible = "ambiq,timer";
258258
reg = <0x40008120 0x20>;
259259
interrupts = <76 0>;
260-
clk-source = <2>;
260+
clk-source = "CLK_SELECT_HFRC_DIV64";
261261

262262
counter {
263263
compatible = "ambiq,counter";
@@ -274,7 +274,7 @@
274274
compatible = "ambiq,timer";
275275
reg = <0x40008140 0x20>;
276276
interrupts = <77 0>;
277-
clk-source = <2>;
277+
clk-source = "CLK_SELECT_HFRC_DIV64";
278278

279279
counter {
280280
compatible = "ambiq,counter";
@@ -291,7 +291,7 @@
291291
compatible = "ambiq,timer";
292292
reg = <0x40008160 0x20>;
293293
interrupts = <78 0>;
294-
clk-source = <2>;
294+
clk-source = "CLK_SELECT_HFRC_DIV64";
295295

296296
counter {
297297
compatible = "ambiq,counter";
@@ -308,7 +308,7 @@
308308
compatible = "ambiq,timer";
309309
reg = <0x40008180 0x20>;
310310
interrupts = <79 0>;
311-
clk-source = <2>;
311+
clk-source = "CLK_SELECT_HFRC_DIV64";
312312

313313
counter {
314314
compatible = "ambiq,counter";
@@ -325,7 +325,7 @@
325325
compatible = "ambiq,timer";
326326
reg = <0x400081A0 0x20>;
327327
interrupts = <80 0>;
328-
clk-source = <2>;
328+
clk-source = "CLK_SELECT_HFRC_DIV64";
329329

330330
counter {
331331
compatible = "ambiq,counter";
@@ -342,7 +342,7 @@
342342
compatible = "ambiq,timer";
343343
reg = <0x400081C0 0x20>;
344344
interrupts = <81 0>;
345-
clk-source = <2>;
345+
clk-source = "CLK_SELECT_HFRC_DIV64";
346346

347347
counter {
348348
compatible = "ambiq,counter";
@@ -359,7 +359,7 @@
359359
compatible = "ambiq,timer";
360360
reg = <0x400081E0 0x20>;
361361
interrupts = <82 0>;
362-
clk-source = <2>;
362+
clk-source = "CLK_SELECT_HFRC_DIV64";
363363

364364
counter {
365365
compatible = "ambiq,counter";

0 commit comments

Comments
 (0)