diff options
| author | Shengjiu Wang <shengjiu.wang@nxp.com> | 2018-05-22 15:43:55 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | e76e2a4298352df0cd4a1aa721c4cc6b995626e2 (patch) | |
| tree | 70a078a5d6b34fc312fd4ce41e19d4637f73f2e2 /arch/arm64 | |
| parent | bfa82fadcd51848c8ac7b927a1982e89b85a9645 (diff) | |
MLK-18368-9: ARM64: dts: enable hdmi rx audio
enable hdmi rx audio
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-hdmi.dts | 18 |
3 files changed, 20 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts index a74aa5b678ed..a16226d6c911 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk.dts @@ -88,6 +88,7 @@ model = "imx-audio-hdmi"; audio-cpu = <&sai4>; protocol = <1>; + hdmi-out; }; sound-spdif { diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi index 261e56829a99..96b5d591166f 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-device.dtsi @@ -2532,10 +2532,12 @@ <&clk IMX8QM_HDMI_RX_SINK_PCLK>, <&clk IMX8QM_HDMI_RX_SINK_SCLK>, <&clk IMX8QM_HDMI_RX_PXL_ENC_CLK>, + <&clk IMX8QM_HDMI_RX_I2S_CLK>, <&clk IMX8QM_HDMI_RX_SPDIF_CLK>, <&clk IMX8QM_IMG_PXL_LINK_HDMI_IN_CLK>; clock-names = "ref_clk", "core_clk", "pxl_clk", - "pclk", "sclk", "enc_clk", "spdif_clk", + "pclk", "sclk", "enc_clk", + "i2s_clk", "spdif_clk", "pxl_link_clk"; power-domains = <&pd_hdmi_rx_bypass>; status = "disabled"; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-hdmi.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-hdmi.dts index a502793d7da3..2764b3878c83 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-hdmi.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-mek-hdmi.dts @@ -18,12 +18,21 @@ #include "fsl-imx8qm-mek.dts" / { - sound-hdmi { + sound-hdmi-tx { compatible = "fsl,imx-audio-cdnhdmi"; - model = "imx-audio-hdmi"; + model = "imx-audio-hdmi-tx"; audio-cpu = <&sai_hdmi_tx>; constraint-rate = <48000>; protocol = <1>; + hdmi-out; + }; + + sound-hdmi-rx { + compatible = "fsl,imx-audio-cdnhdmi"; + model = "imx-audio-hdmi-rx"; + audio-cpu = <&sai_hdmi_rx>; + protocol = <1>; + hdmi-in; }; sound-amix-sai { @@ -93,6 +102,11 @@ status = "okay"; }; +&sai_hdmi_rx { + fsl,sai-asynchronous; + status = "okay"; +}; + &spdif1 { assigned-clocks =<&clk IMX8QM_AUD_PLL0_DIV>, <&clk IMX8QM_AUD_ACM_AUD_PLL_CLK0_DIV>, |