From patchwork Wed Oct 4 23:46:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13409666 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A8A46E936EC for ; Wed, 4 Oct 2023 23:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=hGJvVQNiJsJcMgpJKZwDD/Gb+8i/sHY25w7xvjRqEuU=; b=Q9NSID+bqxcmZV EnuD3sCEYJZfXhZwb0l+uaMmp6E3ee9ZfZYJcKTd8C3YMFoBTZ2ZhnFhrrYk82139cR/4McPQqen1 L5erKyY6/4tbuQ9DYkR+siWl+7lBXmwzFrtphvUhXTkuuNb9yaqnropnhvqDrBzoxpCyV9fVcYW8L lbzJPPaQsS7rK5ECXCvZ3Xt0hV1kKbkWXA0aMoOmMOO1LFqVb+qMTxx2ra95g9wpSe0p0jkGTmWFy 1BRLmhDX94aw4PU+KWXnPal2QfmfQMFWeskobt3mnsYeLzOcgtoUwV1Wn3NTzW6HZgsZ54+kMJWnA 5ZOlNC7OLv1T/UchIqXA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qoBai-001756-32; Wed, 04 Oct 2023 23:47:44 +0000 Received: from mail-io1-xd36.google.com ([2607:f8b0:4864:20::d36]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qoBag-001730-31 for linux-arm-kernel@lists.infradead.org; Wed, 04 Oct 2023 23:47:44 +0000 Received: by mail-io1-xd36.google.com with SMTP id ca18e2360f4ac-79f82b26abfso17700739f.1 for ; Wed, 04 Oct 2023 16:47:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696463258; x=1697068058; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Nwr+bVY4PaR39fDj4d2d/26+nvTGbbpn4jHymgluZU0=; b=WLzDvGXh4PR/rQ+7DaAQ1S6ctNkAG5W8EiPYzkWWzKi8Tj1yhKufo9s9SYFRM5a/eb BzDyrkVEg/6DaZJgR/lVS+t9XBFeaJCOXNq/K6mF0ISwz24VrDbyxLVovOYpl9Uay/78 tpDP9CPc0nwMVizycsQaZWTV9g5Ng4zRGojQJ4HSJagVqC+wbCLX9dfYhC0OSv9BNtcA 6Xy95BiMtSEOx4a5LVAGwGjx7h+CBbr6WsedeouVyyTL31sOfpxAKEHCspLyeeliVE2J CrWe8GCxy/ECkNNd0b0eJ+uVHJyGHL/BRIrqjeOxfuFf1tQKt7rQqCfkJ4/78yXMODd4 t6ag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696463258; x=1697068058; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Nwr+bVY4PaR39fDj4d2d/26+nvTGbbpn4jHymgluZU0=; b=HKhhb+B6w9Mz89u9fP53BzX0yoBlMddgnplJ9yaR3ys4ag0s+9NRmDzIBdEmPfRBKj 9DiniIAIPBAXHqvMjcamOE8yXWfpe47wgTEPzXOrJ3Rn0XWZ/c0JwLSF/6jh1nudSd+5 PCK08EBd1E6PjwFIFrGtrFXGbowGqn5Xz27oqp1T0MMDw6Qr6XoarZ4TMrq/A5Go4E6o dsJOeIoaU6vVIy4VF7uqfvOX1OkjLNwimaHNFzokCHyorEnNCo1orsvrftWajDHWcXjn 2zLWb9Cgquysghhhx94/GFsfZpPCdTnn4UmtcRF1aPAkou5Vw8osHKQF2lMaR0OG2zcd zFEQ== X-Gm-Message-State: AOJu0YzlOflaGJNa22mVCoDOxahG96YQckz9JtXkbnfYKhQuDVjzLMuw zW2ePPzJ+C3uck03MRZRW6JKySLDTN0= X-Google-Smtp-Source: AGHT+IF0Ik9/+KNOcDbAHFS6MvzMLXXLoCYAV35uTMjDE4nTkQ2tFDV4lV7fOJVgAdACrP8g/SbJgA== X-Received: by 2002:a6b:da06:0:b0:794:d7e8:d239 with SMTP id x6-20020a6bda06000000b00794d7e8d239mr3828208iob.17.1696463257800; Wed, 04 Oct 2023 16:47:37 -0700 (PDT) Received: from aford-System-Version.lan (c-75-72-166-104.hsd1.mn.comcast.net. [75.72.166.104]) by smtp.gmail.com with ESMTPSA id l13-20020a5e880d000000b0079fa3d0d790sm50062ioj.31.2023.10.04.16.47.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 16:47:37 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V2 1/4] arm64: dts: imx8mm-beacon: Migrate sound card to simple-audio-card Date: Wed, 4 Oct 2023 18:46:54 -0500 Message-Id: <20231004234657.44592-1-aford173@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231004_164743_069265_54DAA24C X-CRM114-Status: UNSURE ( 9.87 ) X-CRM114-Notice: Please train this message. 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 Instead of using a custom glue layer connecting the wm8962 CODEC to the SAI3 sound-dai, migrate the sound card to simple-audio-card. This also brings this board in line with the imx8mn-beacon and imx8mp-beacon. Signed-off-by: Adam Ford Reviewed-by: Fabio Estevam --- V2: No Change diff --git a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi index b10e2a703a44..313e93663d6f 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm-beacon-baseboard.dtsi @@ -98,18 +98,30 @@ reg_usdhc2_vmmc: regulator-usdhc2 { enable-active-high; }; - sound { - compatible = "fsl,imx-audio-wm8962"; - model = "wm8962-audio"; - audio-cpu = <&sai3>; - audio-codec = <&wm8962>; - audio-routing = - "Headphone Jack", "HPOUTL", - "Headphone Jack", "HPOUTR", - "Ext Spk", "SPKOUTL", - "Ext Spk", "SPKOUTR", - "AMIC", "MICBIAS", - "IN3R", "AMIC"; + sound-wm8962 { + compatible = "simple-audio-card"; + simple-audio-card,name = "wm8962"; + simple-audio-card,format = "i2s"; + simple-audio-card,widgets = "Headphone", "Headphones", + "Microphone", "Headset Mic", + "Speaker", "Speaker"; + simple-audio-card,routing = "Headphones", "HPOUTL", + "Headphones", "HPOUTR", + "Speaker", "SPKOUTL", + "Speaker", "SPKOUTR", + "Headset Mic", "MICBIAS", + "IN3R", "Headset Mic"; + + simple-audio-card,cpu { + sound-dai = <&sai3>; + }; + + simple-audio-card,codec { + sound-dai = <&wm8962>; + clocks = <&clk IMX8MM_CLK_SAI3_ROOT>; + frame-master; + bitclock-master; + }; }; }; @@ -192,6 +204,7 @@ wm8962: audio-codec@1a { 0x0000 /* 4:FN_DMICCDAT */ 0x0000 /* 5:Default */ >; + #sound-dai-cells = <0>; }; pca6416_0: gpio@20 {