Revert "Adds support for HDMI audio" b/161293823 This reverts commit 72de9177fe380bda3bb11eea1aa08a243a55d154. Reason for revert: This CL, while adding a new feature, causes regression in audio functionality. HDMI audio should be added eventually but should be done more carefully. Change-Id: I175af0dd0a70bf1e8dba6606904489dff6067057
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-phanbell.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-phanbell.dts index 6c05551..e67ac41 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-phanbell.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-phanbell.dts
@@ -53,22 +53,6 @@ status = "okay"; }; - sound-hdmi { - compatible = "fsl,imx8mq-evk-cdnhdmi", - "fsl,imx-audio-cdnhdmi"; - model = "imx-audio-hdmi"; - audio-cpu = <&sai4>; - protocol = <1>; - hdmi-out; - constraint-rate = <44100>, - <88200>, - <176400>, - <32000>, - <48000>, - <96000>, - <192000>; - }; - busfreq { status = "disabled"; }; @@ -259,18 +243,6 @@ clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3", "pll8k", "pll11k"; }; -&sai4 { - assigned-clocks = <&clk IMX8MQ_CLK_SAI4>; - assigned-clock-parents = <&clk IMX8MQ_AUDIO_PLL1_OUT>; - assigned-clock-rates = <24576000>; - clocks = <&clk IMX8MQ_CLK_SAI4_IPG>, <&clk IMX8MQ_CLK_DUMMY>, - <&clk IMX8MQ_CLK_SAI4_ROOT>, <&clk IMX8MQ_CLK_DUMMY>, - <&clk IMX8MQ_CLK_DUMMY>, <&clk IMX8MQ_AUDIO_PLL1_OUT>, - <&clk IMX8MQ_AUDIO_PLL2_OUT>; - clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3", "pll8k", "pll11k"; - status = "okay"; -}; - &i2c2 { status = "okay";