diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-01-20 10:05:16 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-01-20 10:05:16 +0300 |
| commit | a786810cc864e31237a755b933e8872ba3e118bc (patch) | |
| tree | f94bd068691d03be00b582fd2fdabe7ccff0f044 /include/dt-bindings/reset/amlogic,meson8b-reset.h | |
| parent | 4444f8541dad16fefd9b8807ad1451e806ef1d94 (diff) | |
| parent | def9d2780727cec3313ed3522d0123158d87224d (diff) | |
| download | linux-a786810cc864e31237a755b933e8872ba3e118bc.tar.xz | |
Merge tag 'v5.5-rc7' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/dt-bindings/reset/amlogic,meson8b-reset.h')
| -rw-r--r-- | include/dt-bindings/reset/amlogic,meson8b-reset.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/dt-bindings/reset/amlogic,meson8b-reset.h b/include/dt-bindings/reset/amlogic,meson8b-reset.h index c614438bcbdb..fbc524a900da 100644 --- a/include/dt-bindings/reset/amlogic,meson8b-reset.h +++ b/include/dt-bindings/reset/amlogic,meson8b-reset.h @@ -46,9 +46,9 @@ #define RESET_VD_RMEM 64 #define RESET_AUDIN 65 #define RESET_DBLK 66 -#define RESET_PIC_DC 66 -#define RESET_PSC 66 -#define RESET_NAND 66 +#define RESET_PIC_DC 67 +#define RESET_PSC 68 +#define RESET_NAND 69 #define RESET_GE2D 70 #define RESET_PARSER_REG 71 #define RESET_PARSER_FETCH 72 |