From 7a0aa6f1f3478ae06bc5da10b39e281cac53788e Mon Sep 17 00:00:00 2001 From: "Kevin.Kim" Date: Tue, 11 Jun 2019 17:36:54 +0900 Subject: [PATCH] ODROID-N2:Support hdmitx audio pass-through Change-Id: I8435a4294740dc0087881f365ed9c63ae01984fc --- .../boot/dts/amlogic/mesong12_odroid_common.dtsi | 5 ----- .../media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c | 11 ----------- .../media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c | 9 +++++++-- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi index 538098dc6064..6238935caa29 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi @@ -350,11 +350,6 @@ }; }; -&amhdmitx { - /*0:SPDIF, 1:I2S*/ - tx_aud_src = <1>; -}; - &audiobus { /* tdmc to internal DAC output, no pinmux */ aml_tdmc: tdmc { diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c index 54b0d3bdee00..69f839b774b2 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c @@ -4636,17 +4636,6 @@ static int amhdmitx_get_dt_info(struct platform_device *pdev) pr_info(SYS "hdmitx_device.chip_type : %d\n", hdmitx_device.chip_type); -#if defined(CONFIG_ARCH_MESON64_ODROID_COMMON) - /* Get audio source information */ - ret = of_property_read_u32(pdev->dev.of_node, "tx_aud_src", - &(hdmitx_device.tx_aud_src)); - if (ret) { - pr_info(SYS "not find tx_aud_src\n"); - hdmitx_device.tx_aud_src = 0; - } - pr_info(SYS "hdmitx_device.tx_aud_src : %d\n", - hdmitx_device.tx_aud_src); -#endif ret = of_property_read_u32(pdev->dev.of_node, "repeater_tx", &val); if (!ret) diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c index da03adf65948..61e4e8e364f0 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c @@ -2687,11 +2687,16 @@ static int hdmitx_set_audmode(struct hdmitx_dev *hdev, hdev->tx_aud_src = 1; else hdev->tx_aud_src = 0; - +#else + /* PCM : I2S, Other : SPDIF */ + if (audio_param->type == CT_PCM) + hdev->tx_aud_src = 1; + else + hdev->tx_aud_src = 0; +#endif /* if hdev->aud_output_ch is true, select I2S as 8ch in, 2ch out */ if (hdev->aud_output_ch) hdev->tx_aud_src = 1; -#endif pr_info(HW "hdmitx tx_aud_src = %d\n", hdev->tx_aud_src);