JIG 용 DT 에 HDMI Sound 추가

larche
1 parent c33aa694d8
Showing 2 changed files with 28 additions and 0 deletions Show diff stats
kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven_jig.dtsi
release/imx6s-prime-oven_jig.dtb
@@ -12,6 +12,12 @@
  */
 #include <dt-bindings/input/input.h>
  
+#if 1
+#define ENABLE_HDMI_SOUND 1
+#else
+#define ENABLE_I2S_SOUND 1
+#endif
+
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_hog>;
@@ -284,6 +290,7 @@
 		};
 	};
  
+#ifdef ENABLE_I2S_SOUND
 	sound {
 		compatible = "fsl,imx6q-cmf-sgtl5000",
 			     "fsl,imx-audio-sgtl5000";
@@ -297,6 +304,15 @@
 		mux-int-port = <1>;
 		mux-ext-port = <3>;
 	};
+#endif
+
+#ifdef ENABLE_HDMI_SOUND
+	sound {
+		compatible = "fsl,imx6q-audio-hdmi", "fsl,imx-audio-hdmi";
+		model = "imx-audio-hdmi";
+		hdmi-controller = <&hdmi_audio>;
+	};
+#endif
  
     mxcfb1: fb@0 {
         compatible = "fsl,mxc_sdc_fb";
@@ -328,11 +344,13 @@
 };
  
  
+#ifdef ENABLE_I2S_SOUND
 &audmux {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_audmux>;
 };
+#endif
  
 &ecspi1 {
 	fsl,spi-num-chipselects = <1>;
@@ -392,12 +410,19 @@
     status = "okay";
 };
  
+#ifdef ENABLE_HDMI_SOUND
+&hdmi_audio {
+	status = "okay";
+};
+#endif
+
 &i2c1 {
 	clock-frequency = <100000>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_i2c1>;
 	status = "okay";
  
+#ifdef ENABLE_I2S_SOUND
 	sgtl5000: sgtl5000@0a {
 		compatible = "fsl,sgtl5000";
 		pinctrl-names = "default";
@@ -408,6 +433,7 @@
 		VDDD-supply  = <&reg_1p2v>;
 		VDDIO-supply = <&reg_3p3v>;
 	};
+#endif
 };
  
 &i2c2 {
@@ -480,10 +506,12 @@
 	status = "okay";
 };
  
+#ifdef ENABLE_I2S_SOUND
 &ssi1 {
 	fsl,mode = "i2s-slave";
 	status = "okay";
 };
+#endif
  
 &uart1 {
 	pinctrl-names = "default";
...	...	@@ -12,6 +12,12 @@
12	12	*/
13	13	#include <dt-bindings/input/input.h>
14	14
	15	+#if 1
	16	+#define ENABLE_HDMI_SOUND 1
	17	+#else
	18	+#define ENABLE_I2S_SOUND 1
	19	+#endif
	20	+
15	21	&iomuxc {
16	22	pinctrl-names = "default";
17	23	pinctrl-0 = <&pinctrl_hog>;
...	...	@@ -284,6 +290,7 @@
284	290	};
285	291	};
286	292
	293	+#ifdef ENABLE_I2S_SOUND
287	294	sound {
288	295	compatible = "fsl,imx6q-cmf-sgtl5000",
289	296	"fsl,imx-audio-sgtl5000";
...	...	@@ -297,6 +304,15 @@
297	304	mux-int-port = <1>;
298	305	mux-ext-port = <3>;
299	306	};
	307	+#endif
	308	+
	309	+#ifdef ENABLE_HDMI_SOUND
	310	+ sound {
	311	+ compatible = "fsl,imx6q-audio-hdmi", "fsl,imx-audio-hdmi";
	312	+ model = "imx-audio-hdmi";
	313	+ hdmi-controller = <&hdmi_audio>;
	314	+ };
	315	+#endif
300	316
301	317	mxcfb1: fb@0 {
302	318	compatible = "fsl,mxc_sdc_fb";
...	...	@@ -328,11 +344,13 @@
328	344	};
329	345
330	346
	347	+#ifdef ENABLE_I2S_SOUND
331	348	&audmux {
332	349	status = "okay";
333	350	pinctrl-names = "default";
334	351	pinctrl-0 = <&pinctrl_audmux>;
335	352	};
	353	+#endif
336	354
337	355	&ecspi1 {
338	356	fsl,spi-num-chipselects = <1>;
...	...	@@ -392,12 +410,19 @@
392	410	status = "okay";
393	411	};
394	412
	413	+#ifdef ENABLE_HDMI_SOUND
	414	+&hdmi_audio {
	415	+ status = "okay";
	416	+};
	417	+#endif
	418	+
395	419	&i2c1 {
396	420	clock-frequency = <100000>;
397	421	pinctrl-names = "default";
398	422	pinctrl-0 = <&pinctrl_i2c1>;
399	423	status = "okay";
400	424
	425	+#ifdef ENABLE_I2S_SOUND
401	426	sgtl5000: sgtl5000@0a {
402	427	compatible = "fsl,sgtl5000";
403	428	pinctrl-names = "default";
...	...	@@ -408,6 +433,7 @@
408	433	VDDD-supply = <&reg_1p2v>;
409	434	VDDIO-supply = <&reg_3p3v>;
410	435	};
	436	+#endif
411	437	};
412	438
413	439	&i2c2 {
...	...	@@ -480,10 +506,12 @@
480	506	status = "okay";
481	507	};
482	508
	509	+#ifdef ENABLE_I2S_SOUND
483	510	&ssi1 {
484	511	fsl,mode = "i2s-slave";
485	512	status = "okay";
486	513	};
	514	+#endif
487	515
488	516	&uart1 {
489	517	pinctrl-names = "default";
...	...