From 3083176852c63a0568931938ad0bb99ce23b57c6 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 23 Feb 2010 11:05:11 +0000
Subject: [PATCH] --- yaml --- r: 187596 b: refs/heads/master c:
 cd6eb9808ce54caeea779e785e19a9b9bea97e43 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/mach-mx3/mach-mx31ads.c | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f7058753a9cf..4496ce9caa1c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f547dc1f6e4faf05fd9946c6b7e9a828e7f901e
+refs/heads/master: cd6eb9808ce54caeea779e785e19a9b9bea97e43
diff --git a/trunk/arch/arm/mach-mx3/mach-mx31ads.c b/trunk/arch/arm/mach-mx3/mach-mx31ads.c
index 2f02df212b66..b3d1a1895c20 100644
--- a/trunk/arch/arm/mach-mx3/mach-mx31ads.c
+++ b/trunk/arch/arm/mach-mx3/mach-mx31ads.c
@@ -483,6 +483,19 @@ static void mxc_init_i2c(void)
 }
 #endif
 
+static unsigned int ssi_pins[] = {
+	MX31_PIN_SFS5__SFS5,
+	MX31_PIN_SCK5__SCK5,
+	MX31_PIN_SRXD5__SRXD5,
+	MX31_PIN_STXD5__STXD5,
+};
+
+static void mxc_init_audio(void)
+{
+	mxc_register_device(&imx_ssi_device0, NULL);
+	mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi");
+}
+
 /*!
  * This structure defines static mappings for the i.MX31ADS board.
  */
@@ -518,6 +531,7 @@ static void __init mxc_board_init(void)
 	mxc_init_extuart();
 	mxc_init_imx_uart();
 	mxc_init_i2c();
+	mxc_init_audio();
 }
 
 static void __init mx31ads_timer_init(void)