| author | Yixun Lan <yixun.lan@amlogic.com> | 2018-08-02 09:39:57 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@git.myamlogic.com> | 2018-08-02 09:39:57 (GMT) |
| commit | 4c8082194e4757731361b739c6abe8e94945c423 (patch) | |
| tree | 4a0798eabeb92d374064da80c0a5eb32ef1109f9 | |
| parent | d054233a8da95766768c822bebb1eb13ca5fbad0 (diff) | |
| parent | dca47302a1f7b846e0717245af7696e39cf46b76 (diff) | |
| download | common-4c8082194e4757731361b739c6abe8e94945c423.zip common-4c8082194e4757731361b739c6abe8e94945c423.tar.gz common-4c8082194e4757731361b739c6abe8e94945c423.tar.bz2 | |
Merge "audio: fail to play DD and DTS files" into amlogic-4.9-dev
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/mesontxl.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/txl_t950_p341.dts | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/txl_t960_p346.dts | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/txl_t962_p320.dts | 4 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/txl_t962_p321.dts | 4 |
5 files changed, 22 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi index 0e0060c..8fa6bc2 100644 --- a/arch/arm64/boot/dts/amlogic/mesontxl.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesontxl.dtsi @@ -973,6 +973,12 @@ /*1920*1080*4*3 = 0x17BB000*/ }; + audio_data: audio_data { + compatible = "amlogic, audio_data"; + query_licence_cmd = <0x82000050>; + status = "disabled"; + }; + efuse: efuse { compatible = "amlogic, efuse"; read_cmd = <0x82000030>; diff --git a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts index 5acfa29..297b3db 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t950_p341.dts @@ -1021,6 +1021,10 @@ controller-type = <1>; }; +&audio_data{ + status = "okay"; +}; + &pwm_ab { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts index 11a9e06..28de8e1 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t960_p346.dts @@ -1028,6 +1028,10 @@ controller-type = <1>; }; +&audio_data{ + status = "okay"; +}; + &pwm_ab { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts index 61853f4..bbd2c2e 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p320.dts @@ -1038,6 +1038,10 @@ controller-type = <1>; }; +&audio_data{ + status = "okay"; +}; + &pwm_ab { status = "okay"; }; diff --git a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts index 268ccca..db05010 100644 --- a/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts +++ b/arch/arm64/boot/dts/amlogic/txl_t962_p321.dts @@ -1042,6 +1042,10 @@ controller-type = <1>; }; +&audio_data{ + status = "okay"; +}; + &pwm_ab { status = "okay"; }; |