Commit 7c9c0624 authored by Jerome Brunet's avatar Jerome Brunet Committed by Kevin Hilman
Browse files

arm64: dts: meson: vim3: make sound card common to all variants 



The vim3 sound card definition should be same all the vim3 variants
Move the definition to the appropriate device tree file.

Signed-off-by: default avatarJerome Brunet <jbrunet@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20200803142158.173402-1-jbrunet@baylibre.com
parent 1f9d87d0

arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi

+0 −88
Original line number Diff line number Diff line
@@ -5,8 +5,6 @@ 
 * Copyright (c) 2019 Christian Hewitt <christianshewitt@gmail.com>

 */



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



/ {

	model = "Khadas VIM3";
@@ -47,69 +45,6 @@ 
		regulator-boot-on;

		regulator-always-on;

	};



	sound {

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

		model = "G12B-KHADAS-VIM3";

		audio-aux-devs = <&tdmout_a>;

		audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",

				"TDMOUT_A IN 1", "FRDDR_B OUT 0",

				"TDMOUT_A IN 2", "FRDDR_C OUT 0",

				"TDM_A Playback", "TDMOUT_A OUT";



		assigned-clocks = <&clkc CLKID_MPLL2>,

				  <&clkc CLKID_MPLL0>,

				  <&clkc CLKID_MPLL1>;

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

		assigned-clock-rates = <294912000>,

				       <270950400>,

				       <393216000>;

		status = "okay";



		dai-link-0 {

			sound-dai = <&frddr_a>;

		};



		dai-link-1 {

			sound-dai = <&frddr_b>;

		};



		dai-link-2 {

			sound-dai = <&frddr_c>;

		};



		/* 8ch hdmi interface */

		dai-link-3 {

			sound-dai = <&tdmif_a>;

			dai-format = "i2s";

			dai-tdm-slot-tx-mask-0 = <1 1>;

			dai-tdm-slot-tx-mask-1 = <1 1>;

			dai-tdm-slot-tx-mask-2 = <1 1>;

			dai-tdm-slot-tx-mask-3 = <1 1>;

			mclk-fs = <256>;



			codec {

				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;

			};

		};



		/* hdmi glue */

		dai-link-4 {

			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;



			codec {

				sound-dai = <&hdmi_tx>;

			};

		};

	};

};



&arb {

	status = "okay";

};



&clkc_audio {

	status = "okay";

};



&cpu0 {
@@ -154,18 +89,6 @@ 
	clock-latency = <50000>;

};



&frddr_a {

	status = "okay";

};



&frddr_b {

	status = "okay";

};



&frddr_c {

	status = "okay";

};



&pwm_ab {

	pinctrl-0 = <&pwm_a_e_pins>;

	pinctrl-names = "default";
@@ -182,14 +105,3 @@ 
	status = "okay";

};

&tdmif_a {

	status = "okay";

};



&tdmout_a {

	status = "okay";

};



&tohdmitx {

	status = "okay";

};

arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi

+90 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <dt-bindings/input/input.h>

#include <dt-bindings/gpio/meson-g12a-gpio.h>

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



/ {

	aliases {
@@ -161,6 +162,62 @@ 
		};

	};





	sound {

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

		model = "G12B-KHADAS-VIM3";

		audio-aux-devs = <&tdmout_a>;

		audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",

				"TDMOUT_A IN 1", "FRDDR_B OUT 0",

				"TDMOUT_A IN 2", "FRDDR_C OUT 0",

				"TDM_A Playback", "TDMOUT_A OUT";



		assigned-clocks = <&clkc CLKID_MPLL2>,

				  <&clkc CLKID_MPLL0>,

				  <&clkc CLKID_MPLL1>;

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

		assigned-clock-rates = <294912000>,

				       <270950400>,

				       <393216000>;

		status = "okay";



		dai-link-0 {

			sound-dai = <&frddr_a>;

		};



		dai-link-1 {

			sound-dai = <&frddr_b>;

		};



		dai-link-2 {

			sound-dai = <&frddr_c>;

		};



		/* 8ch hdmi interface */

		dai-link-3 {

			sound-dai = <&tdmif_a>;

			dai-format = "i2s";

			dai-tdm-slot-tx-mask-0 = <1 1>;

			dai-tdm-slot-tx-mask-1 = <1 1>;

			dai-tdm-slot-tx-mask-2 = <1 1>;

			dai-tdm-slot-tx-mask-3 = <1 1>;

			mclk-fs = <256>;



			codec {

				sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;

			};

		};



		/* hdmi glue */

		dai-link-4 {

			sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;



			codec {

				sound-dai = <&hdmi_tx>;

			};

		};

	};



	wifi32k: wifi32k {

		compatible = "pwm-clock";

		#clock-cells = <0>;
@@ -169,6 +226,14 @@ 
	};

};



&arb {

	status = "okay";

};



&clkc_audio {

	status = "okay";

};



&cec_AO {

	pinctrl-0 = <&cec_ao_a_h_pins>;

	pinctrl-names = "default";
@@ -221,6 +286,18 @@ 
        amlogic,tx-delay-ns = <2>;

};



&frddr_a {

	status = "okay";

};



&frddr_b {

	status = "okay";

};



&frddr_c {

	status = "okay";

};



&hdmi_tx {

	status = "okay";

	pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>;
@@ -368,6 +445,19 @@ 
	};

};





&tdmif_a {

	status = "okay";

};



&tdmout_a {

	status = "okay";

};



&tohdmitx {

	status = "okay";

};



&uart_A {

	status = "okay";

	pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE