diff options
| author | Kevin Hilman <khilman@baylibre.com> | 2019-10-16 10:02:05 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-10-16 10:02:05 -0700 |
| commit | 016a4d6b1bfde534cb8ccd3b8f3aa485126de444 (patch) | |
| tree | 18c78a8e0f2d8f137ea0c18aeefda9ab50543854 | |
| parent | 15767cfd81eb9ff2fb783d0c6f458b90efa7d4d3 (diff) | |
| parent | c2016cc612db7b88483073d6ff51edd200bc6ddc (diff) | |
| download | linux-stable-016a4d6b1bfde534cb8ccd3b8f3aa485126de444.tar.gz linux-stable-016a4d6b1bfde534cb8ccd3b8f3aa485126de444.tar.bz2 linux-stable-016a4d6b1bfde534cb8ccd3b8f3aa485126de444.zip | |
Merge branch 'reset/meson-sm1-bindings' of git://git.pengutronix.de/git/pza/linux into v5.5/dt64-redo
* 'reset/meson-sm1-bindings' of git://git.pengutronix.de/git/pza/linux:
reset: dt-bindings: meson: update arb bindings for sm1
| -rw-r--r-- | Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt | 3 | ||||
| -rw-r--r-- | include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt index 26e542eb96df..43e580ef64ba 100644 --- a/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-axg-audio-arb.txt @@ -4,7 +4,8 @@ The Amlogic Audio ARB is a simple device which enables or disables the access of Audio FIFOs to DDR on AXG based SoC. Required properties: -- compatible: 'amlogic,meson-axg-audio-arb' +- compatible: 'amlogic,meson-axg-audio-arb' or + 'amlogic,meson-sm1-audio-arb' - reg: physical base address of the controller and length of memory mapped region. - clocks: phandle to the fifo peripheral clock provided by the audio diff --git a/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h b/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h index 05c36367875c..1ef807856cb8 100644 --- a/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h +++ b/include/dt-bindings/reset/amlogic,meson-axg-audio-arb.h @@ -13,5 +13,7 @@ #define AXG_ARB_FRDDR_A 3 #define AXG_ARB_FRDDR_B 4 #define AXG_ARB_FRDDR_C 5 +#define AXG_ARB_TODDR_D 6 +#define AXG_ARB_FRDDR_D 7 #endif /* _DT_BINDINGS_AMLOGIC_MESON_AXG_AUDIO_ARB_H */ |