Skip to content
Snippets Groups Projects
Commit 381c41cd authored by Stefano Radaelli's avatar Stefano Radaelli
Browse files

[C43] Add HDMI-IN audio

parent 3e0f40e9
No related branches found
No related tags found
1 merge request!76[C43] Add HDMI-IN audio
......@@ -113,7 +113,7 @@
target = <&sound_amixtx>;
__overlay__ {
compatible = "fsl,imx-audio-cdnhdmi";
model = "imx-audio-hdmi-tx-secoout";
model = "imx-audio-hdmi-tx";
audio-cpu = <&sai5>;
protocol = <1>;
hdmi-out;
......@@ -131,7 +131,7 @@
target = <&sound_hdmiarc>;
__overlay__ {
compatible = "fsl,imx-audio-spdif";
model = "imx-hdmi-arc-secoin";
model = "imx-hdmi-arc";
spdif-controller = <&spdif1>;
spdif-in;
spdif-out;
......
......@@ -110,7 +110,7 @@
target = <&sound_amixtx>;
__overlay__ {
compatible = "fsl,imx-audio-cdnhdmi";
model = "imx-audio-hdmi-tx-secoout";
model = "imx-audio-hdmi-tx";
audio-cpu = <&sai5>;
protocol = <1>;
hdmi-out;
......@@ -128,7 +128,7 @@
target = <&sound_hdmiarc>;
__overlay__ {
compatible = "fsl,imx-audio-spdif";
model = "imx-hdmi-arc-secoin";
model = "imx-hdmi-arc";
spdif-controller = <&spdif1>;
spdif-in;
spdif-out;
......
......@@ -169,30 +169,29 @@
};
};
fragment@21 {
fragment@23 {
target = <&sound_hdmirx>;
__overlay__ {
compatible = "fsl,imx-audio-cdnhdmi";
model = "imx-audio-hdmi-rx";
audio-cpu = <&sai4>;
protocol = <1>;
hdmi-in;
};
};
fragment@24 {
target = <&sai4_lpcg>;
__overlay__ {
status = "okay";
};
};
fragment@22 {
fragment@25 {
target = <&sai4>;
__overlay__ {
fsl,sai-asynchronous;
status = "okay";
};
};
fragment@23 {
target = <&sound_hdmirx>;
__overlay__ {
compatible = "fsl,imx-audio-cdnhdmi";
model = "imx-audio-hdmi-rx";
audio-cpu = <&sai4>;
protocol = <1>;
hdmi-in;
};
};
};
......@@ -284,7 +284,7 @@
sound {
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,name = "seco-tlv320";
simple-audio-card,name = "seco_tlv320";
simple-audio-card,frame-master = <&cpudai>;
simple-audio-card,bitclock-master = <&cpudai>;
status = "okay";
......@@ -501,6 +501,11 @@
pinctrl-0 = <&pinctrl_codec>;
// MCLK Actually not used, but necessary for initialization
clocks = <&mclkout1_lpcg 0>;
assigned-clocks = <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>,
<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_SLV_BUS>,
<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MST_BUS>,
<&mclkout1_lpcg 0>;
assigned-clock-rates = <786432000>, <49152000>, <24576000>, <24576000>;
power-domains = <&pd IMX_SC_R_MCLK_OUT_1>;
ldoin-supply = <&reg_audio>;
iov-supply = <&reg_audio>;
......@@ -508,12 +513,6 @@
clock-names = "mclk";
mic-bias;
};
at24@51 {
compatible = "at24,24aa025";
pagesize = <256>;
reg = <0x51>;
};
};
&i2c2 {
......@@ -608,6 +607,7 @@
};
};
};
&i2c_rpbus_1 {
#address-cells = <1>;
#size-cells = <0>;
......@@ -639,6 +639,8 @@
status = "okay";
};
};
/* __________________________________________________________________________
* |__________________________________________________________________________|
*/
......@@ -1084,17 +1086,16 @@ ldb1_backlight: lvds_backlight@0 {
status = "okay";
};
&sai4 {
status = "okay";
};
&sai4_lpcg {
status = "okay";
};
&sai5 {
/*
assigned-clocks = <&acm IMX_ADMA_ACM_ESAI0_MCLK_SEL>,
<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>,
<&aud_pll_div0_lpcg 0>,
<&aud_rec0_lpcg 0>,
<&sai5_lpcg 0>;
assigned-clock-parents = <&aud_pll_div0_lpcg 0>;
assigned-clock-rates = <0>, <786432000>, <49152000>, <12288000>, <49152000>;
fsl,sai-asynchronous;*/
status = "okay";
};
......@@ -1102,23 +1103,6 @@ ldb1_backlight: lvds_backlight@0 {
status = "okay";
};
/ {
/*sound-hdmi-tx {
compatible = "fsl,imx-audio-cdnhdmi";
model = "imx-audio-hdmi-tx";
audio-cpu = <&sai5>;
protocol = <1>;
hdmi-out;
};
sound-hdmi-arc {
compatible = "fsl,imx-audio-spdif";
model = "imx-hdmi-arc";
spdif-controller = <&spdif1>;
spdif-in;
spdif-out;
};*/
};
/* __________________________________________________________________________
......@@ -1774,15 +1758,15 @@ ldb1_backlight: lvds_backlight@0 {
};
&sai1 {
#sound-dai-cells = <0>;
assigned-clocks = <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>,
<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_SLV_BUS>,
<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MST_BUS>,
<&sai1_lpcg 0>; /* FIXME: should be sai1, original code is 0 */
assigned-clock-rates = <786432000>, <49152000>, <12288000>, <49152000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai1>;
status = "okay";
#sound-dai-cells = <0>;
assigned-clocks = <&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_PLL>,
<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_SLV_BUS>,
<&clk IMX_SC_R_AUDIO_PLL_0 IMX_SC_PM_CLK_MST_BUS>,
<&sai1_lpcg 0>; /* FIXME: should be sai1, original code is 0 */
assigned-clock-rates = <786432000>, <49152000>, <24576000>, <24576000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sai1>;
status = "okay";
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment