Unverified Commit fba65f10 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-arm64-dt-for-v5.15-v2' of... 

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

Amlogic ARM64 DT changes for v5.15 part 2:
- add audio to nodes vega-s95
- add audio to nodes nexbox-a1

* tag 'amlogic-arm64-dt-for-v5.15-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
  arm64: dts: meson: add audio playback to vega-s95 dtsi
  arm64: dts: meson: add audio playback to nexbox-a1

Link: https://lore.kernel.org/r/47d77095-eee7-bbd9-d3aa-1dabeea3f0b9@baylibre.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d5aa0245 c6cf488e

arch/arm64/boot/dts/amlogic/meson-gxbb-vega-s95.dtsi

+61 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include "meson-gxbb.dtsi"

#include <dt-bindings/sound/meson-aiu.h>



/ {

	compatible = "tronsmart,vega-s95", "amlogic,meson-gxbb";
@@ -17,6 +18,13 @@ 
		stdout-path = "serial0:115200n8";

	};



	spdif_dit: audio-codec-0 {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

		status = "okay";

		sound-name-prefix = "DIT";

	};



	leds {

		compatible = "gpio-leds";
@@ -97,6 +105,59 @@ 
		clocks = <&wifi32k>;

		clock-names = "ext_clock";

	};



	sound {

		compatible = "amlogic,gx-sound-card";

		model = "VEGA-S95";

		assigned-clocks = <&clkc CLKID_MPLL0>,

				  <&clkc CLKID_MPLL1>,

				  <&clkc CLKID_MPLL2>;

		assigned-clock-parents = <0>, <0>, <0>;

		assigned-clock-rates = <294912000>,

				       <270950400>,

				       <393216000>;

		status = "okay";



		dai-link-0 {

			sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;

		};



		dai-link-1 {

			sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>;

		};



		dai-link-2 {

			sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;

			dai-format = "i2s";

			mclk-fs = <256>;



			codec-0 {

				sound-dai = <&aiu AIU_HDMI CTRL_I2S>;

			};

		};



		dai-link-3 {

			sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>;



			codec-0 {

				sound-dai = <&spdif_dit>;

			};

		};



		dai-link-4 {

			sound-dai = <&aiu AIU_HDMI CTRL_OUT>;



			codec-0 {

				sound-dai = <&hdmi_tx>;

			};

		};

	};

};



&aiu {

	status = "okay";

	pinctrl-0 = <&spdif_out_y_pins>;

	pinctrl-names = "default";

};



&cec_AO {

arch/arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts

+61 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
/dts-v1/;



#include "meson-gxm.dtsi"

#include <dt-bindings/sound/meson-aiu.h>



/ {

	compatible = "nexbox,a1", "amlogic,s912", "amlogic,meson-gxm";
@@ -24,6 +25,13 @@ 
		stdout-path = "serial0:115200n8";

	};



	spdif_dit: audio-codec-0 {

		#sound-dai-cells = <0>;

		compatible = "linux,spdif-dit";

		status = "okay";

		sound-name-prefix = "DIT";

	};



	memory@0 {

		device_type = "memory";

		reg = <0x0 0x0 0x0 0x80000000>;
@@ -75,6 +83,59 @@ 
			};

		};

	};



	sound {

		compatible = "amlogic,gx-sound-card";

		model = "NEXBOX-A1";

		assigned-clocks = <&clkc CLKID_MPLL0>,

				  <&clkc CLKID_MPLL1>,

				  <&clkc CLKID_MPLL2>;

		assigned-clock-parents = <0>, <0>, <0>;

		assigned-clock-rates = <294912000>,

				       <270950400>,

				       <393216000>;

		status = "okay";



		dai-link-0 {

			sound-dai = <&aiu AIU_CPU CPU_I2S_FIFO>;

		};



		dai-link-1 {

			sound-dai = <&aiu AIU_CPU CPU_SPDIF_FIFO>;

		};



		dai-link-2 {

			sound-dai = <&aiu AIU_CPU CPU_I2S_ENCODER>;

			dai-format = "i2s";

			mclk-fs = <256>;



			codec-0 {

				sound-dai = <&aiu AIU_HDMI CTRL_I2S>;

			};

		};



		dai-link-3 {

			sound-dai = <&aiu AIU_CPU CPU_SPDIF_ENCODER>;



			codec-0 {

				sound-dai = <&spdif_dit>;

			};

		};



		dai-link-4 {

			sound-dai = <&aiu AIU_HDMI CTRL_OUT>;



			codec-0 {

				sound-dai = <&hdmi_tx>;

			};

		};

	};

};



&aiu {

	status = "okay";

	pinctrl-0 = <&spdif_out_h_pins>;

	pinctrl-names = "default";

};



&cec_AO {