Skip to content

Commit 6655744

Browse files
superna9999jbrun3t
authored andcommitted
dt-bindings: clk: g12a-aoclkc: expose all clock ids
Due to a policy change in clock ID bindings handling, expose all the "private" clock IDs to the public clock dt-bindings to move out of the previous maintenance scheme. This refers to a discussion at [1] & [2] with Krzysztof about the issue with the current maintenance. It was decided to move every g12a-aoclkc ID to the public clock dt-bindings headers to be merged in a single tree so we can safely add new clocks without having merge issues. [1] https://lore.kernel.org/all/[email protected]/ [2] https://lore.kernel.org/all/[email protected]/ Acked-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/20230607-topic-amlogic-upstream-clkid-public-migration-v2-10-38172d17c27a@linaro.org Signed-off-by: Jerome Brunet <[email protected]>
1 parent b126249 commit 6655744

File tree

2 files changed

+7
-17
lines changed

2 files changed

+7
-17
lines changed

drivers/clk/meson/g12a-aoclk.h

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,6 @@
77
#ifndef __G12A_AOCLKC_H
88
#define __G12A_AOCLKC_H
99

10-
/*
11-
* CLKID index values
12-
*
13-
* These indices are entirely contrived and do not map onto the hardware.
14-
* It has now been decided to expose everything by default in the DT header:
15-
* include/dt-bindings/clock/g12a-aoclkc.h. Only the clocks ids we don't want
16-
* to expose, such as the internal muxes and dividers of composite clocks,
17-
* will remain defined here.
18-
*/
19-
#define CLKID_AO_SAR_ADC_DIV 17
20-
#define CLKID_AO_32K_PRE 20
21-
#define CLKID_AO_32K_DIV 21
22-
#define CLKID_AO_32K_SEL 22
23-
#define CLKID_AO_CEC_PRE 24
24-
#define CLKID_AO_CEC_DIV 25
25-
#define CLKID_AO_CEC_SEL 26
26-
2710
#include <dt-bindings/clock/g12a-aoclkc.h>
2811
#include <dt-bindings/reset/g12a-aoclkc.h>
2912

include/dt-bindings/clock/g12a-aoclkc.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,17 @@
2626
#define CLKID_AO_M4_FCLK 13
2727
#define CLKID_AO_M4_HCLK 14
2828
#define CLKID_AO_CLK81 15
29+
#define CLKID_AO_SAR_ADC_DIV 17
2930
#define CLKID_AO_SAR_ADC_SEL 16
3031
#define CLKID_AO_SAR_ADC_CLK 18
3132
#define CLKID_AO_CTS_OSCIN 19
33+
#define CLKID_AO_32K_PRE 20
34+
#define CLKID_AO_32K_DIV 21
35+
#define CLKID_AO_32K_SEL 22
3236
#define CLKID_AO_32K 23
37+
#define CLKID_AO_CEC_PRE 24
38+
#define CLKID_AO_CEC_DIV 25
39+
#define CLKID_AO_CEC_SEL 26
3340
#define CLKID_AO_CEC 27
3441
#define CLKID_AO_CTS_RTC_OSCIN 28
3542

0 commit comments

Comments
 (0)