diff options
| author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2019-11-30 19:53:37 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2019-12-10 00:21:20 +0100 |
| commit | 4881873f4cc1460f63d85fa81363d56be328ccdc (patch) | |
| tree | 740c08d2bb966dce184e5fc2131bd03785ca1676 /include/dt-bindings | |
| parent | soc: amlogic: meson-ee-pwrc: propagate errors from pm_genpd_init() (diff) | |
| download | linux-4881873f4cc1460f63d85fa81363d56be328ccdc.tar.xz linux-4881873f4cc1460f63d85fa81363d56be328ccdc.zip | |
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>
Diffstat (limited to 'include/dt-bindings')
| -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 |