From patchwork Sun Oct 8 14:02:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13412732 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 BD2B6E95A8F for ; Sun, 8 Oct 2023 14:03:30 +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=S6dq9wHSwYdPTy2vitaewKviSHGcQg1gJbF3D/zuHWM=; b=Ihs4UJW0ciCppp h3q8RbNRewpw3BKenFwivbQlfElo14n4E75MV8jgDgJ83Z+sfQYNjE4qXjoBGleXl/+6wE5QlnVXt bMVUjpj5Hoy7IIucFzWff7UFAAcJLmbRprg7EtlYv3glbN2ZeHW2/R0QisXNBkzTnV8QDs3Jag/Ox LhA4h/7Mbhccg02k7y8dHX/kdUontAhi9dPzl1eceJSpD1lZ132DkN+io1rv4ramYUDz85ZJz8kgW JSEIaqLz5K5/fu+znNcZREKAfye0pQ1RHKbLlHibxJBBJJYT29oBIzb6f3y1BeLZQtCtIM7sPutXA 5P+5oG+92WOkWOa103sQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMx-008vRT-0O; Sun, 08 Oct 2023 14:02:55 +0000 Received: from mail-il1-x130.google.com ([2607:f8b0:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qpUMu-008vQh-1S for linux-arm-kernel@lists.infradead.org; Sun, 08 Oct 2023 14:02:53 +0000 Received: by mail-il1-x130.google.com with SMTP id e9e14a558f8ab-352a22e1471so15729465ab.0 for ; Sun, 08 Oct 2023 07:02:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696773770; x=1697378570; 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=i817gm/mHayZlPnquKIwRuj/bCQb7oFHdZW9Ygf1Wzw=; b=aymSgS5TGBkoQIdLZRHGCUjoNTJbsmsRDt+GgD5VCAG95yHfEoJPN9jSiLQ9LOxyIP QdXgsHfpz5ZzvSyEn2GN+NOBp+tOq1zws8hsii/UFbiT66tQKioLQt2EvbqTGgDawqnh B4lJttWAlXoY5Zf7udzIwdFKMrHm/2PVtz2BzmJV+02yvfjV32u5703RSzTx0C8vNrH7 jeAVFGgCgPOI13N7Ul3tHwEyx4jksdmklA91YddZJsA7biTizBjyoUmGlzv/Nu2GQbp1 oABINpP+FrLFXOCFS2Z3cSxtCeJuDrKYT3RgYZc5J37oxW449IIWElLglhGLtb53JmY4 Yh3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696773770; x=1697378570; 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=i817gm/mHayZlPnquKIwRuj/bCQb7oFHdZW9Ygf1Wzw=; b=XCNUX4o0rtPTlxOYziINteMwSPg2ygQFhqdrBhlhxBu4GrwPMYQbYFOstBqWY9/KIJ rOeiF4idpMGxKXki08clY4ZEQ2NitQDGFge0eyDE7aExQPW7UTb1Vu0hbfUzUSEpPRt9 IEEuUJJhk6M4f8AdFbzmXO84xaRzYpWobR8gtklik23xi4sHXUnnpe+ngTdZ1vT2yc9k VRiZ7FTXUNjGppQFYDdy78OnbTjoZYm0RaTA9CKQCiLIMFfc9eYia2DyE320U0cP5BZL yw7835P3svIsNz43TwFlUJESFALeMYvu+yMUgjs3/QUjidWrVAtoMgxxmOvIxOY42mo/ Wz8g== X-Gm-Message-State: AOJu0YxY30adWqQ0lbpcw3l9hcxVTc8jGZVwL7LSwp8KhJ7ADkQHP9Uw x882l3kfrBY8av+dEEtpOTN3It54s4U= X-Google-Smtp-Source: AGHT+IHRU/p6K757tMjeqS8Ii2krhvKfRulLKOsvixbCZCCoLxXOmhUGypkPJ7IguLsJm9buWGS/YQ== X-Received: by 2002:a05:6e02:d45:b0:345:66f5:3404 with SMTP id h5-20020a056e020d4500b0034566f53404mr13375528ilj.0.1696773770370; Sun, 08 Oct 2023 07:02:50 -0700 (PDT) Received: from aford-System-Version.lan ([2601:447:d002:5be:a2fe:632a:2360:50d3]) by smtp.gmail.com with ESMTPSA id 2-20020a921302000000b0035134f1a240sm2272901ilt.86.2023.10.08.07.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 08 Oct 2023 07:02:49 -0700 (PDT) From: Adam Ford To: linux-arm-kernel@lists.infradead.org Cc: aford@beaconembedded.com, Adam Ford , Fabio Estevam , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , NXP Linux Team , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V3 1/4] arm64: dts: imx8mm-beacon: Migrate sound card to simple-audio-card Date: Sun, 8 Oct 2023 09:02:35 -0500 Message-Id: <20231008140239.6601-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-20231008_070252_487838_293A8053 X-CRM114-Status: UNSURE ( 9.50 ) 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 --- V3: No Change 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 {