Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 79795e20a184eb ("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>

authored by

Martin Blumenstingl and committed by
Kevin Hilman
4881873f c67aafd6

+3 -3
+3 -3
include/dt-bindings/reset/amlogic,meson8b-reset.h
··· 46 46 #define RESET_VD_RMEM 64 47 47 #define RESET_AUDIN 65 48 48 #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 52 52 #define RESET_GE2D 70 53 53 #define RESET_PARSER_REG 71 54 54 #define RESET_PARSER_FETCH 72