From patchwork Tue Mar 30 18:18:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 12173499 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C80A1C433C1 for ; Tue, 30 Mar 2021 18:20:08 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4459C619CF for ; Tue, 30 Mar 2021 18:20:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4459C619CF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=sZW/Ch0v4CrPNnTWxjsEpsc+aRWr03fQWzSDb77REvE=; b=DmtRg/gUq3+Wd7oamuhp6K3K5D JCCv7Pb3erin7xDKz1vY2pbSGSJzxCw2v5oWrH+evC079dfrzPrI0s1Cjb7gtU5bZKu+bQftJLLB+ 7x+MBWsPafjR/qbTU4bDwac7NnNeu9KvnSuq/yUjRI8Qku/wJ9kAQF6MC2loiD3we3ihJ0zsfM2SQ adFCoqPqoS9UsOX0RatQrpnM9stQ6WkohZ2keZY9V6yJdfSFEUCy+W3xeQ2mmc2ONONCVycN7dceP a2M9KhkpyXKp4E3bXazr836oibh/fw/Jiouap6CoctD9cQc4z/Ih7eizrMeScPCWi8EobmkI+VEV1 q2rVFNFw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRIwX-004ZPM-94; Tue, 30 Mar 2021 18:18:22 +0000 Received: from mail-ej1-x634.google.com ([2a00:1450:4864:20::634]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRIwN-004ZKj-0a for linux-arm-kernel@lists.infradead.org; Tue, 30 Mar 2021 18:18:14 +0000 Received: by mail-ej1-x634.google.com with SMTP id ap14so13089459ejc.0 for ; Tue, 30 Mar 2021 11:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K5PIpJrGl8iWrawN7W1yiCqheWQtbbQZULjO5n0brRE=; b=LYoCudITn92ac83fHOCASMr7QQNHA7r30skl3JHkqy+35UcLN/zBhW14Wti0cOFNmy pZedfolQsSlQyaY8ByM/QPUWtowe8E3TZ1BdrjSleSED0l/o/umIMhe3cu/n4hi2NbZT sIGBdAwtXa0j24BFdHk2QEjpU6N7IiCJ8lHQeSS5KdxnsAxAAxdtLHovkkUwqGjV+sl3 RvVtHwCHWEQn+rLtCNGi1IlnsdJdqdd+JKU5wvDoUPB6MboGys9LIxIQcuHeZ8L+6TJn BYvrzcvWdTA4yo6TuqdTS2INTNaRfiVdmiElg/m2ez9qRz0Sjm7afNUU+aldEDlXTOgK W6hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=K5PIpJrGl8iWrawN7W1yiCqheWQtbbQZULjO5n0brRE=; b=GfjTeyBJxGwJPshxbQNVILEc+F29+fs7xr0YHEiFQNW0cqTBdlHWO8SjpXuw7/FQkV +gK/DSMear5OdIMUOIU18tRIZExMKeqBqDK46NwDeueZqHL2KA0C1MPJOjF+gkoAUfbC eBGePCl7OYH1krViJfEJrSx/9DJMoPazxy1MExbuj5470o/Qm3AbM6WR2WMTMNRpfBgI wZTOAu+30+B2tcG+ylXOwUAtZ0pEdUgp6ShPS4gaACxt5hqjhELTDzI4K/hS6qatGZVU KAd1LY0jMpaH+1k7xQ/Erjmh3+xRS6p4WkWd42GVyFujHIl182C06WXX4bh0YRYlsdi5 bl2A== X-Gm-Message-State: AOAM531DlqKoCH0GeCye768pAA1KcR3efpOkJjYO+7aYxUvwSvaKr6qX j7EOhq4qQUrp7kRO5LjGYHo= X-Google-Smtp-Source: ABdhPJwot5MvGb6ErXAtg0NjbChCHxne+LOoXgOk+S2Jc2ubxELtbIe3creSVyyUZwHvqECY5d85Cg== X-Received: by 2002:a17:906:f203:: with SMTP id gt3mr33733140ejb.346.1617128289622; Tue, 30 Mar 2021 11:18:09 -0700 (PDT) Received: from localhost ([62.96.65.119]) by smtp.gmail.com with ESMTPSA id c19sm11840027edu.20.2021.03.30.11.18.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Mar 2021 11:18:08 -0700 (PDT) From: Thierry Reding To: Thierry Reding Cc: Jon Hunter , Sameer Pujar , linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: tegra: Consolidate audio card names Date: Tue, 30 Mar 2021 20:18:31 +0200 Message-Id: <20210330181831.1869611-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210330_191811_209498_BFD56943 X-CRM114-Status: GOOD ( 14.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Thierry Reding The current scheme for audio card names is suboptimal because it causes the automatically generated names (for ID and driver) to be truncated, which in turn can cause conflicts. Introduce a new scheme which reuses the board model for the names and appends the "HDA" and "APE" suffixes for the HDA and APE, respectively. As a side-effect these suffixes end up being used as the ID of the SoC sound cards which makes it easy for users to select them when using the ALSA command-line utilities, for example. As a separate measure, the driver name for the cards is now set by the corresponding audio driver (either tegra-hda or tegra-ape), making it a more useful identifier than the currently normalized card name. Signed-off-by: Thierry Reding --- arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ++-- arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 4 ++-- arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 2 +- arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 2 +- arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts index 683743f81849..74c1a5df3fdb 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts @@ -817,7 +817,7 @@ mmc@3400000 { }; hda@3510000 { - nvidia,model = "jetson-tx2-hda"; + nvidia,model = "NVIDIA Jetson TX2 HDA"; status = "okay"; }; @@ -1109,6 +1109,6 @@ sound { <&i2s5_port>, <&i2s6_port>, <&dmic1_port>, <&dmic2_port>, <&dmic3_port>, <&dspk1_port>, <&dspk2_port>; - label = "jetson-tx2-ape"; + label = "NVIDIA Jetson TX2 APE"; }; }; diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts index 2888efc42ba1..4399deda7462 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts @@ -554,7 +554,7 @@ mmc@3400000 { }; hda@3510000 { - nvidia,model = "jetson-xavier-hda"; + nvidia,model = "NVIDIA Jetson AGX Xavier HDA"; status = "okay"; }; @@ -830,7 +830,7 @@ sound { <&i2s1_port>, <&i2s2_port>, <&i2s4_port>, <&i2s6_port>, <&dmic3_port>; - label = "jetson-xavier-ape"; + label = "NVIDIA Jetson AGX Xavier APE"; widgets = "Microphone", "CVB-RT MIC Jack", diff --git a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi index d1d77220154f..a717d2b66131 100644 --- a/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi @@ -36,7 +36,7 @@ eeprom@57 { }; hda@3510000 { - nvidia,model = "jetson-xavier-nx-hda"; + nvidia,model = "NVIDIA Jetson Xavier NX HDA"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi index a9caaf7c0d67..d8409c1b4380 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi @@ -1345,7 +1345,7 @@ sata@70020000 { }; hda@70030000 { - nvidia,model = "jetson-tx1-hda"; + nvidia,model = "NVIDIA Jetson TX1 HDA"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts index dd7996411881..09ce555017fb 100644 --- a/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts +++ b/arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts @@ -532,7 +532,7 @@ pmc@7000e400 { }; hda@70030000 { - nvidia,model = "jetson-nano-hda"; + nvidia,model = "NVIDIA Jetson Nano HDA"; status = "okay"; }; @@ -1146,7 +1146,7 @@ sound { <&i2s3_port>, <&i2s4_port>, <&dmic1_port>, <&dmic2_port>; - label = "jetson-nano-ape"; + label = "NVIDIA Jetson Nano APE"; widgets = "Headphone", "CVB-TI HP Jack";