ASoC: mx27vis: retrieve gpio numbers from platform_data

Rather than including mach/iomux-mx27.h to define gpio numbers and set
up the pins, the patch moves all these into machine code and has the
gpio numbers passed to driver via platform_data.  As the result, we
can remove the mach/iomux-mx27.h inclusion from driver.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Javier Martin <javier.martin@vista-silicon.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 41 insertions, 1 deletions

diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index f264ddddd47c..562722959666 100644
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -33,6 +33,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/leds.h>
 #include <linux/memblock.h>
+#include <linux/platform_data/asoc-mx27vis.h>
 #include <media/soc_camera.h>
 #include <sound/tlv320aic32x4.h>
 #include <asm/mach-types.h>
@@ -58,6 +59,11 @@
 #define EXPBOARD_BIT1           (GPIO_PORTD + 27)
 #define EXPBOARD_BIT0           (GPIO_PORTD + 28)
 
+#define AMP_GAIN_0              (GPIO_PORTF + 9)
+#define AMP_GAIN_1              (GPIO_PORTF + 8)
+#define AMP_MUTE_SDL            (GPIO_PORTE + 5)
+#define AMP_MUTE_SDR            (GPIO_PORTF + 7)
+
 static const int visstrim_m10_pins[] __initconst = {
         /* UART1 (console) */
         PE12_PF_UART1_TXD,
@@ -139,6 +145,11 @@ static const int visstrim_m10_pins[] __initconst = {
         EXPBOARD_BIT2 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
         EXPBOARD_BIT1 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
         EXPBOARD_BIT0 | GPIO_GPIO | GPIO_IN | GPIO_PUEN,
+        /* Audio AMP control */
+        AMP_GAIN_0 | GPIO_GPIO | GPIO_OUT,
+        AMP_GAIN_1 | GPIO_GPIO | GPIO_OUT,
+        AMP_MUTE_SDL | GPIO_GPIO | GPIO_OUT,
+        AMP_MUTE_SDR | GPIO_GPIO | GPIO_OUT,
 };
 
 static struct gpio visstrim_m10_version_gpios[] = {
@@ -166,6 +177,26 @@ static const struct gpio visstrim_m10_gpios[] __initconst = {
                 .flags = GPIOF_DIR_OUT | GPIOF_INIT_LOW,
                 .label = "usbotg_cs",
         },
+        {
+                .gpio = AMP_GAIN_0,
+                .flags = GPIOF_DIR_OUT,
+                .label = "amp-gain-0",
+        },
+        {
+                .gpio = AMP_GAIN_1,
+                .flags = GPIOF_DIR_OUT,
+                .label = "amp-gain-1",
+        },
+        {
+                .gpio = AMP_MUTE_SDL,
+                .flags = GPIOF_DIR_OUT,
+                .label = "amp-mute-sdl",
+        },
+        {
+                .gpio = AMP_MUTE_SDR,
+                .flags = GPIOF_DIR_OUT,
+                .label = "amp-mute-sdr",
+        },
 };
 
 /* Camera */
@@ -405,6 +436,14 @@ static const struct imx_ssi_platform_data visstrim_m10_ssi_pdata __initconst = {
         .flags                  = IMX_SSI_DMA | IMX_SSI_SYN,
 };
 
+/* Audio */
+static const struct snd_mx27vis_platform_data snd_mx27vis_pdata __initconst = {
+        .amp_gain0_gpio = AMP_GAIN_0,
+        .amp_gain1_gpio = AMP_GAIN_1,
+        .amp_mutel_gpio = AMP_MUTE_SDL,
+        .amp_muter_gpio = AMP_MUTE_SDR,
+};
+
 static void __init visstrim_m10_revision(void)
 {
         int exp_version = 0;
@@ -463,7 +502,8 @@ static void __init visstrim_m10_board_init(void)
         imx27_add_fec(NULL);
         imx_add_gpio_keys(&visstrim_gpio_keys_platform_data);
         platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
-        imx_add_platform_device("mx27vis", 0, NULL, 0, NULL, 0);
+        imx_add_platform_device("mx27vis", 0, NULL, 0, &snd_mx27vis_pdata,
+                                sizeof(snd_mx27vis_pdata));
         platform_device_register_resndata(NULL, "soc-camera-pdrv", 0, NULL, 0,
                                       &iclink_tvp5150, sizeof(iclink_tvp5150));
         gpio_led_register_device(0, &visstrim_m10_led_data);