Commit e6c91e1a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: pxa: hx4700: use gpio descriptors for audio 



The audio driver should not use a hardwired gpio number
from the header. Change it to use a lookup table.

Cc: Philipp Zabel <philipp.zabel@gmail.com>
Cc: Paul Parsons <lost.distance@yahoo.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Cc: alsa-devel@alsa-project.org
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 2f361e94

arch/arm/mach-pxa/hx4700-pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/irq.h>



#include <asm/mach-types.h>

#include <mach/hx4700.h>

#include "hx4700.h"



#include <pcmcia/soc_common.h>

arch/arm/mach-pxa/hx4700.c

+15 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 


#include "pxa27x.h"

#include "addr-map.h"

#include <mach/hx4700.h>

#include "hx4700.h"

#include <linux/platform_data/irda-pxaficp.h>



#include <sound/ak4641.h>
@@ -834,6 +834,19 @@ static struct i2c_board_info i2c_board_info[] __initdata = { 
	},

};



static struct gpiod_lookup_table hx4700_audio_gpio_table = {

	.dev_id = "hx4700-audio",

	.table = {

		GPIO_LOOKUP("gpio-pxa", GPIO75_HX4700_EARPHONE_nDET,

			    "earphone-det", GPIO_ACTIVE_LOW),

		GPIO_LOOKUP("gpio-pxa", GPIO92_HX4700_HP_DRIVER,

			    "hp-driver", GPIO_ACTIVE_HIGH),

		GPIO_LOOKUP("gpio-pxa", GPIO107_HX4700_SPK_nSD,

			    "spk-sd", GPIO_ACTIVE_LOW),

		{ },

	},

};



static struct platform_device audio = {

	.name	= "hx4700-audio",

	.id	= -1,
@@ -895,6 +908,7 @@ static void __init hx4700_init(void) 


	gpiod_add_lookup_table(&bq24022_gpiod_table);

	gpiod_add_lookup_table(&gpio_vbus_gpiod_table);

	gpiod_add_lookup_table(&hx4700_audio_gpio_table);

	platform_add_devices(devices, ARRAY_SIZE(devices));

	pwm_add_table(hx4700_pwm_lookup, ARRAY_SIZE(hx4700_pwm_lookup));

arch/arm/mach-pxa/include/mach/hx4700.h→arch/arm/mach-pxa/hx4700.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#include <linux/gpio.h>

#include <linux/mfd/asic3.h>

#include "irqs.h" /* PXA_NR_BUILTIN_GPIO */

#include <mach/irqs.h> /* PXA_NR_BUILTIN_GPIO */



#define HX4700_ASIC3_GPIO_BASE	PXA_NR_BUILTIN_GPIO

#define HX4700_EGPIO_BASE	(HX4700_ASIC3_GPIO_BASE + ASIC3_NUM_GPIOS)

sound/soc/pxa/hx4700.c

+15 −22
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>



#include <sound/core.h>

#include <sound/jack.h>
@@ -18,10 +18,10 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>



#include <mach/hx4700.h>

#include <asm/mach-types.h>

#include "pxa2xx-i2s.h"



static struct gpio_desc *gpiod_hp_driver, *gpiod_spk_sd;

static struct snd_soc_jack hs_jack;



/* Headphones jack detection DAPM pin */
@@ -29,20 +29,18 @@ static struct snd_soc_jack_pin hs_jack_pin[] = { 
	{

		.pin	= "Headphone Jack",

		.mask	= SND_JACK_HEADPHONE,

		.invert	= 1,

	},

	{

		.pin	= "Speaker",

		/* disable speaker when hp jack is inserted */

		.mask   = SND_JACK_HEADPHONE,

		.invert	= 1,

	},

};



/* Headphones jack detection GPIO */

static struct snd_soc_jack_gpio hs_jack_gpio = {

	.gpio		= GPIO75_HX4700_EARPHONE_nDET,

	.invert		= true,

	.name		= "hp-gpio",

	.name		= "earphone-det",

	.report		= SND_JACK_HEADPHONE,

	.debounce_time	= 200,

};
@@ -81,14 +79,14 @@ static const struct snd_soc_ops hx4700_ops = { 
static int hx4700_spk_power(struct snd_soc_dapm_widget *w,

			    struct snd_kcontrol *k, int event)

{

	gpio_set_value(GPIO107_HX4700_SPK_nSD, !!SND_SOC_DAPM_EVENT_ON(event));

	gpiod_set_value(gpiod_spk_sd, !SND_SOC_DAPM_EVENT_ON(event));

	return 0;

}



static int hx4700_hp_power(struct snd_soc_dapm_widget *w,

			   struct snd_kcontrol *k, int event)

{

	gpio_set_value(GPIO92_HX4700_HP_DRIVER, !!SND_SOC_DAPM_EVENT_ON(event));

	gpiod_set_value(gpiod_hp_driver, !!SND_SOC_DAPM_EVENT_ON(event));

	return 0;

}
@@ -162,11 +160,6 @@ static struct snd_soc_card snd_soc_card_hx4700 = { 
	.fully_routed		= true,

};



static struct gpio hx4700_audio_gpios[] = {

	{ GPIO107_HX4700_SPK_nSD, GPIOF_OUT_INIT_HIGH, "SPK_POWER" },

	{ GPIO92_HX4700_HP_DRIVER, GPIOF_OUT_INIT_LOW, "EP_POWER" },

};



static int hx4700_audio_probe(struct platform_device *pdev)

{

	int ret;
@@ -174,26 +167,26 @@ static int hx4700_audio_probe(struct platform_device *pdev) 
	if (!machine_is_h4700())

		return -ENODEV;



	ret = gpio_request_array(hx4700_audio_gpios,

				ARRAY_SIZE(hx4700_audio_gpios));

	gpiod_hp_driver = devm_gpiod_get(&pdev->dev, "hp-driver", GPIOD_ASIS);

	ret = PTR_ERR_OR_ZERO(gpiod_hp_driver);

	if (ret)

		return ret;

	gpiod_spk_sd = devm_gpiod_get(&pdev->dev, "spk-sd", GPIOD_ASIS);

	ret = PTR_ERR_OR_ZERO(gpiod_spk_sd);

	if (ret)

		return ret;



	hs_jack_gpio.gpiod_dev = &pdev->dev;

	snd_soc_card_hx4700.dev = &pdev->dev;

	ret = devm_snd_soc_register_card(&pdev->dev, &snd_soc_card_hx4700);

	if (ret)

		gpio_free_array(hx4700_audio_gpios,

				ARRAY_SIZE(hx4700_audio_gpios));



	return ret;

}



static int hx4700_audio_remove(struct platform_device *pdev)

{

	gpio_set_value(GPIO92_HX4700_HP_DRIVER, 0);

	gpio_set_value(GPIO107_HX4700_SPK_nSD, 0);



	gpio_free_array(hx4700_audio_gpios, ARRAY_SIZE(hx4700_audio_gpios));

	gpiod_set_value(gpiod_hp_driver, 0);

	gpiod_set_value(gpiod_spk_sd, 0);

	return 0;

}