diff options
| author | Tom Rini <[email protected]> | 2020-10-06 08:36:10 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-10-06 08:36:10 -0400 |
| commit | 987ab49366f3fcd25039eab431bf099b587b3265 (patch) | |
| tree | 75defe86fd35339b1b2e695ea1beebc0bbf1bbaf /include/dt-bindings/reset | |
| parent | b24550accd7e3a62c6da773a9096dfd1471403d5 (diff) | |
| parent | 2d481b2e3e22f7be854d381a7bafd92a65e18b23 (diff) | |
Merge tag 'u-boot-amlogic-20201005' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- generate unique mac address from SoC serial on S400 board
- Add USB support for GXL and AXG SoCs
- Update Gadget code to use the new GXL and AXG USB glue driver
- Add a VIM3 board support to add dynamic PCIe enable in OS DT
- Fix AXG pinmux with requesting GPIOs
- Add missing GPIOA_18 for AXG pinctrl
- Add Amlogic PWM driver
Diffstat (limited to 'include/dt-bindings/reset')
| -rw-r--r-- | include/dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h b/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h index ea505861886..883bfd3bcba 100644 --- a/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h +++ b/include/dt-bindings/reset/amlogic,meson-gxbb-reset.h @@ -69,7 +69,7 @@ #define RESET_SYS_CPU_L2 58 #define RESET_SYS_CPU_P 59 #define RESET_SYS_CPU_MBIST 60 -/* 61 */ +#define RESET_ACODEC 61 /* 62 */ /* 63 */ /* RESET2 */ |