From patchwork Wed Nov 21 05:17:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10691969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 969A413BF for ; Wed, 21 Nov 2018 05:20:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82AA22B394 for ; Wed, 21 Nov 2018 05:20:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 767572B443; Wed, 21 Nov 2018 05:20:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 32B172B394 for ; Wed, 21 Nov 2018 05:20:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=b/6R1UJheGKCbDmDzyVExJXNub6TEnr4FaHBpm232ZY=; b=sWGCfaUuhgQhrs VjFS2iuBYrniIrTmvIlZweWah6p10anrJV9y3yteyn+JJDn5gQQqCfHTdwgdygp3Bf8R+uls16uyX vo++rkzHA7WdjebVRhKizPEnRu/6frT6l3SYFDLPDryHSQmPgiXcMUqNIc2aG41UjDzQ5PJKPsw9B /kj8ViudpIxun4UCPrclZ3EeHGKNK4LafGPzOLWMsvm8k/CTEvO5nCH59fuHYWQ7e1bSs4rTmm8vj CAzHw059w+/JvaF9o+3th0yLMYWznXHNgcO77EH5nRXpEXe409CJBL/mNVtJh4XMhXfY8gJ3UPxQn rIKyKxtrBeW99wb4ej2g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKvu-0006DW-Rl; Wed, 21 Nov 2018 05:20:14 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKv5-00042R-Uy for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2018 05:19:28 +0000 Received: by mail-pl1-x642.google.com with SMTP id b22-v6so3712380pls.7 for ; Tue, 20 Nov 2018 21:19:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=U/ecxyYo0n6CY8YI1T4/ulV+E6vBNhkLtS8DxQ0JX6c=; b=Dy0jdkr8MAzUdtto46ala2E02OgirWXI0l7jUDbXMVK6EFeoxvufEu2LZ57PYEGOdQ zF/wQvNwoHsw3iSkjOb2ZM0ZKybYh+X6aNYqgXYKpQtPJpxTenJgnTsnUZfT7iOtfHoM +bLw4JliDR+xGGTgn2Gtysdyog6fzUGXzNMo2j9XKPOHlOd8cZCM0KLJKvR67ew2iUE6 +KsovaHA3m0msTIXndoIzgMjf1jT/u4J0wrOFRD6zJlE36tYIXAW62vtjQG+6aVb+rh3 DVb/hqYhgoEE9TSV8HpnO4lVlj/bDQcmIF8qGP6HySlzyDpM78a5D3D5D9ZaVPJMZLBK m/sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U/ecxyYo0n6CY8YI1T4/ulV+E6vBNhkLtS8DxQ0JX6c=; b=ZxyHbLcOa6Yn0E/fuTvCBLDlEGLiiza214wlYbjvZCgNW35pSjpPdTBSuOl7Ci8Egz ZOMbFCJRQQNTfOwRTmRfTQp8MWxuQNV4zfZVG2On9TmhBWH6PoLg3tZRsxv4H/+W3Iyi djQkveAvkA8a04YXXi3sfe6Qkl8aCGSp5Kj5UPwxyzHQQ1QcqGC2kMHET/Y6TdSKnbgX yDIlvJDrL8PFHWAxkLwdoErt+NCmxSwG9+txYI12boKbzB6FNs8jlVd2pZhrUNv+Tuhn WHUNt+iNGzRUiP/vEy6WG2V9YEhEtbq8Gj9zQqRFlI6tFn5P8aZ4DAIqGMpe9+9o//fj HEqA== X-Gm-Message-State: AA+aEWaF9wMKGjDUopVR7fWuck7BRkthgNyxIW3BHInyo/QqR/3KKOxR DGUsYEry/uI6umR5h7R8uz+mhsBMKFE= X-Google-Smtp-Source: AFSGD/XqspXnA00ZIO7oFNcCcH1UDIjx2c8aknPxXI3Fcon/UxtsfVXa8lWZAt4Cq5/X8z9ncROVkg== X-Received: by 2002:a63:8441:: with SMTP id k62mr4630698pgd.392.1542777552000; Tue, 20 Nov 2018 21:19:12 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id v70sm8293074pfa.152.2018.11.20.21.19.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:19:11 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 1/7] ASoC: dt-bindings: add regulator property to simple amplifier Date: Tue, 20 Nov 2018 21:17:46 -0800 Message-Id: <20181121051752.18387-2-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com> References: <20181121051752.18387-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_211924_014952_9C83B8B7 X-CRM114-Status: GOOD ( 11.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Amplifier may have associated regulator, so add a property for it. Signed-off-by: Vasily Khoruzhick --- Documentation/devicetree/bindings/sound/simple-amplifier.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/simple-amplifier.txt b/Documentation/devicetree/bindings/sound/simple-amplifier.txt index 8647edae7af0..7182ac4f1e65 100644 --- a/Documentation/devicetree/bindings/sound/simple-amplifier.txt +++ b/Documentation/devicetree/bindings/sound/simple-amplifier.txt @@ -4,9 +4,14 @@ Required properties: - compatible : "dioo,dio2125" or "simple-audio-amplifier" - enable-gpios : the gpio connected to the enable pin of the simple amplifier +Optional properties: +- VCC-supply : power supply for the device, as covered + in Documentation/devicetree/bindings/regulator/regulator.txt + Example: amp: analog-amplifier { compatible = "simple-audio-amplifier"; + VCC-supply = <®ulator>; enable-gpios = <&gpio GPIOH_3 0>; }; From patchwork Wed Nov 21 05:17:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10691953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1ECE913BF for ; Wed, 21 Nov 2018 05:19:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0AEEF2B394 for ; Wed, 21 Nov 2018 05:19:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F37372B443; Wed, 21 Nov 2018 05:19:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A96562B394 for ; Wed, 21 Nov 2018 05:19:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yrsNNa5ZrupXfthEeOTTKP70VgiqLX37cC3KkLIXi0A=; b=YNi71Y7CqUEWGv tHJqBsgM809r0C+nLxxhpY5qP2zUAKKUnPVwp8eTS5aVK5K7pHHuRNnyU9x/d43GtNo6jT7aiV8x5 39BzaPBm/HVXhc3A+DIfMHvKIzF/r0HKjxSSQxZzDfigeDG2p9+EPx1J/HAZjHlO10D199hXWBWE1 80VKfltvXuHgxwpXOUAgsME2dFhpmHBNSOnlXa7ZAzNr95U7BAcEPsnvk1xDXIYmac235j5JjrnFm LuZA6oQkwQV5Wo4z4m6O1BbTODNa1RXjc2t5m02Uy5oOAjloOorGPSUWhzInyia8Rm+vFbZU00e4m g1kMpX/c1qAlbLQm6Tng==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKvK-0004K4-7w; Wed, 21 Nov 2018 05:19:38 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKv5-00042T-Uw for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2018 05:19:25 +0000 Received: by mail-pl1-x642.google.com with SMTP id t13so3699802ply.13 for ; Tue, 20 Nov 2018 21:19:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=c5ACpoD2UZl/p5wzu0TvL3JZAh9jYTkIM1xjKhA9lyM=; b=t+YssYgTqO3VAAFO1+yK6FA0O9fsYvtOkwPxy7KrhcuVahB3NQ+8ekqyOp8S0e5y0y FwZP6dpDFyLmTf+UXy4b0qRwrEz09ApijHbrrkVDz+9KyUNBhB4wvasysPwIcafyAhJd fR6YlzMdXd/TkwEiLgvjxBjxcq/1yokki0XZLoMiWGO54Zes4PFQRpSKEJNV7YOFieFN e/fAjPR2yEhWZTxwkr8a4Mwa2UR+b97bQb04P/ERy/IM1tI46py1GMBspwLAEAdmkh+l 1mXfUqpp6Lve9IXDJ2rWjHFeCYgGFgoseUxDUpz+ymrgSAPkYG0PFiYxHHEoIvGglHpX OW/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c5ACpoD2UZl/p5wzu0TvL3JZAh9jYTkIM1xjKhA9lyM=; b=NcYbAFSrwk8TvzQp0Wq4kOQGCpLC2k+Lu7FghGddQni3chCC58ZCb+9clYsf3PMQPc +2+KAOoz/W4mJobqU0gDWJ0b+Eq3J9RvU3crOBwhqy8W5qviNoqxeNGRULFP/2/QpKYE aMND2kyB1lUGp+Ie3qMUFu7DrAx8iTlNVkf/xs80Ed+eg1mwUmz3A9H2j8xZPLBHXTNd 7VCdQcVNnT0gXMOYf+FrXVizOHIBSJhbc8hz7tieRkdubaUau/2NNgSLrcSpC9yXh1hU 2JuxOHf9E66VAGKvcgfrpkpi4NTC2NrXJd9eokznf7RSCbObyORMueGIut0BQ0xjQ/AE nz4g== X-Gm-Message-State: AGRZ1gIDPNKTHlFc5N5lEv0IVTyRVAhkF/2RjrCvaD0AIEtjWF4QKXV3 +vM/xivkedCUBASodqaGBE0= X-Google-Smtp-Source: AJdET5fqO17nZA/emN4EsFTGvQFOg4mbNRwepdKhLiukGMbF3p4hmBNpPIdc3tYBKyn+sNTI6YahHg== X-Received: by 2002:a62:6085:: with SMTP id u127-v6mr5539821pfb.147.1542777552938; Tue, 20 Nov 2018 21:19:12 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id v70sm8293074pfa.152.2018.11.20.21.19.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:19:12 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 2/7] ASoC: simple-amplifier: add VCC regulator widget Date: Tue, 20 Nov 2018 21:17:47 -0800 Message-Id: <20181121051752.18387-3-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com> References: <20181121051752.18387-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_211924_004713_FE5DA949 X-CRM114-Status: GOOD ( 11.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Amplifier may have assosicated regulator, so add a widget for it and appropriate route. Signed-off-by: Vasily Khoruzhick --- sound/soc/codecs/simple-amplifier.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/simple-amplifier.c b/sound/soc/codecs/simple-amplifier.c index 85524acf3e9c..c07e8a80b4b7 100644 --- a/sound/soc/codecs/simple-amplifier.c +++ b/sound/soc/codecs/simple-amplifier.c @@ -19,6 +19,7 @@ #include #include +#include #include #define DRV_NAME "simple-amplifier" @@ -58,11 +59,14 @@ static const struct snd_soc_dapm_widget simple_amp_dapm_widgets[] = { (SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD)), SND_SOC_DAPM_OUTPUT("OUTL"), SND_SOC_DAPM_OUTPUT("OUTR"), + SND_SOC_DAPM_REGULATOR_SUPPLY("VCC", 20, 0), }; static const struct snd_soc_dapm_route simple_amp_dapm_routes[] = { { "DRV", NULL, "INL" }, { "DRV", NULL, "INR" }, + { "OUTL", NULL, "VCC" }, + { "OUTR", NULL, "VCC" }, { "OUTL", NULL, "DRV" }, { "OUTR", NULL, "DRV" }, }; From patchwork Wed Nov 21 05:17:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10691971 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EF01716B1 for ; Wed, 21 Nov 2018 05:20:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC7A22B394 for ; Wed, 21 Nov 2018 05:20:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D08662B443; Wed, 21 Nov 2018 05:20:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7A5F62B394 for ; Wed, 21 Nov 2018 05:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=AmedTKgYSGkJTgYaUMXNEjxMjH/aWXGqc8fy1m5ulqo=; b=DPyXlExJTX3m5c T6FqYkMsrKM9P7vtHn+uuLWCQAPkHNw9qQXxlc7nxpUbNxnApxB3Gmx68WAxyDWRke1zzp8mZOGCI Jdji58GJHaUyWRF7kKF3nSmN87PdRYAYbIxFZMERcqNC4RsW6ywD+4iYdB5srBo8snqkpXnAwksdm CqeFV8bPgtfCdwt2KZgX6gVSpfumrSTq3n2USTwGtK79HQArBMYJLlJghT7KdFSMYGJNhjx3azPFQ Ulvt1crnu4PF0AEjJsa3djdA5NOAXLDg52SkwzbND7hZw7HpZNBYkiWsffVUwDUfqSQU5fRVEdmGr Uv0xGqwNVgGw+NOcDBag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKw4-0006Ze-VJ; Wed, 21 Nov 2018 05:20:24 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKv6-00042U-Ci for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2018 05:19:29 +0000 Received: by mail-pl1-x643.google.com with SMTP id gn14so3721843plb.10 for ; Tue, 20 Nov 2018 21:19:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Yh79UqJpw6ISsU9NtgOEkuFRJJaDLzVAgqQuvg1cXIs=; b=cC/uelyKrhhgMJzOUw5pAQvXPPevpGpJqa7ofg9ZtVqZEmpnUfpDaKqquI8fMO2frl I4H0G6kbQkZK19x4TGMTd0X9W/X/pj2b0IcRTQGBzCfcEaBEZW4HK14npclI62ffBfqY /rVS0rgCWKi7hBfXKGLfgGG8SkzPJgz5R91zE/3FVpz7o0roZ8AuA8C0oS21bvd3xgQJ 4lu/J9tBQ9hO9gPYJbHK8/QWFzXuwx7lrlQCZVnUrlLv3F0zZh99UdtBXDy7U5UiVW7R ijAT/lJRsSgF/RVfZdAaZh7ap9en9QXR8WgI+5VAagMBxt5HEKZt6yNagnzwJtFF/+6l x9Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Yh79UqJpw6ISsU9NtgOEkuFRJJaDLzVAgqQuvg1cXIs=; b=frY3Z17YkfVD5hO2qPKqhP+9HxReYFAJaF3MiiClG6yYUoI8aatOFTzXbo0b64pQRc 1aoMBbei5A3mEF3Ot+rEfEKVksJ6/b5Iwk2s4x8H8737R3pTy26D72m8STW9FSJcdCwL +WG4f03gIPPJuUehy/qdvBKxccMtNw+DdS3FYOGa0HJN+E6o9xSnPvnLNGVb6URNY4L6 OactSUdp89YatZNWbDDLeZsWFmqOQvPaGInLHKkYdjj3fuf41OexLWdTPAxSw86SE+Yl DmOZvmobB7jDNE8bq1p7Y+8NPYV/wGZhVTcVzOyYAptrp0xfW54mP5MmvryK3+O97mqZ wQMQ== X-Gm-Message-State: AA+aEWb0OcFx9wUUGllaKqXDc6UR8w9Iic+qRNFVeG2Y8ns7W2vLHNTr PxCYw0B+ebUbaxR6YOU6GdkWR9UdsQ0= X-Google-Smtp-Source: AFSGD/WtBOIzt3zUHN3uLirFzXyzR1TO4kW4arIHZwTcyQz9bciMQYDeFIncAhfdlu19lGEYoRUF5A== X-Received: by 2002:a17:902:e01:: with SMTP id 1-v6mr5119259plw.251.1542777553756; Tue, 20 Nov 2018 21:19:13 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id v70sm8293074pfa.152.2018.11.20.21.19.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:19:13 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 3/7] ASoC: dt-bindings: make enable-gpio optional for simple amplifier Date: Tue, 20 Nov 2018 21:17:48 -0800 Message-Id: <20181121051752.18387-4-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com> References: <20181121051752.18387-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_211924_424986_89321CBD X-CRM114-Status: GOOD ( 13.04 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Amplifier may have no enable GPIO, so make this property optional Signed-off-by: Vasily Khoruzhick Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/sound/simple-amplifier.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/simple-amplifier.txt b/Documentation/devicetree/bindings/sound/simple-amplifier.txt index 7182ac4f1e65..b1b097cc9b68 100644 --- a/Documentation/devicetree/bindings/sound/simple-amplifier.txt +++ b/Documentation/devicetree/bindings/sound/simple-amplifier.txt @@ -2,9 +2,9 @@ Simple Amplifier Audio Driver Required properties: - compatible : "dioo,dio2125" or "simple-audio-amplifier" -- enable-gpios : the gpio connected to the enable pin of the simple amplifier Optional properties: +- enable-gpios : the gpio connected to the enable pin of the simple amplifier - VCC-supply : power supply for the device, as covered in Documentation/devicetree/bindings/regulator/regulator.txt From patchwork Wed Nov 21 05:17:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10691961 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CA46516B1 for ; Wed, 21 Nov 2018 05:20:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B7D5E2B394 for ; Wed, 21 Nov 2018 05:20:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AB1102B462; Wed, 21 Nov 2018 05:20:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 669462B394 for ; Wed, 21 Nov 2018 05:20:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MJ6fHR23xtTFh2HeSX1Rh2BvwyrchqnWGwYyVE2256M=; b=kubrIB+JrCU0vN oYXSEIZoC2eqloJe8L9gohT6JwEWlxht7RqMx2epMXKi5eILYRpjVhQcItfyAvRN2351PZVpovdDN Vu9qUnyq78BwV56GC41nds0nuzicl6eOkcOsSBe8NwkKhstO3KfS89lpVRzw/WcKi84Ug+o/JRLi6 qVSu5OPFgvxzfBt9Mu4LehHlq/QFzOFVWyFYdtvO4DN7T016lq8AElYcfKXTHZVC26b7+41vSwUJj e0eCOirsyF9PKOWeriFDgNDaBAdNvazKwQJke6gOA2+Cc2/Qv4A2fQIUESy6YKR7PSNBWYkHAydgt LKjZLHNn2DzEVgoclMPw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKve-0004s4-ML; Wed, 21 Nov 2018 05:19:58 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKv5-00042X-V1 for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2018 05:19:27 +0000 Received: by mail-pl1-x642.google.com with SMTP id v1-v6so3727615plo.2 for ; Tue, 20 Nov 2018 21:19:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=vjj1rqCplCYcexvm2XC7f6g7VmtVJ3KGITcqN9KqvCs=; b=unr7aILKP6glgQJPk8v35MdXVzaV1VHKvOfCze4ByAaO1mseHqGbZr7GaoVhaqtbUx Tih9pSxiTiMDPgX/+3hZtQdBc5YbPnhju5TB/qF2Tf87QKH/BRPC4XIjHHBEtp3TL+N+ ilxt4nIYomopD1LBKvkmHohBsosFtazPOa/o2heGZgA5xRAmBvNT5jXppYFiJhp4Jh4r lpYhg+VmifRtSgDwfo51qtW7tFihiZHCcP1cUU8fMLAK6bnBNKwVGqjT7zn5Bb3Kg9Mx fZjXsJ9lXVziPadByk/oC7VuOysN3rSnh2POZIzVetuLfpj5CGRdKlArh736Wk/xbgdW 6XLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vjj1rqCplCYcexvm2XC7f6g7VmtVJ3KGITcqN9KqvCs=; b=XBsG40fW00NZ9dYPB3DWWEYFRE1NzzYAk4shBxmeoBoQiL1MHnzLb1rtq/GK0IuC6D 3hJP8gHvg5NAUsZBI4flUu4o7We+0iOgG/nVCH6jSMiNBW4ZRq0tdMA0qh0H27b4QtQu v/j/C+ZGHyyD+gPiQQHoulDCkOvjsv2xpwDQGT4wd6z7dW/begJ3+VtjWjKD59H5SFlF 3qjIik6oTSfW7zwuYSVaVC/xUYX2LYdvAQCTqqAgtDtuW7iUSCL21ykPfz0B+KPRplmj srrLAesxCm1/IajcEfjGQT+qhtiC2SEdEToC5LEOiJwOOeIHWPAQ7FAVXyOJVai5g0r2 fxcg== X-Gm-Message-State: AA+aEWbuS2eHSyupQ3AdW83e5TVabofXklCOPEFXOOjBsiOlGMjOhQiT Ahprieuyfwr9x4ON4KyDZP08l1vTsP0= X-Google-Smtp-Source: AFSGD/UjdROdTe0ScIUkglU6PVzh10UHfU5XdSSSTKKm8in0zx+TrFZNu6td22VlFrfBTxlMthQBXg== X-Received: by 2002:a17:902:aa4c:: with SMTP id c12mr2617092plr.48.1542777554641; Tue, 20 Nov 2018 21:19:14 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id v70sm8293074pfa.152.2018.11.20.21.19.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:19:14 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 4/7] ASoC: simple-amplifier: make enable-gpio optional Date: Tue, 20 Nov 2018 21:17:49 -0800 Message-Id: <20181121051752.18387-5-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com> References: <20181121051752.18387-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_211924_007889_56CA2D56 X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Amplifier may have no enable GPIO, so make this property optional. Signed-off-by: Vasily Khoruzhick --- sound/soc/codecs/simple-amplifier.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/simple-amplifier.c b/sound/soc/codecs/simple-amplifier.c index c07e8a80b4b7..351aa55c384e 100644 --- a/sound/soc/codecs/simple-amplifier.c +++ b/sound/soc/codecs/simple-amplifier.c @@ -89,7 +89,8 @@ static int simple_amp_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, priv); - priv->gpiod_enable = devm_gpiod_get(dev, "enable", GPIOD_OUT_LOW); + priv->gpiod_enable = devm_gpiod_get_optional(dev, "enable", + GPIOD_OUT_LOW); if (IS_ERR(priv->gpiod_enable)) { err = PTR_ERR(priv->gpiod_enable); if (err != -EPROBE_DEFER) From patchwork Wed Nov 21 05:17:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10691975 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CD28313BF for ; Wed, 21 Nov 2018 05:20:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB0742B394 for ; Wed, 21 Nov 2018 05:20:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF6CE2B443; Wed, 21 Nov 2018 05:20:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 51D852B394 for ; Wed, 21 Nov 2018 05:20:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0FryDh0CV3miVDGUFGV24S6ZudxvSbHSMu1/XT5En0I=; b=inPsLTiTU6Wb49 h0zmtXjgrlkozWU5hHJij7Rbw/h317kHBrFUMK8jQ4vKWXmNnFMHkndt95nzcqZqMK1H3jWIJxPS4 jQ7+i+LbkmoagpA5n0pgGnLJjeyqGt2X5dw/TfqpkCTe7cysJCVXuepOk+CFv1CFF0UhEFU/xOGDh /bEaAuOW+NoUxKlFKL3mPMNygsXd6EF5ejG1wCGr2TZail+q1QX4pI3b5wmvUZvILucAI8z3JjMl8 ThgLwSZ1+YhipgKOz6Lj7Xae6pHei83B0Z3srNlFLvO2KSaCAdWF1YyFxwl/AuNKaRROE5DppBXZa Whx6nT5DInhTQm3vdPqA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKwQ-00073q-Gg; Wed, 21 Nov 2018 05:20:46 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKv8-00042Y-Bb for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2018 05:19:29 +0000 Received: by mail-pl1-x644.google.com with SMTP id t13so3699942ply.13 for ; Tue, 20 Nov 2018 21:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=aIY5VgZEAQflkZd35MEa+EQWTnXYW/7QXkyXFoMBpDY=; b=NRYC0Mnyo7y5a/rsvUPYS+t/zEFUJHc8zWfL40gByLTW41GG1ycPQ7CvwvXkELJpic 2gf5G6NijlDM/3IGgmNW9nYsCIgqMbjp/HonQ3t9elwQfcHJoY+szKm/M2CEmvnWgXyV FMtuyLUBkupPELCOLBm54rG91lFNu5sV1QdsWABAO10idFZehMesUjv+6re7eEf39aYV zGyskzoenSjS4pSi3flytau+4dhyi3pUlUN+x21952jVUujzTq5xH/AeQjcHzW059+/3 jly7lGcSg678OlXdpV35zHOqvg/eg9XeeWZ7hr19RESTYP65DpooTJu3eiKGE00FDQ9z P05w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aIY5VgZEAQflkZd35MEa+EQWTnXYW/7QXkyXFoMBpDY=; b=djfYET5I38bkEkGW8r9aVbai8XTwHqXO3UVdxkLqIfk3JpD2wLg+9f//3iD8fBsEPi mon6gVfUUF1YZDwZsmfcUft8mlKJufT+yCD0J2FPyHFjjyatYWvXjP9db5sM4irf/Cq0 kc5SDZxf7mtKU8/P9X9IDzHU1v0OmXAhIC9C2hAgXwotyyJa+LjwG+Oc8WSuPqmfpf71 QPUrVaWg7eD7daAv7xutBAmzYmCfQ09HtmT1qNb7tUBKm/Hq3gHEJmqGsTKdPjdvEi+l cZr4pxS+SfYN2de4At6BNG86rTe9EwS4euWvgYC9gaeqiL8yoeEZ+R94D0oZrP/XQlcE H7dQ== X-Gm-Message-State: AA+aEWb02OKvAI44SzGfyrCqewvnALoDq5E3FahnpUNBhcf6u0WKgDMV uvNisKYUIKV6zNJTPgKK8R8= X-Google-Smtp-Source: AFSGD/UpxJW4mfj0CIb5MGbRgtxXb0RnKliT3RMv6x5OlbQbnw9EHpAgN3fWjys//b1VjRj/msnWoA== X-Received: by 2002:a17:902:7c82:: with SMTP id y2mr5216404pll.33.1542777555507; Tue, 20 Nov 2018 21:19:15 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id v70sm8293074pfa.152.2018.11.20.21.19.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:19:15 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 5/7] arm64: dts: allwinner: a64: add nodes necessary for analog sound support Date: Tue, 20 Nov 2018 21:17:50 -0800 Message-Id: <20181121051752.18387-6-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com> References: <20181121051752.18387-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_211926_806155_02926FEF X-CRM114-Status: GOOD ( 12.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add nodes for i2s, digital and analog parts of audiocodec on A64 Signed-off-by: Vasily Khoruzhick --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index f3a66f888205..44fce4b0ac49 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -155,6 +155,30 @@ method = "smc"; }; + sound: sound { + compatible = "simple-audio-card"; + simple-audio-card,name = "sun50i-a64-audio"; + simple-audio-card,format = "i2s"; + simple-audio-card,frame-master = <&cpudai>; + simple-audio-card,bitclock-master = <&cpudai>; + simple-audio-card,mclk-fs = <512>; + simple-audio-card,aux-devs = <&codec_analog>; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC"; + status = "disabled"; + + cpudai: simple-audio-card,cpu { + sound-dai = <&dai>; + }; + + link_codec: simple-audio-card,codec { + sound-dai = <&codec>; + }; + }; + sound_spdif { compatible = "simple-audio-card"; simple-audio-card,name = "On-board SPDIF"; @@ -665,6 +689,30 @@ status = "disabled"; }; + dai: dai@1c22c00 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun50i-a64-codec-i2s"; + reg = <0x01c22c00 0x200>; + interrupts = ; + clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; + clock-names = "apb", "mod"; + resets = <&ccu RST_BUS_CODEC>; + reset-names = "rst"; + dmas = <&dma 15>, <&dma 15>; + dma-names = "rx", "tx"; + status = "disabled"; + }; + + codec: codec@1c22e00 { + #sound-dai-cells = <0>; + compatible = "allwinner,sun8i-a33-codec"; + reg = <0x01c22e00 0x600>; + interrupts = ; + clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>; + clock-names = "bus", "mod"; + status = "disabled"; + }; + uart0: serial@1c28000 { compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; @@ -902,6 +950,12 @@ #reset-cells = <1>; }; + codec_analog: codec-analog@1f015c0 { + compatible = "allwinner,sun50i-a64-codec-analog"; + reg = <0x01f015c0 0x4>; + status = "disabled"; + }; + r_i2c: i2c@1f02400 { compatible = "allwinner,sun50i-a64-i2c", "allwinner,sun6i-a31-i2c"; From patchwork Wed Nov 21 05:17:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10691973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9273A16B1 for ; Wed, 21 Nov 2018 05:20:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7FB572B394 for ; Wed, 21 Nov 2018 05:20:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 73EF62B443; Wed, 21 Nov 2018 05:20:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 25E882B394 for ; Wed, 21 Nov 2018 05:20:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bqe4bcN9EoskSXI9zA4No2teG3isGxghqdLl4345kg8=; b=rbOTPEugcXNQma eIBzlHVPo8mXGmkHiZVqV3YTfb8fpZojSO5zHilmnsc0vuCLdkDdOJEhOKZrAjXc44CuTKM1iQqL3 q6VqhLeGduxCM5Yt2N36yD8DrIOrhFC2z69JI9rehR7zo4LUNojhRqEklDYYCbcmDjN+K+9S0xnSy O3R8g+xumCj5T/8fKSrU34K7Bcwx1GeVy3SixAaSvJ/jEG5ny56xRxS9H1pLsv2a+b8eGYIbKfMg6 qQ5UmewiU9xcODWROq6LGzTOTkkwAs5vBb/2Ij+JiD9Ye126m8o4g4MIJAUdtOLSobcMnJc5j+hx6 DDbNnARNyi38PG8RgmYQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKwF-0006oQ-Ey; Wed, 21 Nov 2018 05:20:35 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKv5-00042a-V0 for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2018 05:19:29 +0000 Received: by mail-pl1-x642.google.com with SMTP id v1-v6so3727705plo.2 for ; Tue, 20 Nov 2018 21:19:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=wZK3MXC0BgxFudZkKrtKDmVgPJY+2qVduScM2Wgb+TU=; b=N8KxI3St9DK2CV7RP7qd1Yagb+kk/dTr3h1K5XGkDFjRUxtSwxGpAuoD4hdQh6Lmda s+Zf9V4a+/xLEA1DOZ3OffGZsOxepnM0Y8niGr2cmvKWK892qzuJKQXTBuNZaiedn9zj 7QJxy6EB8yMGh/Xl/5hL3diBcGqfnkbm6C6ZS0QETxreCjoM/rebtIwXVN4la1xAOuxW Yel+yZ++c/uPi97V9e+7TDPrDCspZiQC1PLaRvuP2nZaaainbqkhmGNaU+zJYANr/p+y l8733nt1iQzwN0GS2I6r2SLKXnI2kfEy2ifNApJS6PMU0yEYdove+An9kkbYJVTYYx/A 0HGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wZK3MXC0BgxFudZkKrtKDmVgPJY+2qVduScM2Wgb+TU=; b=N3vBnyYYS/w/XoemS8uThRP+zF/M6Ab94Enhd1jPX5Uiz7omk8StsBoL5Ld7gn/xj2 bF3oCnlajkbCEEYIc8W4lIBmD8leU3KbTGprHGThClpYnd6WPOmbMyPjWrdtnHAcOE3y 9Ue+ZHbSNIrnU7CsXjqlo8yFjca0gGr/eEtkeE863g4bUqGy5rSSH6AwxXGEcfyAFnuB JcX+ePYguEh33RdKZaS6ib7y6SBuFbKWEBPFUCnoYhGyU7ZtGsanbOcvrXnO8uqFDR2S COaEd1EmuIYPzd6HDe11tQm0GSH2T3kt6wW0lmCF9/xPHA8cA6ph8jSHr34X/4ZtGLfr eI3A== X-Gm-Message-State: AGRZ1gInurcOT76lVayjM69KakCM+GIL7NbB3iB13jx5ekpJxtRG4f6x qgsX2C+vxI++vm3zqDSWfj8= X-Google-Smtp-Source: AJdET5c1+VGE1mBRwooaqaGBJlOH5HiqxmUCyTy2g9d3VfsO6TnFswT0QE8q5xpkNZTtN4hje+MJ0Q== X-Received: by 2002:a62:e501:: with SMTP id n1-v6mr5287942pff.71.1542777556338; Tue, 20 Nov 2018 21:19:16 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id v70sm8293074pfa.152.2018.11.20.21.19.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:19:15 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 6/7] arm64: dts: allwinner: a64: enable sound on Pine64 and SoPine Date: Tue, 20 Nov 2018 21:17:51 -0800 Message-Id: <20181121051752.18387-7-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com> References: <20181121051752.18387-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_211924_007898_CDEA2D97 X-CRM114-Status: GOOD ( 12.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This commit enables I2S, digital and analog parts of audiocodec on Pine64 and SoPine boards. Signed-off-by: Vasily Khoruzhick --- .../boot/dts/allwinner/sun50i-a64-pine64.dts | 35 +++++++++++++++++++ .../allwinner/sun50i-a64-sopine-baseboard.dts | 35 +++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index c077b6c1f458..30d0743d0d79 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts @@ -73,6 +73,24 @@ }; }; }; + + headphone_amp: headphone_amp { + compatible = "simple-audio-amplifier"; + VCC-supply = <®_eldo1>; + sound-name-prefix = "HP"; + }; +}; + +&codec { + status = "okay"; +}; + +&codec_analog { + status = "okay"; +}; + +&dai { + status = "okay"; }; &de { @@ -259,6 +277,23 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + simple-audio-card,aux-devs = <&codec_analog>, <&headphone_amp>; + simple-audio-card,widgets = "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "HP INL", "HP", + "HP INR", "HP", + "Headphone Jack", "HP OUTL", + "Headphone Jack", "HP OUTR", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "MIC2", "Microphone Jack"; + status = "okay"; +}; + /* On Euler connector */ &spdif { status = "disabled"; diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index 53fcc9098df3..81d85ad127a2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts @@ -72,6 +72,12 @@ }; }; + headphone_amp: headphone_amp { + compatible = "simple-audio-amplifier"; + VCC-supply = <®_eldo1>; + sound-name-prefix = "HP"; + }; + reg_vcc1v8: vcc1v8 { compatible = "regulator-fixed"; regulator-name = "vcc1v8"; @@ -80,6 +86,18 @@ }; }; +&codec { + status = "okay"; +}; + +&codec_analog { + status = "okay"; +}; + +&dai { + status = "okay"; +}; + &de { status = "okay"; }; @@ -164,6 +182,23 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + simple-audio-card,aux-devs = <&codec_analog>, <&headphone_amp>; + simple-audio-card,widgets = "Microphone", "Microphone Jack", + "Headphone", "Headphone Jack"; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "HP INL", "HP", + "HP INR", "HP", + "Headphone Jack", "HP OUTL", + "Headphone Jack", "HP OUTR", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "MIC2", "Microphone Jack"; + status = "okay"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>; From patchwork Wed Nov 21 05:17:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasily Khoruzhick X-Patchwork-Id: 10691957 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C1FD116B1 for ; Wed, 21 Nov 2018 05:19:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACC0F2B3F4 for ; Wed, 21 Nov 2018 05:19:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EC592B488; Wed, 21 Nov 2018 05:19:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 45F282B3F4 for ; Wed, 21 Nov 2018 05:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TuofpNUVYkGRD6WOAiCtJl0NeFIOJQMce7ZIRnsGtPE=; b=VOw1h/NlQlt42p B3Mv7qDBt8Iu26lj2Nb95kDIWbCO294l9aPlJOacUIH8vD7RRB+3XCAgmVZvAB99sXdpNF1/R9eMZ AGmtguywW8t6H9r6K6RZ1XH7tLM7fJfz6KYsZ6HaSVvpsgUwSy+tS2WbxD9Giv4Zrau3sDlrawmC1 gRUaUanPiIMYiVm3Ztwo9+XmcvTXeiVgK3H/skJcrXtRPcvoPPnH23hcMpGbK98+y4C6aLWg4V+Ln GNqEGEmHan5vWXYUuk+ga45IhcFS39aEfzYY1PSQx6DcesPJZIx4hBrrozBeaY18V2+aN0Zp1ozuU HQtbG2IL/MIkJiqdhnVg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKvT-0004Wa-1i; Wed, 21 Nov 2018 05:19:47 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gPKv5-00042c-V5 for linux-arm-kernel@lists.infradead.org; Wed, 21 Nov 2018 05:19:25 +0000 Received: by mail-pl1-x642.google.com with SMTP id b5so3725542plr.4 for ; Tue, 20 Nov 2018 21:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=s/9a71YrIq79W4mLh48YxmoIHAK1ZXTX4Cfta5LSz2A=; b=jLMZbqQT6AuRR4TAwNqbjkC2ksyIDh6mEp3IQHVzWF4eoPHxSoZcWVBXIjCR8D2wZm NdSkQMsBuTSshGQhRWnE4Dv/QH2jV+s0maqil3GaDEV1EKgj4AN1CSsXRlIrSVmcTX9p B5DyrgrsD6iMqo5vb8SBcqGU9xZt7wd5JIxfqPhAsU7k/l35dusJy+y2k42NUQPQ3Tff HH/M27V0yReQD2ET2n4Zy4voeMYoAC9HBunzzxUXo8tFpX78X3jNHzso898truukGuDP 3oJ2+SMt2BH5JSGvGir1f/ziNPrI/eoaRnFfnCQl6PxN8fuEPYRLqJ87wMsRlHCa+x0Z +tUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s/9a71YrIq79W4mLh48YxmoIHAK1ZXTX4Cfta5LSz2A=; b=EdnbHrixsWahCjPY6cVyUz3dU9Z8Hpa6DqGFvnLpq4jBAneASqH9J6Ib80fDH1LgRz GXwZusqDk2zOgWQLuJnVsmYiZIsTkBekiJnPgWZJySYM/0wPTDWPyqiiIjU2XonEYgL3 177WZNebmXZUItMxFndj8yQ+ZiHcSsenQ7O1kGPgFgSe4yvRthmriNCcGU3LeqPBI72o zcdmYW2UuGi5KXCnx/+MnnWZah2/zRtJcpu1vEur80Psg0fL9HCTrciGJ6pvTt3SzDf3 82rjcRh8+co1U26wVMq66t3RNrL6DybtKye5lLdUl7Utq692hKprYZh8jfk864yZf8HB IZQQ== X-Gm-Message-State: AA+aEWYKueMgIM7CSgTb3JsPYj3JCJzXaruodAFwRi+IARUagbJkFtkd VCbKNnWsvoy9xUZi6iY6XeU= X-Google-Smtp-Source: AFSGD/WuPXWSj8hZHVnLN+qDPFZBSJ6M/tW5ZR0ElblLGviEy8i/Oscdnhovg/6baqRNns/rITgeag== X-Received: by 2002:a63:8d44:: with SMTP id z65mr4723651pgd.57.1542777557385; Tue, 20 Nov 2018 21:19:17 -0800 (PST) Received: from anarsoul-thinkpad.lan (216-71-193-140.dyn.novuscom.net. [216.71.193.140]) by smtp.gmail.com with ESMTPSA id v70sm8293074pfa.152.2018.11.20.21.19.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 21:19:16 -0800 (PST) From: Vasily Khoruzhick To: Liam Girdwood , Mark Brown , Rob Herring , Mark Rutland , Maxime Ripard , Chen-Yu Tsai , Jaroslav Kysela , Takashi Iwai , Vasily Khoruzhick , Jerome Brunet , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v8 7/7] arm64: dts: allwinner: a64: enable sound on Pinebook Date: Tue, 20 Nov 2018 21:17:52 -0800 Message-Id: <20181121051752.18387-8-anarsoul@gmail.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181121051752.18387-1-anarsoul@gmail.com> References: <20181121051752.18387-1-anarsoul@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181120_211924_006936_65884BC8 X-CRM114-Status: GOOD ( 12.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This commit enables I2S, digital and analog parts of audiocodec on Pinebook Signed-off-by: Vasily Khoruzhick --- .../dts/allwinner/sun50i-a64-pinebook.dts | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts index 77fac84797e9..cecfa7ea90b2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts @@ -53,6 +53,12 @@ }; }; + headphone_amp: headphone_amp { + compatible = "simple-audio-amplifier"; + VCC-supply = <®_eldo1>; + sound-name-prefix = "HP"; + }; + reg_vcc3v3: vcc3v3 { compatible = "regulator-fixed"; regulator-name = "vcc3v3"; @@ -64,6 +70,26 @@ compatible = "mmc-pwrseq-simple"; reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */ }; + + speaker_amp: speaker_amp { + compatible = "simple-audio-amplifier"; + VCC-supply = <®_ldo_io0>; + enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */ + sound-name-prefix = "SPEAKER"; + }; + +}; + +&codec { + status = "okay"; +}; + +&codec_analog { + status = "okay"; +}; + +&dai { + status = "okay"; }; &ehci0 { @@ -267,6 +293,33 @@ vcc-hdmi-supply = <®_dldo1>; }; +&sound { + status = "okay"; + simple-audio-card,aux-devs = <&codec_analog>, <&headphone_amp>, + <&speaker_amp>; + simple-audio-card,widgets = "Microphone", "Internal Microphone Left", + "Microphone", "Internal Microphone Right", + "Headphone", "Headphone Jack", + "Speaker", "Internal Speaker"; + simple-audio-card,routing = + "Left DAC", "AIF1 Slot 0 Left", + "Right DAC", "AIF1 Slot 0 Right", + "SPEAKER INL", "LINEOUT", + "SPEAKER INR", "LINEOUT", + "Internal Speaker", "SPEAKER OUTL", + "Internal Speaker", "SPEAKER OUTR", + "HP INL", "HP", + "HP INR", "HP", + "Headphone Jack", "HP OUTL", + "Headphone Jack", "HP OUTR", + "AIF1 Slot 0 Left ADC", "Left ADC", + "AIF1 Slot 0 Right ADC", "Right ADC", + "Internal Microphone Left", "MBIAS", + "MIC1", "Internal Microphone Left", + "Internal Microphone Right", "HBIAS", + "MIC2", "Internal Microphone Right"; +}; + &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pb_pins>;