diff --git a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven_jig.dtsi b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven_jig.dtsi index 814da3a..e4b0fc5 100755 --- a/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven_jig.dtsi +++ b/kernel/linux-imx6_3.14.28/arch/arm/boot/dts/imx6qdl-prime-oven_jig.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>; @@ -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 = <®_1p2v>; VDDIO-supply = <®_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"; diff --git a/release/imx6s-prime-oven_jig.dtb b/release/imx6s-prime-oven_jig.dtb index 1bf0525e605dad8b95e4da11459e599b3b6d3afa..f38c74d5fb06aa6cf356a8be2af21ee2b5a782b9 100644 GIT binary patch delta 4126 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 delta 4653 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 EH@bwVzyJUM