Commit 25c14afe authored by Kevin Hilman's avatar Kevin Hilman

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
parents f3150508 3a5fc252
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
#define RESET_SYS_CPU_L2 58 #define RESET_SYS_CPU_L2 58
#define RESET_SYS_CPU_P 59 #define RESET_SYS_CPU_P 59
#define RESET_SYS_CPU_MBIST 60 #define RESET_SYS_CPU_MBIST 60
/* 61 */ #define RESET_ACODEC 61
/* 62 */ /* 62 */
/* 63 */ /* 63 */
/* RESET2 */ /* RESET2 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment