[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20160115023809.GA3284@rob-hp-laptop>
Date: Thu, 14 Jan 2016 20:38:09 -0600
From: Rob Herring <robh@...nel.org>
To: Lothar Waßmann <LW@...O-electronics.de>
Cc: Ian Campbell <ijc+devicetree@...lion.org.uk>,
Kumar Gala <galak@...eaurora.org>,
Mark Rutland <mark.rutland@....com>,
Pawel Moll <pawel.moll@....com>,
Russell King <linux@....linux.org.uk>,
Sascha Hauer <kernel@...gutronix.de>,
Shawn Guo <shawnguo@...nel.org>, devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL
sound driver
On Tue, Jan 12, 2016 at 06:21:31PM +0100, Lothar Waßmann wrote:
> 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@...O-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.
It would have been better if this was a phandle to the audmux and lack
of the property meant no audmux. Too late for that I guess.
Acked-by: Rob Herring <robh@...nel.org>
Rob
Powered by blists - more mailing lists