Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1307657

[PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL sound driver

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 05/14] ARM: dts: imx6ul: specify proper clocks for the PWM nodes Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
  [PATCH 09/14] ARM: dts: imx6ul: add sdma support Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
    [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL sound driver Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
      Re: [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL  sound driver Rob Herring <robh@kernel.org> - 2016-01-15 03:40 +0100
        Re: [PATCH 14/14] ARM: dts: imx6: make audmux optional for i.MX6UL  sound driver Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-15 07:40 +0100
    [PATCH 11/14] ARM: dts: imx6ul: add sai support Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
      [PATCH 13/14] ARM: dts: imx6ul: add gpmi support Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
      [PATCH 12/14] ARM: dts: imx6ul: add lcdif support Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
    [PATCH 10/14] ARM: dts: imx6ul: add flexcan support Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
  [PATCH 07/14] ARM: dts: imx6ul: add pwm[1-4] nodes Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
    [PATCH 08/14] ARM: dts: imx6ul: add kpp support Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100
      Re: [PATCH 08/14] ARM: dts: imx6ul: add kpp support Lucas Stach <l.stach@pengutronix.de> - 2016-01-13 10:50 +0100
  [PATCH 06/14] ARM: dts: imx6ul: disable PWMs by default Lothar Waßmann <LW@KARO-electronics.de> - 2016-01-12 18:30 +0100

csiph-web