Skip to content

Commit 4881873

Browse files
xdarklightkhilman
authored andcommitted
dt-bindings: reset: meson8b: fix duplicate reset IDs
According to the public S805 datasheet the RESET2 register uses the following bits for the PIC_DC, PSC and NAND reset lines: - PIC_DC is at bit 3 (meaning: RESET_VD_RMEM + 3) - PSC is at bit 4 (meaning: RESET_VD_RMEM + 4) - NAND is at bit 5 (meaning: RESET_VD_RMEM + 4) Update the reset IDs of these three reset lines so they don't conflict with PIC_DC and map to the actual hardware reset lines. Fixes: 79795e2 ("dt-bindings: reset: Add bindings for the Meson SoC Reset Controller") Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Kevin Hilman <khilman@baylibre.com>
1 parent c67aafd commit 4881873

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

include/dt-bindings/reset/amlogic,meson8b-reset.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
#define RESET_VD_RMEM 64
4747
#define RESET_AUDIN 65
4848
#define RESET_DBLK 66
49-
#define RESET_PIC_DC 66
50-
#define RESET_PSC 66
51-
#define RESET_NAND 66
49+
#define RESET_PIC_DC 67
50+
#define RESET_PSC 68
51+
#define RESET_NAND 69
5252
#define RESET_GE2D 70
5353
#define RESET_PARSER_REG 71
5454
#define RESET_PARSER_FETCH 72

0 commit comments

Comments
 (0)