Merge branch 'reset/meson-sm1-bindings' of git://git.pengutronix.de/git/pza/linux into v5.5/dt64-redo

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

kernel os linux

* 'reset/meson-sm1-bindings' of git://git.pengutronix.de/git/pza/linux:
reset: dt-bindings: meson: update arb bindings for sm1

Kevin Hilman 6 years ago 016a4d6b 15767cfd

+4 -1

2 changed files

expand all

Documentation

devicetree

bindings

reset

amlogic,meson-axg-audio-arb.txt

include

dt-bindings

reset

amlogic,meson-axg-audio-arb.h

+2 -1

Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt

··· 4 4 disables the access of Audio FIFOs to DDR on AXG based SoC. 5 5 6 6 Required properties: 7 - - compatible: 'amlogic,meson-axg-audio-arb' 7 + - compatible: 'amlogic,meson-axg-audio-arb' or 8 + 'amlogic,meson-sm1-audio-arb' 8 9 - reg: physical base address of the controller and length of memory 9 10 mapped region. 10 11 - clocks: phandle to the fifo peripheral clock provided by the audio

include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h

··· 13 13 #define AXG_ARB_FRDDR_A 3 14 14 #define AXG_ARB_FRDDR_B 4 15 15 #define AXG_ARB_FRDDR_C 5 16 + #define AXG_ARB_TODDR_D 6 17 + #define AXG_ARB_FRDDR_D 7 16 18 17 19 #endif /* _DT_BINDINGS_AMLOGIC_MESON_AXG_AUDIO_ARB_H */