Merge tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt

arm64: dts: Amlogic updates for v5.3

Highlights:
- new SoC: S922X (G12B family, A73/A53 big.LITTLE)
- new board: Hardkernel odroid-N2 (SoC: G12B S922X)
- add/use ethernet PHY interrupt/reset lines
- G12A: add/enable audio, PWM, IR, i2c, SD/eMMC, WiFi, bluetooth, network
- gxbb-vega-s95 board: fix WiFi/BT, enable more peripherals

* tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (79 commits)
  arm64: dts: meson: g12a: x96-max: add the Ethernet PHY interrupt line
  arm64: dts: meson: g12b: odroid-n2: add the Ethernet PHY interrupt line
  arm64: dts: meson: g12b: odroid-n2: add the Ethernet PHY reset line
  arm64: dts: meson: use the generic Ethernet PHY reset GPIO bindings
  arm64: dts: meson: g12a: x96-max: fix the Ethernet PHY reset line
  arm64: dts: meson: g12a: sort sdio nodes correctly
  arm64: dts: meson-g12a-x96-max: add sound card
  arm64: dts: meson-g12b-odroid-n2: add sound card
  arm64: dts: meson: sei510: add sound card
  arm64: dts: meson: sei510: add max98357a DAC
  ASoC: meson: add tohdmitx DT bindings
  arm64: dts: meson: g12a: add the GPIO interrupt controller
  arm64: dts: meson-g12a-x96-max: bump bluetooth bus speed to 2Mbaud/s
  arm64: dts: meson-g12a-sei510: bump bluetooth bus speed to 2Mbaud/s
  arm64: dts: meson-g12a-x96-max: add 32k clock to bluetooth node
  arm64: dts: meson-g12a-sei510: add 32k clock to bluetooth node
  arm64: dts: meson-g12a-sei510: Enable Wifi SDIO module
  arm64: dts: meson-g12a-x96-max: Enable Wifi SDIO Module
  arm64: dts: meson-g12a-x96-max: add support for sdcard and emmc
  arm64: dts: meson: g12a: add SDIO controller
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 14 insertions, 1 deletions

diff --git a/include/dt-bindings/clock/g12a-clkc.h b/include/dt-bindings/clock/g12a-clkc.h
index 82c9e0c020b2..e10470ed7c4f 100644
--- a/include/dt-bindings/clock/g12a-clkc.h
+++ b/include/dt-bindings/clock/g12a-clkc.h
@@ -130,7 +130,7 @@
 #define CLKID_MALI_1_SEL                        172
 #define CLKID_MALI_1                            174
 #define CLKID_MALI                              175
-#define CLKID_MPLL_5OM                          177
+#define CLKID_MPLL_50M                          177
 #define CLKID_CPU_CLK                           187
 #define CLKID_PCIE_PLL                          201
 #define CLKID_VDEC_1                            204
diff --git a/include/dt-bindings/sound/meson-g12a-tohdmitx.h b/include/dt-bindings/sound/meson-g12a-tohdmitx.h
new file mode 100644
index 000000000000..c5e1f48d30d0
--- /dev/null
+++ b/include/dt-bindings/sound/meson-g12a-tohdmitx.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __DT_MESON_G12A_TOHDMITX_H
+#define __DT_MESON_G12A_TOHDMITX_H
+
+#define TOHDMITX_I2S_IN_A       0
+#define TOHDMITX_I2S_IN_B       1
+#define TOHDMITX_I2S_IN_C       2
+#define TOHDMITX_I2S_OUT        3
+#define TOHDMITX_SPDIF_IN_A     4
+#define TOHDMITX_SPDIF_IN_B     5
+#define TOHDMITX_SPDIF_OUT      6
+
+#endif /* __DT_MESON_G12A_TOHDMITX_H */