From fa72b8e248475eb69a53b3fcdf970371987ad7f7 Mon Sep 17 00:00:00 2001 From: Sameer Pujar Date: Thu, 6 Feb 2020 17:34:28 +0530 Subject: [PATCH] common: overlay: update prefix name for Fe-Pi codec Currently we are using random prefix names for widgets and mixer controls. These are not very descriptive and not consistent across platforms. For example 40-pin header has prefix "x" on TX2 and "y" on Xavier. For better readability this patch updates prefix names for above. Following guideline is proposed to have consistency in the naming: 1. Shorter prefix is preferrable, at the same time keep it meaningful. It should be noted that maximum allowed size, including prefix, for a control name is "44" characters. 2. Prefix is preferred to have an indication about the I/O it sits on and the codec it belongs to. If there are multiple instances of the codec on the same I/O, these can be differentiated by L/R or A/B/C/... or 1/2/3... suffix, whichever suits best for the board. 3. On-board codec can use combination of "CVB" and codec initials. If there are multiple instances of the codec then additionally suffix mentioned in [2] can be used. 4. Prefix for 40-pin header is used as "H40". Similarly other I/O ports can use similar syntax or specific names can be used to indicate the I/O port. One such example would be "M2.E" which is more descriptive than just "Hxx". As per above "H40-SGTL" prefix is used for Fe-Pi card. Bug 200575695 Change-Id: I667d27e2cde4416de75798e1374be1e7fb170b70 Signed-off-by: Sameer Pujar Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/platform/tegra/common/+/2290938 Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Asha Talambedu Reviewed-by: Mohan Kumar D Reviewed-by: Sharad Gupta Reviewed-by: Viswanath L Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- overlay/jetson-fe-pi-audio-z-v2.dts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/overlay/jetson-fe-pi-audio-z-v2.dts b/overlay/jetson-fe-pi-audio-z-v2.dts index cf77bb3..0450762 100644 --- a/overlay/jetson-fe-pi-audio-z-v2.dts +++ b/overlay/jetson-fe-pi-audio-z-v2.dts @@ -51,13 +51,13 @@ target = <&tegra_sound>; __overlay__ { nvidia-audio-card,widgets = - "Headphone", "x Headphone", - "Microphone", "x Mic"; + "Headphone", "H40-SGTL Headphone", + "Microphone", "H40-SGTL Mic"; nvidia-audio-card,routing = - "x Headphone", "x HP_OUT", - "x MIC_IN", "x Mic", - "x ADC", "x Mic Bias"; + "H40-SGTL Headphone", "H40-SGTL HP_OUT", + "H40-SGTL MIC_IN", "H40-SGTL Mic", + "H40-SGTL ADC", "H40-SGTL Mic Bias"; }; }; @@ -70,6 +70,7 @@ codec { sound-dai = <&sgtl5000>; + prefix = "H40-SGTL"; }; }; };