Skip to content

Commit c958540

Browse files
Sowjanya Komatinenithierryreding
authored andcommitted
dt-bindings: clock: tegra: Remove PMC clock IDs
clk_out_1, clk_out_2, clk_out_3, blink are part of Tegra PMC block so these clocks should be provided by the Tegra PMC. IDs for these clocks have been defined in dt-bindings/soc/tegra-pmc.h. This patch removes the IDs for these clocks from the Tegra clock device tree bindings. Tested-by: Dmitry Osipenko <[email protected]> Reviewed-by: Dmitry Osipenko <[email protected]> Acked-by: Rob Herring <[email protected]> Signed-off-by: Sowjanya Komatineni <[email protected]> Signed-off-by: Thierry Reding <[email protected]>
1 parent 796705b commit c958540

File tree

5 files changed

+29
-29
lines changed

5 files changed

+29
-29
lines changed

include/dt-bindings/clock/tegra114-car.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,10 @@
272272
#define TEGRA114_CLK_AUDIO3 242
273273
#define TEGRA114_CLK_AUDIO4 243
274274
#define TEGRA114_CLK_SPDIF 244
275-
#define TEGRA114_CLK_CLK_OUT_1 245
276-
#define TEGRA114_CLK_CLK_OUT_2 246
277-
#define TEGRA114_CLK_CLK_OUT_3 247
278-
#define TEGRA114_CLK_BLINK 248
275+
/* 245 */
276+
/* 246 */
277+
/* 247 */
278+
/* 248 */
279279
#define TEGRA114_CLK_OSC 249
280280
/* 250 */
281281
/* 251 */
@@ -335,9 +335,9 @@
335335
#define TEGRA114_CLK_AUDIO3_MUX 303
336336
#define TEGRA114_CLK_AUDIO4_MUX 304
337337
#define TEGRA114_CLK_SPDIF_MUX 305
338-
#define TEGRA114_CLK_CLK_OUT_1_MUX 306
339-
#define TEGRA114_CLK_CLK_OUT_2_MUX 307
340-
#define TEGRA114_CLK_CLK_OUT_3_MUX 308
338+
/* 306 */
339+
/* 307 */
340+
/* 308 */
341341
#define TEGRA114_CLK_DSIA_MUX 309
342342
#define TEGRA114_CLK_DSIB_MUX 310
343343
#define TEGRA114_CLK_XUSB_SS_DIV2 311

include/dt-bindings/clock/tegra124-car-common.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,10 +271,10 @@
271271
#define TEGRA124_CLK_AUDIO3 242
272272
#define TEGRA124_CLK_AUDIO4 243
273273
#define TEGRA124_CLK_SPDIF 244
274-
#define TEGRA124_CLK_CLK_OUT_1 245
275-
#define TEGRA124_CLK_CLK_OUT_2 246
276-
#define TEGRA124_CLK_CLK_OUT_3 247
277-
#define TEGRA124_CLK_BLINK 248
274+
/* 245 */
275+
/* 246 */
276+
/* 247 */
277+
/* 248 */
278278
#define TEGRA124_CLK_OSC 249
279279
/* 250 */
280280
/* 251 */
@@ -334,9 +334,9 @@
334334
#define TEGRA124_CLK_AUDIO3_MUX 303
335335
#define TEGRA124_CLK_AUDIO4_MUX 304
336336
#define TEGRA124_CLK_SPDIF_MUX 305
337-
#define TEGRA124_CLK_CLK_OUT_1_MUX 306
338-
#define TEGRA124_CLK_CLK_OUT_2_MUX 307
339-
#define TEGRA124_CLK_CLK_OUT_3_MUX 308
337+
/* 306 */
338+
/* 307 */
339+
/* 308 */
340340
/* 309 */
341341
/* 310 */
342342
#define TEGRA124_CLK_SOR0_LVDS 311 /* deprecated */

include/dt-bindings/clock/tegra20-car.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
#define TEGRA20_CLK_CCLK 108
132132
#define TEGRA20_CLK_HCLK 109
133133
#define TEGRA20_CLK_PCLK 110
134-
#define TEGRA20_CLK_BLINK 111
134+
/* 111 */
135135
#define TEGRA20_CLK_PLL_A 112
136136
#define TEGRA20_CLK_PLL_A_OUT0 113
137137
#define TEGRA20_CLK_PLL_C 114

include/dt-bindings/clock/tegra210-car.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -306,10 +306,10 @@
306306
#define TEGRA210_CLK_AUDIO3 274
307307
#define TEGRA210_CLK_AUDIO4 275
308308
#define TEGRA210_CLK_SPDIF 276
309-
#define TEGRA210_CLK_CLK_OUT_1 277
310-
#define TEGRA210_CLK_CLK_OUT_2 278
311-
#define TEGRA210_CLK_CLK_OUT_3 279
312-
#define TEGRA210_CLK_BLINK 280
309+
/* 277 */
310+
/* 278 */
311+
/* 279 */
312+
/* 280 */
313313
#define TEGRA210_CLK_SOR0_LVDS 281 /* deprecated */
314314
#define TEGRA210_CLK_SOR0_OUT 281
315315
#define TEGRA210_CLK_SOR1_OUT 282
@@ -388,9 +388,9 @@
388388
#define TEGRA210_CLK_AUDIO3_MUX 353
389389
#define TEGRA210_CLK_AUDIO4_MUX 354
390390
#define TEGRA210_CLK_SPDIF_MUX 355
391-
#define TEGRA210_CLK_CLK_OUT_1_MUX 356
392-
#define TEGRA210_CLK_CLK_OUT_2_MUX 357
393-
#define TEGRA210_CLK_CLK_OUT_3_MUX 358
391+
/* 356 */
392+
/* 357 */
393+
/* 358 */
394394
#define TEGRA210_CLK_DSIA_MUX 359
395395
#define TEGRA210_CLK_DSIB_MUX 360
396396
/* 361 */

include/dt-bindings/clock/tegra30-car.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,11 @@
232232
#define TEGRA30_CLK_AUDIO3 204
233233
#define TEGRA30_CLK_AUDIO4 205
234234
#define TEGRA30_CLK_SPDIF 206
235-
#define TEGRA30_CLK_CLK_OUT_1 207 /* (extern1) */
236-
#define TEGRA30_CLK_CLK_OUT_2 208 /* (extern2) */
237-
#define TEGRA30_CLK_CLK_OUT_3 209 /* (extern3) */
235+
/* 207 */
236+
/* 208 */
237+
/* 209 */
238238
#define TEGRA30_CLK_SCLK 210
239-
#define TEGRA30_CLK_BLINK 211
239+
/* 211 */
240240
#define TEGRA30_CLK_CCLK_G 212
241241
#define TEGRA30_CLK_CCLK_LP 213
242242
#define TEGRA30_CLK_TWD 214
@@ -262,9 +262,9 @@
262262
/* 297 */
263263
/* 298 */
264264
/* 299 */
265-
#define TEGRA30_CLK_CLK_OUT_1_MUX 300
266-
#define TEGRA30_CLK_CLK_OUT_2_MUX 301
267-
#define TEGRA30_CLK_CLK_OUT_3_MUX 302
265+
/* 300 */
266+
/* 301 */
267+
/* 302 */
268268
#define TEGRA30_CLK_AUDIO0_MUX 303
269269
#define TEGRA30_CLK_AUDIO1_MUX 304
270270
#define TEGRA30_CLK_AUDIO2_MUX 305

0 commit comments

Comments
 (0)