diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-10 22:11:12 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-10 22:11:13 -0800 |
| commit | dc64f487f4c4e7a03bfa0a7c0e8e6a49214373d0 (patch) | |
| tree | 93b82518c1fea41980bf77927f5fa43d76ffb8f8 /include | |
| parent | 9f1c2cb3296a252bd84d56f80346369bd0d95387 (diff) | |
| parent | 30388cc075720aa0af4f2cb5933afa1f8f39d313 (diff) | |
| download | linux-dc64f487f4c4e7a03bfa0a7c0e8e6a49214373d0.tar.bz2 | |
Merge tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/fixes
arm-soc: Amlogic fixes for v5.5-rc
* tag 'amlogic-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson-sm1-sei610: add gpio bluetooth interrupt
dt-bindings: reset: meson8b: fix duplicate reset IDs
soc: amlogic: meson-ee-pwrc: propagate errors from pm_genpd_init()
soc: amlogic: meson-ee-pwrc: propagate PD provider registration errors
ARM: dts: meson8: fix the size of the PMU registers
arm64: dts: meson-sm1-sei610: gpio-keys: switch to IRQs
Link: https://lore.kernel.org/r/7hmuaweavi.fsf@baylibre.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include')
| -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 |