ARM: pxa: magician: use platform driver for audio

The magician audio driver creates a codec device and gets
data from a board specific header file, both of which is
a bit suspicious. Move these into the board file itself,
using a gpio lookup table.

Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: alsa-devel@alsa-project.org
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index d105deb..598c977 100644 (file)
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -53,6 +53,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/spi/ads7846.h>
+#include <sound/uda1380.h>
 
 static unsigned long magician_pin_config[] __initdata = {
 
@@ -899,6 +900,53 @@ static struct platform_device strataflash = {
 };
 
 /*
+ * audio support
+ */
+static struct uda1380_platform_data uda1380_info = {
+       .gpio_power = EGPIO_MAGICIAN_CODEC_POWER,
+       .gpio_reset = EGPIO_MAGICIAN_CODEC_RESET,
+       .dac_clk    = UDA1380_DAC_CLK_WSPLL,
+};
+
+static struct i2c_board_info magician_audio_i2c_board_info[] = {
+       {
+               I2C_BOARD_INFO("uda1380", 0x18),
+               .platform_data = &uda1380_info,
+       },
+};
+
+static struct gpiod_lookup_table magician_audio_gpio_table = {
+       .dev_id = "magician-audio",
+       .table = {
+               GPIO_LOOKUP("htc-egpio-0",
+                           EGPIO_MAGICIAN_SPK_POWER - MAGICIAN_EGPIO_BASE,
+                           "SPK_POWER", GPIO_ACTIVE_HIGH),
+               GPIO_LOOKUP("htc-egpio-0",
+                           EGPIO_MAGICIAN_EP_POWER - MAGICIAN_EGPIO_BASE,
+                           "EP_POWER", GPIO_ACTIVE_HIGH),
+               GPIO_LOOKUP("htc-egpio-0",
+                           EGPIO_MAGICIAN_MIC_POWER - MAGICIAN_EGPIO_BASE,
+                           "MIC_POWER", GPIO_ACTIVE_HIGH),
+               GPIO_LOOKUP("htc-egpio-0",
+                           EGPIO_MAGICIAN_IN_SEL0 - MAGICIAN_EGPIO_BASE,
+                           "IN_SEL0", GPIO_ACTIVE_HIGH),
+               GPIO_LOOKUP("htc-egpio-0",
+                           EGPIO_MAGICIAN_IN_SEL1 - MAGICIAN_EGPIO_BASE,
+                           "IN_SEL1", GPIO_ACTIVE_HIGH),
+               { },
+       },
+};
+
+static void magician_audio_init(void)
+{
+       i2c_register_board_info(0,
+               ARRAY_AND_SIZE(magician_audio_i2c_board_info));
+
+       gpiod_add_lookup_table(&magician_audio_gpio_table);
+       platform_device_register_simple("magician-audio", -1, NULL, 0);
+}
+
+/*
  * PXA I2C main controller
  */
 
@@ -1048,6 +1096,8 @@ static void __init magician_init(void)
        gpiod_add_lookup_table(&bq24022_gpiod_table);
        gpiod_add_lookup_table(&gpio_vbus_gpiod_table);
        platform_add_devices(ARRAY_AND_SIZE(devices));
+
+       magician_audio_init();
 }
 
 MACHINE_START(MAGICIAN, "HTC Magician")

diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c
index a5f326c..9433cc9 100644 (file)
--- a/sound/soc/pxa/magician.c
+++ b/sound/soc/pxa/magician.c
@@ -14,16 +14,14 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
-#include <linux/gpio.h>
+#include <linux/gpio/consumer.h>
 #include <linux/i2c.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/uda1380.h>
 
-#include <mach/magician.h>
 #include <asm/mach-types.h>
 #include "../codecs/uda1380.h"
 #include "pxa2xx-i2s.h"
@@ -36,6 +34,9 @@ static int magician_hp_switch;
 static int magician_spk_switch = 1;
 static int magician_in_sel = MAGICIAN_MIC;
 
+static struct gpio_desc *gpiod_spk_power, *gpiod_ep_power, *gpiod_mic_power;
+static struct gpio_desc *gpiod_in_sel0, *gpiod_in_sel1;
+
 static void magician_ext_control(struct snd_soc_dapm_context *dapm)
 {
 
@@ -215,10 +216,10 @@ static int magician_set_input(struct snd_kcontrol *kcontrol,
 
        switch (magician_in_sel) {
        case MAGICIAN_MIC:
-               gpio_set_value(EGPIO_MAGICIAN_IN_SEL1, 1);
+               gpiod_set_value(gpiod_in_sel1, 1);
                break;
        case MAGICIAN_MIC_EXT:
-               gpio_set_value(EGPIO_MAGICIAN_IN_SEL1, 0);
+               gpiod_set_value(gpiod_in_sel1, 0);
        }
 
        return 1;
@@ -227,21 +228,21 @@ static int magician_set_input(struct snd_kcontrol *kcontrol,
 static int magician_spk_power(struct snd_soc_dapm_widget *w,
                                struct snd_kcontrol *k, int event)
 {
-       gpio_set_value(EGPIO_MAGICIAN_SPK_POWER, SND_SOC_DAPM_EVENT_ON(event));
+       gpiod_set_value(gpiod_spk_power, SND_SOC_DAPM_EVENT_ON(event));
        return 0;
 }
 
 static int magician_hp_power(struct snd_soc_dapm_widget *w,
                                struct snd_kcontrol *k, int event)
 {
-       gpio_set_value(EGPIO_MAGICIAN_EP_POWER, SND_SOC_DAPM_EVENT_ON(event));
+       gpiod_set_value(gpiod_ep_power, SND_SOC_DAPM_EVENT_ON(event));
        return 0;
 }
 
 static int magician_mic_bias(struct snd_soc_dapm_widget *w,
                                struct snd_kcontrol *k, int event)
 {
-       gpio_set_value(EGPIO_MAGICIAN_MIC_POWER, SND_SOC_DAPM_EVENT_ON(event));
+       gpiod_set_value(gpiod_mic_power, SND_SOC_DAPM_EVENT_ON(event));
        return 0;
 }
 
@@ -328,106 +329,38 @@ static struct snd_soc_card snd_soc_card_magician = {
        .fully_routed = true,
 };
 
-static struct platform_device *magician_snd_device;
-
-/*
- * FIXME: move into magician board file once merged into the pxa tree
- */
-static struct uda1380_platform_data uda1380_info = {
-       .gpio_power = EGPIO_MAGICIAN_CODEC_POWER,
-       .gpio_reset = EGPIO_MAGICIAN_CODEC_RESET,
-       .dac_clk    = UDA1380_DAC_CLK_WSPLL,
-};
-
-static struct i2c_board_info i2c_board_info[] = {
-       {
-               I2C_BOARD_INFO("uda1380", 0x18),
-               .platform_data = &uda1380_info,
-       },
-};
-
-static int __init magician_init(void)
-{
-       int ret;
-       struct i2c_adapter *adapter;
-       struct i2c_client *client;
-
-       if (!machine_is_magician())
-               return -ENODEV;
-
-       adapter = i2c_get_adapter(0);
-       if (!adapter)
-               return -ENODEV;
-       client = i2c_new_client_device(adapter, i2c_board_info);
-       i2c_put_adapter(adapter);
-       if (IS_ERR(client))
-               return PTR_ERR(client);
-
-       ret = gpio_request(EGPIO_MAGICIAN_SPK_POWER, "SPK_POWER");
-       if (ret)
-               goto err_request_spk;
-       ret = gpio_request(EGPIO_MAGICIAN_EP_POWER, "EP_POWER");
-       if (ret)
-               goto err_request_ep;
-       ret = gpio_request(EGPIO_MAGICIAN_MIC_POWER, "MIC_POWER");
-       if (ret)
-               goto err_request_mic;
-       ret = gpio_request(EGPIO_MAGICIAN_IN_SEL0, "IN_SEL0");
-       if (ret)
-               goto err_request_in_sel0;
-       ret = gpio_request(EGPIO_MAGICIAN_IN_SEL1, "IN_SEL1");
-       if (ret)
-               goto err_request_in_sel1;
-
-       gpio_set_value(EGPIO_MAGICIAN_IN_SEL0, 0);
-
-       magician_snd_device = platform_device_alloc("soc-audio", -1);
-       if (!magician_snd_device) {
-               ret = -ENOMEM;
-               goto err_pdev;
-       }
-
-       platform_set_drvdata(magician_snd_device, &snd_soc_card_magician);
-       ret = platform_device_add(magician_snd_device);
-       if (ret) {
-               platform_device_put(magician_snd_device);
-               goto err_pdev;
-       }
-
-       return 0;
-
-err_pdev:
-       gpio_free(EGPIO_MAGICIAN_IN_SEL1);
-err_request_in_sel1:
-       gpio_free(EGPIO_MAGICIAN_IN_SEL0);
-err_request_in_sel0:
-       gpio_free(EGPIO_MAGICIAN_MIC_POWER);
-err_request_mic:
-       gpio_free(EGPIO_MAGICIAN_EP_POWER);
-err_request_ep:
-       gpio_free(EGPIO_MAGICIAN_SPK_POWER);
-err_request_spk:
-       return ret;
-}
-
-static void __exit magician_exit(void)
+static int magician_audio_probe(struct platform_device *pdev)
 {
-       platform_device_unregister(magician_snd_device);
-
-       gpio_set_value(EGPIO_MAGICIAN_SPK_POWER, 0);
-       gpio_set_value(EGPIO_MAGICIAN_EP_POWER, 0);
-       gpio_set_value(EGPIO_MAGICIAN_MIC_POWER, 0);
-
-       gpio_free(EGPIO_MAGICIAN_IN_SEL1);
-       gpio_free(EGPIO_MAGICIAN_IN_SEL0);
-       gpio_free(EGPIO_MAGICIAN_MIC_POWER);
-       gpio_free(EGPIO_MAGICIAN_EP_POWER);
-       gpio_free(EGPIO_MAGICIAN_SPK_POWER);
+       struct device *dev = &pdev->dev;
+
+       gpiod_spk_power = devm_gpiod_get(dev, "SPK_POWER", GPIOD_OUT_LOW);
+       if (IS_ERR(gpiod_spk_power))
+               return PTR_ERR(gpiod_spk_power);
+       gpiod_ep_power = devm_gpiod_get(dev, "EP_POWER", GPIOD_OUT_LOW);
+       if (IS_ERR(gpiod_ep_power))
+               return PTR_ERR(gpiod_ep_power);
+       gpiod_mic_power = devm_gpiod_get(dev, "MIC_POWER", GPIOD_OUT_LOW);
+       if (IS_ERR(gpiod_mic_power))
+               return PTR_ERR(gpiod_mic_power);
+       gpiod_in_sel0 = devm_gpiod_get(dev, "IN_SEL0", GPIOD_OUT_HIGH);
+       if (IS_ERR(gpiod_in_sel0))
+               return PTR_ERR(gpiod_in_sel0);
+       gpiod_in_sel1 = devm_gpiod_get(dev, "IN_SEL1", GPIOD_OUT_LOW);
+       if (IS_ERR(gpiod_in_sel1))
+               return PTR_ERR(gpiod_in_sel1);
+
+       snd_soc_card_magician.dev = &pdev->dev;
+       return devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_magician);
 }
 
-module_init(magician_init);
-module_exit(magician_exit);
+static struct platform_driver magician_audio_driver = {
+       .driver.name = "magician-audio",
+       .driver.pm = &snd_soc_pm_ops,
+       .probe = magician_audio_probe,
+};
+module_platform_driver(magician_audio_driver);
 
 MODULE_AUTHOR("Philipp Zabel");
 MODULE_DESCRIPTION("ALSA SoC Magician");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:magician-audio");