]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
dt-bindings: reset: meson8b: fix duplicate reset IDs
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Sat, 30 Nov 2019 18:53:37 +0000 (19:53 +0100)
committerKhalid Elmously <khalid.elmously@canonical.com>
Fri, 14 Feb 2020 05:29:37 +0000 (00:29 -0500)
commit9a6b3cea5792f94f03f579c668a60eb4ddd209f0
treec7f6e274f5d981f56910783cd2c7de08e394dfc0
parente7e9836ba7afb206e9413e1ebeac9da4505c5972
dt-bindings: reset: meson8b: fix duplicate reset IDs

BugLink: https://bugs.launchpad.net/bugs/1862259
commit 4881873f4cc1460f63d85fa81363d56be328ccdc upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
include/dt-bindings/reset/amlogic,meson8b-reset.h