shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

ODROID-N2:Support hdmitx audio pass-through

Browse Source 
Change-Id: I8435a4294740dc0087881f365ed9c63ae01984fc
This commit is contained in:
Kevin.Kim
2019-06-11 17:36:54 +09:00
committed by Chris KIM
parent 2bf686f60d
commit 7a0aa6f1f3
3 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm64/boot/dts/amlogic/mesong12_odroid_common.dtsi
View File

@@ -350,11 +350,6 @@
};
};
&amhdmitx {
/*0:SPDIF, 1:I2S*/
tx_aud_src = <1>;
};
&audiobus {
/* tdmc to internal DAC output, no pinmux */
aml_tdmc: tdmc {

11
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hdmi_tx_main.c
View File

@@ -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)

9
drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c
View File

@@ -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);