Commit c7259477 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'amlogic-arm64-dt-for-v5.14' of... 

Merge tag 'amlogic-arm64-dt-for-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt

Amlogic ARM64 DT changed for v5.14:
- set 128bytes FIFO size on uart A
- add Banana PI BPI-M5 board dts & bindings
- meson-sm1: add toacodec node to use internal audio DAC
- enable hdmi audio loopback on VIM3 board

* tag 'amlogic-arm64-dt-for-v5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: set 128bytes FIFO size on uart A
  arm64: dts: meson-sm1: add Banana PI BPI-M5 board dts
  dt-bindings: arm: amlogic: add Banana PI M5 bindings
  arm64: dts: meson-sm1: add toacodec node
  arm64: dts: meson: vim3: enable hdmi audio loopback

Link: https://lore.kernel.org/r/bb207cf8-fc7a-3121-eea8-56618b5952aa@baylibre.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2d08a11e a270a2b2

Documentation/devicetree/bindings/arm/amlogic.yaml

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ properties: 
      - description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC

        items:

          - enum:

              - bananapi,bpi-m5

              - hardkernel,odroid-c4

              - hardkernel,odroid-hc4

              - khadas,vim3l

arch/arm64/boot/dts/amlogic/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-gxm-rbox-pro.dtb 
dtb-$(CONFIG_ARCH_MESON) += meson-gxm-s912-libretech-pc.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-vega-s96.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-gxm-wetek-core2.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-bananapi-m5.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-khadas-vim3l.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-c4.dtb

dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1871,6 +1871,7 @@ uart_A: serial@24000 { 
				status = "disabled";

				clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;

				clock-names = "xtal", "pclk", "baud";

				fifo-size = <128>;

			};

		};

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -2317,6 +2317,7 @@ uart_A: serial@24000 { 
				clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>;

				clock-names = "xtal", "pclk", "baud";

				status = "disabled";

				fifo-size = <128>;

			};

		};

arch/arm64/boot/dts/amlogic/meson-gx.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ uart_A: serial@84c0 { 
				reg = <0x0 0x84c0 0x0 0x18>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

				fifo-size = <128>;

			};



			uart_B: serial@84dc {