Commit 4f9f1415 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt64-2' of... 

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

arm64: dts: amlogic updates for v5.11, round 2
- audio support for several more boards
- PHY timing fixes

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson: add i2c3/rtc nodes and vrtc alias to GT-King/GT-King-Pro
  arm64: dts: meson: g12b: w400: fix PHY deassert timing requirements
  arm64: dts: meson: g12a: x96-max: fix PHY deassert timing requirements
  ARM: dts: meson: fix PHY deassert timing requirements
  arm64: dts: meson: fix PHY deassert timing requirements
  arm64: dts: meson: g12b: odroid-n2: fix PHY deassert timing requirements
  arm64: dts: meson: minor fixups for Khadas VIM/VIM2 dts
  arm64: dts: meson: add audio playback to wetek-play2
  arm64: dts: meson: add audio playback to wetek-hub
  arm64: dts: meson: add audio playback to odroid-c2
  arm64: dts: meson: add audio playback to nanopi-k2
  arm64: dts: meson: add audio playback to khadas-vim2
  arm64: dts: meson: add audio playback to khadas-vim
  arm64: dts: meson: add audio playback to a95x
  arm64: dts: meson-axg: add GE2D node

Link: https://lore.kernel.org/r/7ho8j4gkxo.fsf@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b4e217d0 7704b100

arch/arm/boot/dts/meson8b-odroidc1.dts

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ 
			reg = <0>;



			reset-assert-us = <10000>;

			reset-deassert-us = <30000>;

			reset-deassert-us = <80000>;

			reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;



			interrupt-parent = <&gpio_intc>;

arch/arm/boot/dts/meson8m2-mxiii-plus.dts

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
			reg = <0>;



			reset-assert-us = <10000>;

			reset-deassert-us = <30000>;

			reset-deassert-us = <80000>;

			reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>;

		};

	};

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

+9 −0
Original line number Diff line number Diff line
@@ -1727,6 +1727,15 @@ 
			};

		};



		ge2d: ge2d@ff940000 {

			compatible = "amlogic,axg-ge2d";

			reg = <0x0 0xff940000 0x0 0x10000>;

			interrupts = <GIC_SPI 150 IRQ_TYPE_EDGE_RISING>;

			clocks = <&clkc CLKID_VAPB>;

			resets = <&reset RESET_GE2D>;

			reset-names = "core";

		};



		gic: interrupt-controller@ffc01000 {

			compatible = "arm,gic-400";

			reg = <0x0 0xffc01000 0 0x1000>,

arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ 
		eee-broken-1000t;



		reset-assert-us = <10000>;

		reset-deassert-us = <30000>;

		reset-deassert-us = <80000>;

		reset-gpios = <&gpio GPIOZ_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>;



		interrupt-parent = <&gpio_intc>;

arch/arm64/boot/dts/amlogic/meson-g12b-gtking-pro.dts

+17 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ 
	compatible = "azw,gtking", "amlogic,g12b";

	model = "Beelink GT-King Pro";



	aliases {

		rtc0 = &rtc;

		rtc1 = &vrtc;

	};



	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;
@@ -112,6 +117,18 @@ 
	status = "okay";

};



&i2c3 {

	status = "okay";

	pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>;

	pinctrl-names = "default";



	rtc: rtc@51 {

		compatible = "nxp,pcf8563";

		reg = <0x51>;

		wakeup-source;

	};

};



&tdmif_b {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE