mirror of
https://github.com/hardkernel/kernel_common_drivers.git
synced 2026-06-25 12:03:48 +09:00
audio: fix crash when hdmi in is connected [1/1]
PD#SWPL-155284 Problem: fix crash when hdmi in is connected. root cause:extn module can't get audio bus. Solution: put extn node under the audio bus node. Verify: t5may301 Change-Id: I7f09c5b2d59814b0cf3edcaee676f29ab9d38131 Signed-off-by: jian zhou <jian.zhou@amlogic.com>
This commit is contained in:
committed by
gerrit autosubmit
parent
1f189c46f7
commit
31045df6f5
@@ -1340,14 +1340,6 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
extn:extn {
|
||||
compatible = "amlogic, t5m-snd-extn";
|
||||
#sound-dai-cells = <0>;
|
||||
interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "irq_frhdmirx";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
audio_data: audio_data {
|
||||
compatible = "amlogic, audio_data";
|
||||
mem_in_base_cmd = <0x82000020>;
|
||||
@@ -1420,10 +1412,18 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
pinctrl_audio: pinctrl {
|
||||
pinctrl_audio: pinctrl {
|
||||
compatible = "amlogic, audio-pinctrl";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
extn:extn {
|
||||
compatible = "amlogic, t5m-snd-extn";
|
||||
#sound-dai-cells = <0>;
|
||||
interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "irq_frhdmirx";
|
||||
status = "okay";
|
||||
};
|
||||
};/* end of audiobus*/
|
||||
|
||||
/* eARC */
|
||||
|
||||
@@ -1181,14 +1181,6 @@
|
||||
resets = <&reset RESET_ACODEC>;
|
||||
};
|
||||
|
||||
extn:extn {
|
||||
compatible = "amlogic, t5m-snd-extn";
|
||||
#sound-dai-cells = <0>;
|
||||
interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "irq_frhdmirx";
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
audio_data: audio_data {
|
||||
compatible = "amlogic, audio_data";
|
||||
mem_in_base_cmd = <0x82000020>;
|
||||
@@ -1258,6 +1250,14 @@
|
||||
pinctrl_audio: pinctrl {
|
||||
compatible = "amlogic, audio-pinctrl";
|
||||
};
|
||||
|
||||
extn:extn {
|
||||
compatible = "amlogic, t5m-snd-extn";
|
||||
#sound-dai-cells = <0>;
|
||||
interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "irq_frhdmirx";
|
||||
status = "okay";
|
||||
};
|
||||
};/* end of audiobus*/
|
||||
|
||||
vpu: vpu {
|
||||
|
||||
@@ -1262,6 +1262,14 @@
|
||||
pinctrl_audio: pinctrl {
|
||||
compatible = "amlogic, audio-pinctrl";
|
||||
};
|
||||
|
||||
extn:extn {
|
||||
compatible = "amlogic, t5m-snd-extn";
|
||||
#sound-dai-cells = <0>;
|
||||
interrupts = <GIC_SPI 42 IRQ_TYPE_EDGE_RISING>;
|
||||
interrupt-names = "irq_frhdmirx";
|
||||
status = "okay";
|
||||
};
|
||||
};/* end of audiobus*/
|
||||
|
||||
vpu: vpu {
|
||||
@@ -1418,7 +1426,7 @@
|
||||
#size-cells = <2>;
|
||||
ranges = <0x0 0x0 0x0 0xfe333000 0x0 0x1000>;
|
||||
earc: earc@0 {
|
||||
compatible = "amlogic, t3-snd-earc";
|
||||
compatible = "amlogic, t5m-snd-earc";
|
||||
#sound-dai-cells = <0>;
|
||||
|
||||
status = "disabled";
|
||||
|
||||
Reference in New Issue
Block a user