diff options
| author |   Stephen Boyd <sboyd@kernel.org> | 2020-03-06 13:11:42 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2020-03-06 13:11:42 -0800 |
| commit | dfbfee870234383bd37e4912350f472cdadda3ae (patch) | |
| tree | 17402d4550fa8f1eed6dd8c215432d866bd199e7 /include | |
| parent | Linux 5.6-rc1 (diff) | |
| parent | clk: meson: meson8b: set audio output clock hierarchy (diff) | |
| download | wireguard-linux-dfbfee870234383bd37e4912350f472cdadda3ae.tar.xz wireguard-linux-dfbfee870234383bd37e4912350f472cdadda3ae.zip | |
Merge tag 'clk-meson-v5.7-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver updates from Jerome Brunet:
- Update audio clock gate hierarchy for meson8 and gxbb
- Update g12a spicc clock sources
* tag 'clk-meson-v5.7-1' of https://github.com/BayLibre/clk-meson:
clk: meson: meson8b: set audio output clock hierarchy
clk: meson: g12a: add support for the SPICC SCLK Source clocks
dt-bindings: clk: g12a-clkc: add SPICC SCLK Source clock IDs
clk: meson: gxbb: set audio output clock hierarchy
clk: meson: gxbb: add the gxl internal dac gate
dt-bindings: clk: meson: add the gxl internal dac gate
Diffstat (limited to 'include')
| -rw-r--r-- | include/dt-bindings/clock/g12a-clkc.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/clock/gxbb-clkc.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h index 0837c1a7ae49..b0d65d73db96 100644 --- a/include/dt-bindings/clock/g12a-clkc.h +++ b/include/dt-bindings/clock/g12a-clkc.h @@ -143,5 +143,7 @@ #define CLKID_CPU1_CLK 253 #define CLKID_CPU2_CLK 254 #define CLKID_CPU3_CLK 255 +#define CLKID_SPICC0_SCLK 258 +#define CLKID_SPICC1_SCLK 261 #endif /* __G12A_CLKC_H */ diff --git a/include/dt-bindings/clock/gxbb-clkc.h b/include/dt-bindings/clock/gxbb-clkc.h index db0763e96173..4073eb7a9da1 100644 --- a/include/dt-bindings/clock/gxbb-clkc.h +++ b/include/dt-bindings/clock/gxbb-clkc.h @@ -146,5 +146,6 @@ #define CLKID_CTS_VDAC 201 #define CLKID_HDMI_TX 202 #define CLKID_HDMI 205 +#define CLKID_ACODEC 206 #endif /* __GXBB_CLKC_H */ |