Merge pull request hardkernel#55 from yan-wyb/khadas-vims-4.9.y

fixup! arm64: dts: overlay: VIM3L: Add ext_board dts
Dangku · Dec 26, 2021 · d05de8d · d05de8d
2 parents e84d3c1 + 7aafde3
commit d05de8d
Showing 1 changed file with 91 additions and 67 deletions.
diff --git a/arch/arm64/boot/dts/amlogic/overlays/kvim3l/ext_board.dts b/arch/arm64/boot/dts/amlogic/overlays/kvim3l/ext_board.dts
@@ -6,11 +6,11 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-    fragment@0 {
-        target = <&i2c3>;
+	fragment@0 {
+		target = <&i2c3>;
 
-        __overlay__ {
-            status = "okay";
+		__overlay__ {
+			status = "okay";
 		};
 	};
 
@@ -47,9 +47,9 @@
 				/* suffix-name, sync with android audio hal
 				 * what's the dai link used for
 				 */
-				suffix-name = "alsaPORT-spdif-b";
+				suffix-name = "alsaPORT-spdifb";
 				cpu {
-					sound-dai = <&aml_spdif_b>;
+					sound-dai = <&spdifb>;
 					system-clock-frequency = <6144000>;
 				};
 				codec {
@@ -63,98 +63,122 @@
 				//continuous-clock;
 				//bitclock-inversion;
 				//frame-inversion;
-				//bitclock-master = <&tdmacodec>;
-				//frame-master = <&tdmacodec>;
-				/* suffix-name, sync with android audio hal
-				 * what's the dai link used for
+				/* master mode */
+				bitclock-master = <&tdma>;
+				frame-master = <&tdma>;
+				/* slave mode */
+				/*
+				 * bitclock-master = <&tdmacodec>;
+				 * frame-master = <&tdmacodec>;
 				 */
 				suffix-name = "alsaPORT-pcm";
 				tdmacpu: cpu {
-			 				 sound-dai = <&aml_tdma>;
-			 				 dai-tdm-slot-tx-mask =
-	 							 <1 1 1 1 1 1 1 1>;
-			 				 dai-tdm-slot-rx-mask =
-	 							 <1 1 1 1 1 1 1 1>;
-			 				 dai-tdm-slot-num = <8>;
-			 				 dai-tdm-slot-width = <32>;
-			 				 system-clock-frequency = <24576000>;
-			 			 };
+					sound-dai = <&tdma>;
+					dai-tdm-slot-tx-mask =
+								<1>;
+					dai-tdm-slot-rx-mask =
+								<1>;
+					dai-tdm-slot-num = <2>;
+					dai-tdm-slot-width = <16>;
+					system-clock-frequency = <256000>;
+				};
 				tdmacodec: codec {
-			   		sound-dai = <&dummy_codec &dummy_codec>;
+					sound-dai = <&dummy_codec>;
 				};
 			};
 
 			aml-audio-card,dai-link@2 {
-				format = "i2s";
+				format = "i2s";// "dsp_a";
 				mclk-fs = <256>;
 				//continuous-clock;
 				//bitclock-inversion;
 				//frame-inversion;
-				bitclock-master = <&aml_tdmb>;
-				frame-master = <&aml_tdmb>;
+				/* master mode */
+				bitclock-master = <&tdmb>;
+				frame-master = <&tdmb>;
+				/* slave mode */
 				//bitclock-master = <&tdmbcodec>;
 				//frame-master = <&tdmbcodec>;
 				/* suffix-name, sync with android audio hal
 				 * what's the dai link used for
 				 */
 				suffix-name = "alsaPORT-i2s";
 				cpu {
-					sound-dai = <&aml_tdmb>;
+					sound-dai = <&tdmb>;
 					dai-tdm-slot-tx-mask = <1 1>;
 					dai-tdm-slot-rx-mask = <1 1>;
 					dai-tdm-slot-num = <2>;
+					/*
+					 * dai-tdm-slot-tx-mask =
+					 *  <1 1 1 1 1 1 1 1>;
+					 * dai-tdm-slot-rx-mask =
+					 *  <1 1 1 1 1 1 1 1>;
+					 * dai-tdm-slot-num = <8>;
+					 */
 					dai-tdm-slot-width = <32>;
 					system-clock-frequency = <12288000>;
 				};
 				tdmbcodec: codec {
-			   		sound-dai = <&dummy_codec &dummy_codec
-						&amlogic_codec &es8316>;
-			   	};
+					sound-dai = <&dummy_codec &dummy_codec
+					&amlogic_codec &es8316>;
+				};
+			};
+						aml-audio-card,dai-link@3 {
+				format = "i2s";
+				mclk-fs = <256>;
+				//continuous-clock;
+				//bitclock-inversion;
+				//frame-inversion;
+				/* master mode */
+				bitclock-master = <&tdmc>;
+				frame-master = <&tdmc>;
+				/* slave mode */
+				//bitclock-master = <&tdmccodec>;
+				//frame-master = <&tdmccodec>;
+				/* suffix-name, sync with android audio hal used for */
+				//suffix-name = "alsaPORT-tdm";
+				cpu {
+					sound-dai = <&tdmc>;
+					dai-tdm-slot-tx-mask = <1 1>;
+					dai-tdm-slot-rx-mask = <1 1>;
+					dai-tdm-slot-num = <2>;
+					dai-tdm-slot-width = <32>;
+					system-clock-frequency = <12288000>;
+				};
+				tdmccodec: codec {
+					sound-dai = <&dummy_codec>;
+				};
+			};
+
+			aml-audio-card,dai-link@4 {
+				mclk-fs = <128>;
+				/* suffix-name, sync with android audio hal used for */
+				suffix-name = "alsaPORT-spdif";
+				cpu {
+					sound-dai = <&spdifa>;
+					system-clock-frequency = <6144000>;
+				};
+				codec {
+					sound-dai = <&spdif_codec>;
+				};
+			};
+
+			aml-audio-card,dai-link@5 {
+				mclk-fs = <256>;
+				suffix-name = "alsaPORT-earc";
+				cpu {
+					sound-dai = <&earc>;
+					system-clock-frequency = <12288000>;
+				};
+				codec {
+					sound-dai = <&dummy_codec>;
+				};
 			};
-			aml-audio-card,dai-link@3 {
-   				format = "i2s";
-   				mclk-fs = <256>;
-   				//continuous-clock;
-   				//bitclock-inversion;
-   				//frame-inversion;
-   				bitclock-master = <&aml_tdmc>;
-   				frame-master = <&aml_tdmc>;
-   				/* suffix-name, sync with android audio hal
-				 * what's the dai link used for
-				 */
-   				//suffix-name = "alsaPORT-tdm";
-   				cpu {
-   					sound-dai = <&aml_tdmc>;
-   					dai-tdm-slot-tx-mask = <1 1>;
-   					dai-tdm-slot-rx-mask = <1 1>;
-   					dai-tdm-slot-num = <2>;
-   					dai-tdm-slot-width = <32>;
-   					system-clock-frequency = <12288000>;
-   				};
-   				codec {
-   					sound-dai = <&dummy_codec &dummy_codec>;
-   				};
-   			};
-
-   			aml-audio-card,dai-link@4 {
-   				mclk-fs = <128>;
-   				/* suffix-name, sync with android audio hal
-				 * what's the dai link used for
-				 */
-   				suffix-name = "alsaPORT-spdif";
-   				cpu {
-   					sound-dai = <&aml_spdif>;
-   					system-clock-frequency = <6144000>;
-   				};
-   				codec {
-   					sound-dai = <&spdif_codec>;
-   				};
-   			};
    		};
    	};
 
    	fragment@5 {
-   		target = <&aml_tdmb>;
+   		target = <&tdmb>;
 
    		__overlay__ {
    			status = "okay";