Merge branch 'reset/meson-gxl-dac' of git://git.pengutronix.de/pza/linux into HEAD

* 'reset/meson-gxl-dac' of git://git.pengutronix.de/pza/linux: dt-bindings: reset: meson: add gxl internal dac reset

Merge branch 'reset/meson-gxl-dac' of git://git.pengutronix.de/pza/linux into HEAD
* 'reset/meson-gxl-dac' of git://git.pengutronix.de/pza/linux: dt-bindings: reset: meson: add gxl internal dac reset
25c14afe · Kevin Hilman · f3150508 · 3a5fc252 · 25c14afe
Commit 25c14afe authored May 19, 2020 by Kevin Hilman
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/dt-bindings/reset/amlogic,meson-gxbb-reset.h include/dt-bindings/reset/amlogic,meson-gxbb-reset.h +1 -1

No files found.
--- a/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h
+++ b/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h
@@ -69,7 +69,7 @@
 #define RESET_SYS_CPU_L2		58
 #define RESET_SYS_CPU_P			59
 #define RESET_SYS_CPU_MBIST		60
-/*					61	*/
+#define RESET_ACODEC			61
 /*					62	*/
 /*					63	*/
 /*	RESET2					*/