diff options
| author | Neil Armstrong <narmstrong@baylibre.com> | 2020-09-10 10:48:12 +0200 |
|---|---|---|
| committer | Neil Armstrong <narmstrong@baylibre.com> | 2020-10-05 17:59:45 +0200 |
| commit | 4e7b0a3f2a3153f2e3a2247626c91ef225de3d57 (patch) | |
| tree | 4989b98d54fd647a0101316e453c61992350cdca /include/dt-bindings | |
| parent | 394c6b0ff11a14400c7f8bc6d3a138f804f79586 (diff) | |
| download | u-boot-4e7b0a3f2a3153f2e3a2247626c91ef225de3d57.zip u-boot-4e7b0a3f2a3153f2e3a2247626c91ef225de3d57.tar.gz u-boot-4e7b0a3f2a3153f2e3a2247626c91ef225de3d57.tar.bz2 | |
ARM: dts: sync amlogic AXG/GXL/GXM DT from Linux 5.8-rc1
This imports the AXG, GXL & GXM SoC and boards DT changes from the Linux
commit b3a9e3b9622a ("Linux 5.8-rc1").
This change also removes GXL & GXM u-boot.dtsi hacks for USB gadget.
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/reset/amlogic,meson-gxbb-reset.h | 2 | ||||
| -rw-r--r-- | include/dt-bindings/sound/meson-aiu.h | 18 |
2 files changed, 19 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 ea50586..883bfd3 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 */ diff --git a/include/dt-bindings/sound/meson-aiu.h b/include/dt-bindings/sound/meson-aiu.h new file mode 100644 index 0000000..1051b8a --- /dev/null +++ b/include/dt-bindings/sound/meson-aiu.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_MESON_AIU_H +#define __DT_MESON_AIU_H + +#define AIU_CPU 0 +#define AIU_HDMI 1 +#define AIU_ACODEC 2 + +#define CPU_I2S_FIFO 0 +#define CPU_SPDIF_FIFO 1 +#define CPU_I2S_ENCODER 2 +#define CPU_SPDIF_ENCODER 3 + +#define CTRL_I2S 0 +#define CTRL_PCM 1 +#define CTRL_OUT 2 + +#endif /* __DT_MESON_AIU_H */ |