From patchwork Thu Aug 31 11:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 13371435 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 564B2C83F12 for ; Thu, 31 Aug 2023 11:52:25 +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=aur9y0O6EmtFGzEaCAnS6Csmcctuo2ZIFgu3HOqPWu0=; b=neHToHx2vIwcOR u078Kxdg/sews6IkCB796LZ3n4gvrnVLbswkIVogXd3WZC7Ro8lGbP3EfYWrcEKSK52MKbDFFN6aq 78Lzno9bNYe2s/1ZIeS1+ZTx/+57lUcMnuHbBm4G8HxOHyX/f4PsFWOWKLD6EhxAh9jy5XNU3ozpl xI0HT+hznSAuQE5lS2Kx9PXdwGgZLiUIwDtJahz8ArbXkU3umgX8QxBw1RSvWqP8oimnO99sUoRBr Pt5hV8k2VAgE7e+SDe5xZ6dl4c3RRnrSTgUwd+tueDLDjQJ17PA5Apy3NcJs9BUy8drkBaUjcJrKP 4NfkCvmxoWls4x/j4qEw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qbgDF-00FDv1-1l; Thu, 31 Aug 2023 11:51:49 +0000 Received: from mail-io1-xd31.google.com ([2607:f8b0:4864:20::d31]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qbgDC-00FDtP-1b for linux-arm-kernel@lists.infradead.org; Thu, 31 Aug 2023 11:51:47 +0000 Received: by mail-io1-xd31.google.com with SMTP id ca18e2360f4ac-7926a450a0aso26471239f.3 for ; Thu, 31 Aug 2023 04:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693482703; x=1694087503; 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=ihsq1G+Hub3rKossUtgp/zZy1yTWO30XUHy6RAXp+uk=; b=sLtdt5FQ/S868HbP1Xp4vEQGKZa/bMomr41hO6ds+gxk3rF/vUW1KfNr2J9Wbyhdfc tn7pGLvMSyyRrW/er4XRXaluwxKr81jHjAQZs6MOn5M7yM4yWaJ8i0VnaSoH08m23o4+ /wi/utIP/gZsewBPuso/kxPbbIWW+kL3rFF0GgGbhGbln/v5Ne85y3ouOlHP/IE6QaUc w+h+c2aOqHgm2qdAtQ2vsqjvZ1fAOaEawhU5F+hUFLfiYdDlI5AOyQdsI9z9SmfLW1bk U1AeFV1HvAvNlfjtp3wf+uNEb9sp9mdfj3TAv6p3YF8N5TeKYlxkVGiNz531uIsSuH3o 8uvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693482703; x=1694087503; 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=ihsq1G+Hub3rKossUtgp/zZy1yTWO30XUHy6RAXp+uk=; b=FS2j9cwqY+kOCQ/BCSUfZxl9iMgkXakjn5KtmqLzXrdGIFJZlRKjQsej0MCEfRcCHl DGzq4WqRez+CjHpwZUgz/reyQu9yilEnMXruB/GOP9ex7X9TMScdoSr1wYlEtQQAEGtZ 6C+rHi2y7d9bPrfstHc/8aopidYO9IamuMfiOawWshT0Xw0+eh5Up8P+nRPypl9XZ9ir Xjdviu5lQ7LDsxFXb/X6rWA+e5e+yBdCQPMBEvhLXJHG+f94GG8NE9sKoXrYIV8JAjb3 0v9Ui/g1TtmCifHvoXfVzBjUTcDKTgCeiyj6HdLmX3IQ+3V0nN2f1eVhCfDqYvz7eHdo p4gQ== X-Gm-Message-State: AOJu0YwF4vopsN8yOYS2PQXPR988EQiLEVtQSZXSj+gkg22EXi8vylZs /S4lspiaVd2Qczppv/SnTyXLcVRDccc= X-Google-Smtp-Source: AGHT+IEnv1P/QYCarKpZ1Xer0P5ZGSgekwP3ctv3JCpSTmZKWn/RaUOys/p1eV8kWbXegyupSqv0Hw== X-Received: by 2002:a6b:fe15:0:b0:787:1a8f:1d08 with SMTP id x21-20020a6bfe15000000b007871a8f1d08mr4906178ioh.15.1693482702990; Thu, 31 Aug 2023 04:51:42 -0700 (PDT) Received: from aford-B741.lan ([2601:447:d001:897f:2a0f:e1d5:3688:f2b8]) by smtp.gmail.com with ESMTPSA id o28-20020a02cc3c000000b0042b1d495aecsm353529jap.123.2023.08.31.04.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Aug 2023 04:51:42 -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 1/4] arm64: dts: imx8mm-beacon: Migrate sound card to simple-audio-card Date: Thu, 31 Aug 2023 06:51:25 -0500 Message-Id: <20230831115128.254226-1-aford173@gmail.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230831_045146_531334_EFFB60B6 X-CRM114-Status: GOOD ( 10.18 ) 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 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 {