diff options
| author | Jerome Brunet <[email protected]> | 2019-08-26 11:01:20 +0200 |
|---|---|---|
| committer | Jerome Brunet <[email protected]> | 2019-08-26 11:01:20 +0200 |
| commit | 1db61d5eda74e65ee5313b9cc0c1bdc8f570d362 (patch) | |
| tree | 22f07fc35a69bba033ea0e9b790245fac5b91af0 | |
| parent | 7cfefab6563f6e333477ec71613e1ec3bbdccc35 (diff) | |
| parent | cda4569137b90f200bee4922d894ca49d4188681 (diff) | |
Merge branch 'v5.4/dt' into v5.4/drivers
| -rw-r--r-- | Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt | 1 | ||||
| -rw-r--r-- | include/dt-bindings/clock/g12a-clkc.h | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt b/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt index 6eaa52092313..7ccecd5c02c1 100644 --- a/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt +++ b/Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt @@ -11,6 +11,7 @@ Required Properties: "amlogic,axg-clkc" for AXG SoC. "amlogic,g12a-clkc" for G12A SoC. "amlogic,g12b-clkc" for G12B SoC. + "amlogic,sm1-clkc" for SM1 SoC. - clocks : list of clock phandle, one for each entry clock-names. - clock-names : should contain the following: * "xtal": the platform xtal diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index 8ccc29ac7a72..0837c1a7ae49 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -138,5 +138,10 @@ #define CLKID_VDEC_HEVCF 210 #define CLKID_TS 212 #define CLKID_CPUB_CLK 224 +#define CLKID_GP1_PLL 243 +#define CLKID_DSU_CLK 252 +#define CLKID_CPU1_CLK 253 +#define CLKID_CPU2_CLK 254 +#define CLKID_CPU3_CLK 255 #endif /* __G12A_CLKC_H */ |