From patchwork Tue Jan 12 17:21:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 8019581 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 98B839F1CC for ; Tue, 12 Jan 2016 17:29:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C9A532038F for ; Tue, 12 Jan 2016 17:29:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D9C7C203ED for ; Tue, 12 Jan 2016 17:29:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aJ2jb-00022S-UF; Tue, 12 Jan 2016 17:27:55 +0000 Received: from mail.karo-electronics.de ([81.173.242.67]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aJ2es-00051R-0d for linux-arm-kernel@lists.infradead.org; Tue, 12 Jan 2016 17:23:06 +0000 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= To: Ian Campbell , Kumar Gala , Mark Rutland , Pawel Moll , Rob Herring , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL sound driver Date: Tue, 12 Jan 2016 18:21:31 +0100 Message-Id: <1452619291-13625-15-git-send-email-LW@KARO-electronics.de> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452619291-13625-14-git-send-email-LW@KARO-electronics.de> References: <1452619291-13625-1-git-send-email-LW@KARO-electronics.de> <1452619291-13625-2-git-send-email-LW@KARO-electronics.de> <1452619291-13625-3-git-send-email-LW@KARO-electronics.de> <1452619291-13625-4-git-send-email-LW@KARO-electronics.de> <1452619291-13625-5-git-send-email-LW@KARO-electronics.de> <1452619291-13625-6-git-send-email-LW@KARO-electronics.de> <1452619291-13625-7-git-send-email-LW@KARO-electronics.de> <1452619291-13625-8-git-send-email-LW@KARO-electronics.de> <1452619291-13625-9-git-send-email-LW@KARO-electronics.de> <1452619291-13625-10-git-send-email-LW@KARO-electronics.de> <1452619291-13625-11-git-send-email-LW@KARO-electronics.de> <1452619291-13625-12-git-send-email-LW@KARO-electronics.de> <1452619291-13625-13-git-send-email-LW@KARO-electronics.de> <1452619291-13625-14-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160112_092302_409313_887FC140 X-CRM114-Status: GOOD ( 12.65 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00, RCVD_IN_BRBL_LASTEXT, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP i.MX6UL does not have the audio multiplexer (AUDMUX) like the other i.MX6 SoCs, but apart from that can use the same audio driver. Make audmux optional for the imx-sgtl5000 driver, so it can be used on i.MX6UL too. Furthermore i.MX6UL requires use of the SAI interface rather than SSI. Change the DTS documentation accordingly. The patch with the corresponding changes to the imx-sgtl5000 driver will be sent separately. Signed-off-by: Lothar Waßmann Acked-by: Rob Herring --- .../bindings/sound/imx-audio-sgtl5000.txt | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt index 2f89db8..fd46671 100644 --- a/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt +++ b/Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt @@ -6,7 +6,7 @@ Required properties: - model : The user-visible name of this sound complex - - ssi-controller : The phandle of the i.MX SSI controller + - ssi-controller : The phandle of the i.MX SSI (or SAI) controller - audio-codec : The phandle of the SGTL5000 audio codec @@ -39,6 +39,16 @@ Required properties: Note: The AUDMUX port numbering should start at 1, which is consistent with hardware manual. +Optional properties: + - fsl,no-audmux : boolean + Required for i.MX6UL (and maybe other SoCs) + which don't have an AUDMUX, but still + feature the same audio subsystem otherwise. + +Note: Setting this property will make mux-int-port and mux-ext-port +obsolete. + + Example: sound { @@ -54,3 +64,17 @@ sound { mux-int-port = <1>; mux-ext-port = <3>; }; + +or (e.g. for i.MX6UL): +sound { + compatible = "karo,imx6ul-tx6ul-sgtl5000", + "fsl,imx-audio-sgtl5000"; + model = "imx6ul-tx6ul-sgtl5000"; + ssi-controller = <&sai2>; + audio-codec = <&sgtl5000>; + audio-routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + fsl,no-audmux; +};