Enable HDMI audio.

정준호
1 parent ee8b1ed47c
Showing 1 changed file with 28 additions and 0 deletions Show diff stats
kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven.dtsi
@@ -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>;
@@ -283,6 +289,7 @@
 		};
 	};
  
+#ifdef ENABLE_I2S_SOUND
 	sound {
 		compatible = "fsl,imx6q-cmf-sgtl5000",
 			     "fsl,imx-audio-sgtl5000";
@@ -296,6 +303,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";
@@ -310,11 +326,13 @@
 };
  
  
+#ifdef ENABLE_I2S_SOUND
 &audmux {
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_audmux>;
 };
+#endif
  
 &ecspi1 {
 	fsl,spi-num-chipselects = <1>;
@@ -374,12 +392,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";
@@ -390,6 +415,7 @@
 		VDDD-supply  = <&reg_1p2v>;
 		VDDIO-supply = <&reg_3p3v>;
 	};
+#endif
 };
  
 &i2c2 {
@@ -435,10 +461,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>;
...	...	@@ -283,6 +289,7 @@
283	289	};
284	290	};
285	291
	292	+#ifdef ENABLE_I2S_SOUND
286	293	sound {
287	294	compatible = "fsl,imx6q-cmf-sgtl5000",
288	295	"fsl,imx-audio-sgtl5000";
...	...	@@ -296,6 +303,15 @@
296	303	mux-int-port = <1>;
297	304	mux-ext-port = <3>;
298	305	};
	306	+#endif
	307	+
	308	+#ifdef ENABLE_HDMI_SOUND
	309	+ sound {
	310	+ compatible = "fsl,imx6q-audio-hdmi", "fsl,imx-audio-hdmi";
	311	+ model = "imx-audio-hdmi";
	312	+ hdmi-controller = <&hdmi_audio>;
	313	+ };
	314	+#endif
299	315
300	316	mxcfb1: fb@0 {
301	317	compatible = "fsl,mxc_sdc_fb";
...	...	@@ -310,11 +326,13 @@
310	326	};
311	327
312	328
	329	+#ifdef ENABLE_I2S_SOUND
313	330	&audmux {
314	331	status = "okay";
315	332	pinctrl-names = "default";
316	333	pinctrl-0 = <&pinctrl_audmux>;
317	334	};
	335	+#endif
318	336
319	337	&ecspi1 {
320	338	fsl,spi-num-chipselects = <1>;
...	...	@@ -374,12 +392,19 @@
374	392	status = "okay";
375	393	};
376	394
	395	+#ifdef ENABLE_HDMI_SOUND
	396	+&hdmi_audio {
	397	+ status = "okay";
	398	+};
	399	+#endif
	400	+
377	401	&i2c1 {
378	402	clock-frequency = <100000>;
379	403	pinctrl-names = "default";
380	404	pinctrl-0 = <&pinctrl_i2c1>;
381	405	status = "okay";
382	406
	407	+#ifdef ENABLE_I2S_SOUND
383	408	sgtl5000: sgtl5000@0a {
384	409	compatible = "fsl,sgtl5000";
385	410	pinctrl-names = "default";
...	...	@@ -390,6 +415,7 @@
390	415	VDDD-supply = <&reg_1p2v>;
391	416	VDDIO-supply = <&reg_3p3v>;
392	417	};
	418	+#endif
393	419	};
394	420
395	421	&i2c2 {
...	...	@@ -435,10 +461,12 @@
435	461	status = "okay";
436	462	};
437	463
	464	+#ifdef ENABLE_I2S_SOUND
438	465	&ssi1 {
439	466	fsl,mode = "i2s-slave";
440	467	status = "okay";
441	468	};
	469	+#endif
442	470
443	471	&uart1 {
444	472	pinctrl-names = "default";
...	...