From patchwork Wed Jan 13 06:06:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Holland X-Patchwork-Id: 12015829 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 A3F28C433DB for ; Wed, 13 Jan 2021 06:09:13 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 403E923120 for ; Wed, 13 Jan 2021 06:09:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 403E923120 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=sholland.org 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UOYuAtg+9iLmjLgMpNH9BUsmVbZn0J414ViOINfoBWc=; b=0RPZqeRZbouUYzFAqs8oVLgeC VXHlDqnuJoYA2lN/i7ERbpQtckxIY1rsux8LXWsTTW+UCWjRsro5gAz8E1v/OzNpdIaf0ay9zZHmU It7HN1MZeTP7/ewalYdXdQXziDsYy7/RofbyDlzHzsnU/4j9y+LO0dJPUGCVvjCNGsICAbsJOp0qr vv/DAk2bUiU13wCq09y3NQqBzRAYA1Oq8O9C1Rfo/1CFJkXEv3DBt59dThgC3IDqfJ8xTc4ZRBArp JglUBONuULefJmrPzxqDoyspsJxtKios0QjhQ5qV973LIowp7vQgIjju1sc9tSrN/dud+1fvqLqlq gRjrcplIw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZJ0-00016a-VC; Wed, 13 Jan 2021 06:06:55 +0000 Received: from wnew2-smtp.messagingengine.com ([64.147.123.27]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kzZIX-0000xR-FQ for linux-arm-kernel@lists.infradead.org; Wed, 13 Jan 2021 06:06:29 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailnew.west.internal (Postfix) with ESMTP id 1318E1B99; Wed, 13 Jan 2021 01:06:20 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 13 Jan 2021 01:06:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sholland.org; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm1; bh=9cip7s1aFbMII yrk+2/l9sW3AVhWwueouG9RqkcinmI=; b=KeGNzJda1CU72Iy7QVydjqLvHebj9 WFBl1fjCeI7lykworSTVFxE9n48qpKxQrX/3xjiP2s3c68lnvatFekmdpOHOB7Eb 8NM7m3JhUItS4Ixv4mM4cL1UyHs4/AAp1gwhCm6S+bU3+xjr1ueALVvBF4JgTcWL yCJiY1Wf4HRo05wHWaFHO8AsrTC5W3FQYzcddl462EnbdSw00l6GHTwOH8J/sX9f k69ML16V1YqgYcp8Hx5kqKwEPiKWvzuHp10fofooqLXWjXMxG6jNyUYAfR5h8jKa gKRwcWc1k4hbFdgO/r4xM/FJXMjsFOoao4xQZ6+KHWEfbkZyuT6RgaYZA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=9cip7s1aFbMIIyrk+2/l9sW3AVhWwueouG9RqkcinmI=; b=I+ll3Ibh RCxEFTUvQfGHqzRzp1HJEck4tXwh3VUAOyRtPxhkQUNchXdufYxHLFMtR3kHIey+ 4wCzNrFW5UFr/ThHjbKlbA8up8qNWwbH6ZnfKCcgybz4kaeFG6PCfzmCrwhuUCgD OggQxUCVXozjjJq3hqrgBZw/nFiFMadWxMrp6eOgc37HFwWJ3WBbIpq5iQsr3RkG UtLn82W9UE6k7gExrSgtFLnSu0R0lBIm0rG2cJIH/8xmNXi4LRp22l9g4BKUVMA/ RDjuoZ2KXT5Es2Wi6H8/cwVRmyI5L6C+C+N9vQ4C6ysR0NqeVncLflRkqvQIeoHc 243mCw2CRdRcDg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedukedrtddugdelfecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepufgrmhhuvghl ucfjohhllhgrnhguuceoshgrmhhuvghlsehshhholhhlrghnugdrohhrgheqnecuggftrf grthhtvghrnhepudfhjeefvdfhgfefheetgffhieeigfefhefgvddvveefgeejheejvdfg jeehueeinecukfhppeejtddrudefhedrudegkedrudehudenucevlhhushhtvghrufhiii gvpedvnecurfgrrhgrmhepmhgrihhlfhhrohhmpehsrghmuhgvlhesshhhohhllhgrnhgu rdhorhhg X-ME-Proxy: Received: from titanium.stl.sholland.net (70-135-148-151.lightspeed.stlsmo.sbcglobal.net [70.135.148.151]) by mail.messagingengine.com (Postfix) with ESMTPA id 2DAA7240065; Wed, 13 Jan 2021 01:06:19 -0500 (EST) From: Samuel Holland To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec , Liam Girdwood , Mark Brown , Rob Herring Subject: [PATCH v2 6/7] arm64: dts: allwinner: pinephone: Add support for Bluetooth audio Date: Wed, 13 Jan 2021 00:06:14 -0600 Message-Id: <20210113060615.53088-7-samuel@sholland.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210113060615.53088-1-samuel@sholland.org> References: <20210113060615.53088-1-samuel@sholland.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210113_010625_649938_5675980A X-CRM114-Status: GOOD ( 12.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Samuel Holland Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The PinePhone has a Bluetooth chip with its PCM interface connected to AIF3. Add the DAI link so headeset audio can be routed in hardware. Even though the link is 16 bit PCM, configuring the link a 32-bit slot is required for compatibility with AIF2, which also uses a 32-bit slot, and which shares clock dividers with AIF3. Using equal clock frequencies allows the modem and headset to be used at the same time. Signed-off-by: Samuel Holland --- .../dts/allwinner/sun50i-a64-pinephone.dtsi | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi index 2dfe9bae8c67..e0db2f1373bc 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi @@ -24,6 +24,11 @@ backlight: backlight { /* Backlight configuration differs per PinePhone revision. */ }; + bt_sco_codec: bt-sco-codec { + #sound-dai-cells = <1>; + compatible = "linux,bt-sco"; + }; + chosen { stdout-path = "serial0:115200n8"; }; @@ -82,6 +87,8 @@ vibrator { }; &codec { + pinctrl-names = "default"; + pinctrl-0 = <&aif3_pins>; status = "okay"; }; @@ -439,6 +446,23 @@ &sound { "MIC1", "Internal Microphone", "Headset Microphone", "HBIAS", "MIC2", "Headset Microphone"; + + simple-audio-card,dai-link@2 { + format = "dsp_a"; + frame-master = <&link2_codec>; + bitclock-master = <&link2_codec>; + bitclock-inversion; + + link2_cpu: cpu { + sound-dai = <&bt_sco_codec 0>; + }; + + link2_codec: codec { + sound-dai = <&codec 2>; + dai-tdm-slot-num = <1>; + dai-tdm-slot-width = <32>; + }; + }; }; &uart0 {