From: "Lothar Waßmann" <LW@KARO-electronics.de> To: Ian Campbell <ijc+devicetree@hellion.org.uk>, Kumar Gala <galak@codeaurora.org>, Mark Rutland <mark.rutland@arm.com>, Pawel Moll <pawel.moll@arm.com>, Rob Herring <robh+dt@kernel.org>, Russell King <linux@arm.linux.org.uk>, Sascha Hauer <kernel@pengutronix.de>, Shawn Guo <shawnguo@kernel.org>, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: "Lothar Waßmann" <LW@KARO-electronics.de> Subject: [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL sound driver Date: Tue, 12 Jan 2016 18:21:31 +0100 [thread overview] Message-ID: <1452619291-13625-15-git-send-email-LW@KARO-electronics.de> (raw) In-Reply-To: <1452619291-13625-14-git-send-email-LW@KARO-electronics.de> 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 <LW@KARO-electronics.de> --- .../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; +}; -- 2.1.4
WARNING: multiple messages have this Message-ID (diff)
From: LW@KARO-electronics.de (Lothar Waßmann) To: linux-arm-kernel@lists.infradead.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 [thread overview] Message-ID: <1452619291-13625-15-git-send-email-LW@KARO-electronics.de> (raw) In-Reply-To: <1452619291-13625-14-git-send-email-LW@KARO-electronics.de> 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 <LW@KARO-electronics.de> --- .../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; +}; -- 2.1.4
next prev parent reply other threads:[~2016-01-12 17:23 UTC|newest] Thread overview: 104+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-01-12 17:21 [PATCH 0/14] ARM: dts: imx6ul: add more functionality to i.MX6UL Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 01/14] ARM: dts: imx6ul: whitespace cleanup; no functional change Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 02/14] ARM: dts: imx6ul: move tsc node to appropriate place in the DTB Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 03/14] ARM: dts: imx6ul: move dt-bindings/input/input.h include to dtsi file Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 04/14] ARM: dts: imx6ul: specify proper clocks for GPT node Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 05/14] ARM: dts: imx6ul: specify proper clocks for the PWM nodes Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 06/14] ARM: dts: imx6ul: disable PWMs by default Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 07/14] ARM: dts: imx6ul: add pwm[1-4] nodes Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 08/14] ARM: dts: imx6ul: add kpp support Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 09/14] ARM: dts: imx6ul: add sdma support Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 10/14] ARM: dts: imx6ul: add flexcan support Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 11/14] ARM: dts: imx6ul: add sai support Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 12/14] ARM: dts: imx6ul: add lcdif support Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` [PATCH 13/14] ARM: dts: imx6ul: add gpmi support Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann 2016-01-12 17:21 ` Lothar Waßmann [this message] 2016-01-12 17:21 ` [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL sound driver Lothar Waßmann 2016-01-15 2:38 ` Rob Herring 2016-01-15 2:38 ` Rob Herring 2016-01-15 6:34 ` Lothar Waßmann 2016-01-15 6:34 ` Lothar Waßmann 2016-01-15 6:34 ` Lothar Waßmann 2016-01-13 3:16 ` [PATCH 08/14] ARM: dts: imx6ul: add kpp support kbuild test robot 2016-01-13 3:16 ` kbuild test robot 2016-01-13 3:16 ` kbuild test robot 2016-01-13 9:40 ` Lucas Stach 2016-01-13 9:40 ` Lucas Stach 2016-01-20 10:08 ` ARM: dts: imx6ul: add more functionality to i.MX6UL Lothar Waßmann 2016-01-20 10:08 ` Lothar Waßmann 2016-01-20 10:08 ` [PATCHv2 01/16] ARM: dts: imx6ul: whitespace cleanup; no functional change Lothar Waßmann 2016-01-20 10:08 ` [PATCHv2 02/16] ARM: dts: imx6ul: move tsc node to appropriate place in the DTB Lothar Waßmann 2016-01-20 10:08 ` Lothar Waßmann 2016-01-20 10:08 ` [PATCHv2 03/16] ARM: dts: imx6ul: move dt-bindings/input/input.h include to dtsi file Lothar Waßmann 2016-01-20 10:08 ` Lothar Waßmann 2016-01-20 10:08 ` [PATCHv2 04/16] ARM: dts: imx6ul: specify proper clocks for GPT node Lothar Waßmann 2016-01-20 10:08 ` Lothar Waßmann 2016-01-20 10:08 ` [PATCHv2 05/16] ARM: dts: imx6ul: specify proper clocks for the PWM nodes Lothar Waßmann 2016-01-20 10:08 ` Lothar Waßmann 2016-01-20 10:08 ` [PATCHv2 06/16] ARM: dts: imx6ul: disable PWMs by default Lothar Waßmann 2016-01-20 10:08 ` Lothar Waßmann 2016-01-20 10:08 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 07/16] ARM: dts: imx6ul: add pwm[1-4] nodes Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 08/16] ARM: dts: imx6ul: add sdma support Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 09/16] ARM: dts: imx6ul: add flexcan support Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 10/16] ARM: dts: imx6ul: add sai support Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 11/16] ARM: dts: imx6ul: add lcdif support Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 12/16] ARM: dts: imx6ul: add gpmi support Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 13/16] clk: imx: whitespace cleanup; no functional change Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-02-25 22:27 ` Stephen Boyd 2016-02-25 22:27 ` Stephen Boyd 2016-01-20 10:09 ` [PATCHv2 14/16] clk: imx: add kpp clock for i.MX6UL Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-02-25 22:27 ` Stephen Boyd 2016-02-25 22:27 ` Stephen Boyd 2016-01-20 10:09 ` [PATCHv2 15/16] ARM: dts: imx6ul: add kpp support Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-01-20 10:09 ` [PATCHv2 16/16] ARM: dts: imx6ul: add support for Ka-Ro electronics TXUL modules Lothar Waßmann 2016-01-20 10:09 ` Lothar Waßmann 2016-02-28 6:43 ` Shawn Guo 2016-02-28 6:43 ` Shawn Guo 2016-02-29 11:21 ` Lothar Waßmann 2016-02-29 11:21 ` Lothar Waßmann 2016-02-29 11:21 ` Lothar Waßmann 2016-02-28 6:49 ` ARM: dts: imx6ul: add more functionality to i.MX6UL Shawn Guo 2016-02-28 6:49 ` Shawn Guo 2016-03-04 12:37 ` Lothar Waßmann 2016-03-04 12:37 ` Lothar Waßmann 2016-03-04 12:37 ` [PATCHv3 1/2] ARM: dts: imx6ul: add support for Ka-Ro electronics TXUL modules Lothar Waßmann 2016-03-04 12:37 ` Lothar Waßmann 2016-03-04 12:37 ` [PATCHv3 2/2] ARM: dts: imx6ul: add support for Ka-Ro electronics TXUL mainboard Lothar Waßmann 2016-03-04 12:37 ` Lothar Waßmann 2016-03-30 11:43 ` ARM: dts: imx6ul: add more functionality to i.MX6UL Shawn Guo 2016-03-30 11:43 ` Shawn Guo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1452619291-13625-15-git-send-email-LW@KARO-electronics.de \ --to=lw@karo-electronics.de \ --cc=devicetree@vger.kernel.org \ --cc=galak@codeaurora.org \ --cc=ijc+devicetree@hellion.org.uk \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=mark.rutland@arm.com \ --cc=pawel.moll@arm.com \ --cc=robh+dt@kernel.org \ --cc=shawnguo@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.