ASoC: Merge branch 'for-2.6.39' into for-2.6.40

[firefly-linux-kernel-4.4.55.git] / sound / soc / jz4740 / qi_lb60.c

diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 49723e3e7e386ace2de3d0d3427276e1d7e5e8fd..c5fc339f68f1b792bf42932c8390590d5c4a058e 100644 (file)
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -27,11 +27,7 @@
 static int qi_lb60_spk_event(struct snd_soc_dapm_widget *widget,
                             struct snd_kcontrol *ctrl, int event)
 {
-       int on = 0;
-       if (event & SND_SOC_DAPM_POST_PMU)
-               on = 1;
-       else if (event & SND_SOC_DAPM_PRE_PMD)
-               on = 0;
+       int on = !SND_SOC_DAPM_EVENT_OFF(event);
 
        gpio_set_value(QI_LB60_SND_GPIO, on);
        gpio_set_value(QI_LB60_AMP_GPIO, on);
@@ -70,12 +66,6 @@ static int qi_lb60_codec_init(struct snd_soc_pcm_runtime *rtd)
                return ret;
        }
 
-       snd_soc_dapm_new_controls(dapm, qi_lb60_widgets,
-                                 ARRAY_SIZE(qi_lb60_widgets));
-       snd_soc_dapm_add_routes(dapm, qi_lb60_routes,
-                               ARRAY_SIZE(qi_lb60_routes));
-       snd_soc_dapm_sync(dapm);
-
        return 0;
 }
 
@@ -93,10 +83,20 @@ static struct snd_soc_card qi_lb60 = {
        .name = "QI LB60",
        .dai_link = &qi_lb60_dai,
        .num_links = 1,
+
+       .dapm_widgets = qi_lb60_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(qi_lb60_widgets),
+       .dapm_routes = qi_lb60_routes,
+       .num_dapm_routes = ARRAY_SIZE(qi_lb60_routes),
 };
 
 static struct platform_device *qi_lb60_snd_device;
 
+static const struct gpio qi_lb60_gpios[] = {
+       { QI_LB60_SND_GPIO, GPIOF_OUT_INIT_LOW, "SND" },
+       { QI_LB60_AMP_GPIO, GPIOF_OUT_INIT_LOW, "AMP" },
+};
+
 static int __init qi_lb60_init(void)
 {
        int ret;
@@ -106,23 +106,12 @@ static int __init qi_lb60_init(void)
        if (!qi_lb60_snd_device)
                return -ENOMEM;
 
-       ret = gpio_request(QI_LB60_SND_GPIO, "SND");
+       ret = gpio_request_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
        if (ret) {
-               pr_err("qi_lb60 snd: Failed to request SND GPIO(%d): %d\n",
-                               QI_LB60_SND_GPIO, ret);
+               pr_err("qi_lb60 snd: Failed to request gpios: %d\n", ret);
                goto err_device_put;
        }
 
-       ret = gpio_request(QI_LB60_AMP_GPIO, "AMP");
-       if (ret) {
-               pr_err("qi_lb60 snd: Failed to request AMP GPIO(%d): %d\n",
-                               QI_LB60_AMP_GPIO, ret);
-               goto err_gpio_free_snd;
-       }
-
-       gpio_direction_output(QI_LB60_SND_GPIO, 0);
-       gpio_direction_output(QI_LB60_AMP_GPIO, 0);
-
        platform_set_drvdata(qi_lb60_snd_device, &qi_lb60);
 
        ret = platform_device_add(qi_lb60_snd_device);
@@ -135,10 +124,8 @@ static int __init qi_lb60_init(void)
 
 err_unset_pdata:
        platform_set_drvdata(qi_lb60_snd_device, NULL);
-/*err_gpio_free_amp:*/
-       gpio_free(QI_LB60_AMP_GPIO);
-err_gpio_free_snd:
-       gpio_free(QI_LB60_SND_GPIO);
+/*err_gpio_free_array:*/
+       gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
 err_device_put:
        platform_device_put(qi_lb60_snd_device);
 
@@ -148,9 +135,8 @@ module_init(qi_lb60_init);
 
 static void __exit qi_lb60_exit(void)
 {
-       gpio_free(QI_LB60_AMP_GPIO);
-       gpio_free(QI_LB60_SND_GPIO);
        platform_device_unregister(qi_lb60_snd_device);
+       gpio_free_array(qi_lb60_gpios, ARRAY_SIZE(qi_lb60_gpios));
 }
 module_exit(qi_lb60_exit);