From b152dd458f1cb383a3c2fb581135e5eb17b1d2e8 Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Fri, 20 Sep 2019 14:00:32 +0530 Subject: [PATCH] tegra: common: move to DT based DAI links Current 'sound' node does not describe all the DAI links that Tegra sound card uses. Most of the links are statically declared in the driver code and only few codec links are exposed from the DT. As the plan is to move towards DT based binding for all DAI links, the sound node is removed from 'tegra-platforms-audio-dai-links.dtsi'. This file currently enables audio nodes of APE/AHUB and populates plugin related info for ADSP. Going ahead this file either needs to be removed or renamed for better clarity with naming of files. Though it is present in common path, it is used on Tegra194 platforms only. As part of the new approach following dtsi files are proposed. * tegra210-audio-dai-links.dtsi : This includes all the DAI links needed for Tegra210 based platforms. * tegra186-audio-dai-links.dtsi : This includes all the DAI links needed for Tegra186 based platforms. Since AHUB architecture of Tegra194 is similar to Tegra186, platforms based on Tegra194 can use the same dtsi file. This patch also updates audio routing property name to be similar in style with upstream DT binding for simple card. Bug 200538260 Change-Id: If80b1de9baea572882c6ffb37d9a643d224c7088 Signed-off-by: Sameer Pujar Reviewed-on: https://git-master.nvidia.com/r/2209424 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Jonathan Hunter GVS: Gerrit_Virtual_Submit Reviewed-by: Viswanath L Reviewed-by: Ravindra Lokhande Reviewed-by: mobile promotions Tested-by: mobile promotions --- overlay/jetson-fe-pi-audio-z-v2.dts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/overlay/jetson-fe-pi-audio-z-v2.dts b/overlay/jetson-fe-pi-audio-z-v2.dts index b0057b8..6f91517 100644 --- a/overlay/jetson-fe-pi-audio-z-v2.dts +++ b/overlay/jetson-fe-pi-audio-z-v2.dts @@ -41,6 +41,7 @@ micbias-voltage-m-volts = <3000>; VDDA-supply = <&hdr40_vdd_3v3>; VDDIO-supply = <&hdr40_vdd_3v3>; + #sound-dai-cells = <0>; status = "okay"; }; }; @@ -49,7 +50,7 @@ fragment@2 { target = <&tegra_sound>; __overlay__ { - nvidia,audio-routing = + nvidia-audio-card,routing = "x Headphone", "x HP_OUT", "x MIC_IN", "x Mic", "x ADC", "x Mic Bias"; @@ -60,10 +61,12 @@ target = <&hdr40_snd_link_i2s>; __overlay__ { link-name = "fe-pi-audio-z-v2"; - codec-dai = <&sgtl5000>; - codec-dai-name = "sgtl5000"; bitclock-master; frame-master; + + codec { + sound-dai = <&sgtl5000>; + }; }; };