From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753460AbcAOCiP (ORCPT ); Thu, 14 Jan 2016 21:38:15 -0500 Received: from mail.kernel.org ([198.145.29.136]:45116 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751652AbcAOCiO (ORCPT ); Thu, 14 Jan 2016 21:38:14 -0500 Date: Thu, 14 Jan 2016 20:38:09 -0600 From: Rob Herring To: Lothar =?iso-8859-1?Q?Wa=DFmann?= Cc: Ian Campbell , Kumar Gala , Mark Rutland , Pawel Moll , Russell King , Sascha Hauer , Shawn Guo , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL sound driver Message-ID: <20160115023809.GA3284@rob-hp-laptop> References: <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> <1452619291-13625-15-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1452619291-13625-15-git-send-email-LW@KARO-electronics.de> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > .../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 Rob From mboxrd@z Thu Jan 1 00:00:00 1970 From: robh@kernel.org (Rob Herring) Date: Thu, 14 Jan 2016 20:38:09 -0600 Subject: [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL sound driver In-Reply-To: <1452619291-13625-15-git-send-email-LW@KARO-electronics.de> References: <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> <1452619291-13625-15-git-send-email-LW@KARO-electronics.de> Message-ID: <20160115023809.GA3284@rob-hp-laptop> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > --- > .../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 Rob