Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'clk-meson-dt-v5.5-1' of git://github.com/BayLibre/clk-meson into v5.5/dt64-redo

First round of amlogic DT binding clock update target for v5.5

Add the audio clock and reset bindings for the sm1 SoC family

* tag 'clk-meson-dt-v5.5-1' of git://github.com/BayLibre/clk-meson:
dt-bindings: clock: meson: add sm1 resets to the axg-audio controller
dt-bindings: clk: axg-audio: add sm1 bindings

+27 -1
+2 -1
Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt
··· 7 7 Required Properties: 8 8 9 9 - compatible : should be "amlogic,axg-audio-clkc" for the A113X and A113D, 10 - "amlogic,g12a-audio-clkc" for G12A. 10 + "amlogic,g12a-audio-clkc" for G12A, 11 + "amlogic,sm1-audio-clkc" for S905X3. 11 12 - reg : physical base address of the clock controller and length of 12 13 memory mapped region. 13 14 - clocks : a list of phandle + clock-specifier pairs for the clocks listed
+10
include/dt-bindings/clock/axg-audio-clkc.h
··· 80 80 #define AUD_CLKID_TDM_SCLK_PAD0 160 81 81 #define AUD_CLKID_TDM_SCLK_PAD1 161 82 82 #define AUD_CLKID_TDM_SCLK_PAD2 162 83 + #define AUD_CLKID_TOP 163 84 + #define AUD_CLKID_TORAM 164 85 + #define AUD_CLKID_EQDRC 165 86 + #define AUD_CLKID_RESAMPLE_B 166 87 + #define AUD_CLKID_TOVAD 167 88 + #define AUD_CLKID_LOCKER 168 89 + #define AUD_CLKID_SPDIFIN_LB 169 90 + #define AUD_CLKID_FRDDR_D 170 91 + #define AUD_CLKID_TODDR_D 171 92 + #define AUD_CLKID_LOOPBACK_B 172 83 93 84 94 #endif /* __AXG_AUDIO_CLKC_BINDINGS_H */
+15
include/dt-bindings/reset/amlogic,meson-g12a-audio-reset.h
··· 35 35 #define AUD_RESET_TOHDMITX 24 36 36 #define AUD_RESET_CLKTREE 25 37 37 38 + /* SM1 added resets */ 39 + #define AUD_RESET_RESAMPLE_B 26 40 + #define AUD_RESET_TOVAD 27 41 + #define AUD_RESET_LOCKER 28 42 + #define AUD_RESET_SPDIFIN_LB 29 43 + #define AUD_RESET_FRATV 30 44 + #define AUD_RESET_FRHDMIRX 31 45 + #define AUD_RESET_FRDDR_D 32 46 + #define AUD_RESET_TODDR_D 33 47 + #define AUD_RESET_LOOPBACK_B 34 48 + #define AUD_RESET_EARCTX 35 49 + #define AUD_RESET_EARCRX 36 50 + #define AUD_RESET_FRDDR_E 37 51 + #define AUD_RESET_TODDR_E 38 52 + 38 53 #endif