Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cfe5617 authored by Stephen Warren's avatar Stephen Warren Committed by Mark Brown
Browse files

ASoC: wm8903: Expose GPIOs through gpiolib 



Also, update platform_data GPIO handling to have an explicit "don't
touch this pin" option.

Add #defines for the GPIO pin functions.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9978007b

include/sound/wm8903.h

+19 −1
Original line number Original line Diff line number Diff line
@@ -36,6 +36,21 @@ 
#define WM8903_MICBIAS_ENA_SHIFT                     0  /* MICBIAS_ENA */

#define WM8903_MICBIAS_ENA_SHIFT                     0  /* MICBIAS_ENA */

#define WM8903_MICBIAS_ENA_WIDTH                     1  /* MICBIAS_ENA */

#define WM8903_MICBIAS_ENA_WIDTH                     1  /* MICBIAS_ENA */





/*

 * WM8903_GPn_FN values

 *

 * See datasheets for list of valid values per pin

 */

#define WM8903_GPn_FN_GPIO_OUTPUT                    0

#define WM8903_GPn_FN_BCLK                           1

#define WM8903_GPn_FN_IRQ_OUTPT                      2

#define WM8903_GPn_FN_GPIO_INPUT                     3

#define WM8903_GPn_FN_MICBIAS_CURRENT_DETECT         4

#define WM8903_GPn_FN_MICBIAS_SHORT_DETECT           5

#define WM8903_GPn_FN_DMIC_LR_CLK_OUTPUT             6

#define WM8903_GPn_FN_FLL_LOCK_OUTPUT                8

#define WM8903_GPn_FN_FLL_CLOCK_OUTPUT               9



/*

/*

 * R116 (0x74) - GPIO Control 1

 * R116 (0x74) - GPIO Control 1

 */

 */
@@ -231,6 +246,8 @@ 
#define WM8903_GP5_DB_SHIFT                          0  /* GP5_DB */

#define WM8903_GP5_DB_SHIFT                          0  /* GP5_DB */

#define WM8903_GP5_DB_WIDTH                          1  /* GP5_DB */

#define WM8903_GP5_DB_WIDTH                          1  /* GP5_DB */





#define WM8903_NUM_GPIO 5



struct wm8903_platform_data {

struct wm8903_platform_data {

	bool irq_active_low;   /* Set if IRQ active low, default high */

	bool irq_active_low;   /* Set if IRQ active low, default high */
@@ -243,7 +260,8 @@ struct wm8903_platform_data { 




	int micdet_delay;      /* Delay after microphone detection (ms) */

	int micdet_delay;      /* Delay after microphone detection (ms) */





	u32 gpio_cfg[5];       /* Default register values for GPIO pin mux */

	int gpio_base;

	u32 gpio_cfg[WM8903_NUM_GPIO]; /* Default register values for GPIO pin mux */

};

};





#endif
 
#endif

sound/soc/codecs/wm8903.c

+125 −1
Original line number Original line Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * wm8903.c  --  WM8903 ALSA SoC Audio driver

 * wm8903.c  --  WM8903 ALSA SoC Audio driver

 *

 *

 * Copyright 2008 Wolfson Microelectronics

 * Copyright 2008 Wolfson Microelectronics

 * Copyright 2011 NVIDIA, Inc.

 *

 *

 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>

 * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>

 *

 *
@@ -19,6 +20,7 @@ 
#include <linux/init.h>

#include <linux/init.h>

#include <linux/completion.h>

#include <linux/completion.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/pm.h>

#include <linux/pm.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -213,6 +215,7 @@ static u16 wm8903_reg_defaults[] = { 
};

};





struct wm8903_priv {

struct wm8903_priv {

	struct snd_soc_codec *codec;





	int sysclk;

	int sysclk;

	int irq;

	int irq;
@@ -230,6 +233,10 @@ struct wm8903_priv { 
	int mic_short;

	int mic_short;

	int mic_last_report;

	int mic_last_report;

	int mic_delay;

	int mic_delay;



#ifdef CONFIG_GPIOLIB

	struct gpio_chip gpio_chip;

#endif

};

};





static int wm8903_volatile_register(struct snd_soc_codec *codec, unsigned int reg)

static int wm8903_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
@@ -1635,6 +1642,119 @@ static int wm8903_resume(struct snd_soc_codec *codec) 
	return 0;

	return 0;

}

}





#ifdef CONFIG_GPIOLIB

static inline struct wm8903_priv *gpio_to_wm8903(struct gpio_chip *chip)

{

	return container_of(chip, struct wm8903_priv, gpio_chip);

}



static int wm8903_gpio_request(struct gpio_chip *chip, unsigned offset)

{

	if (offset >= WM8903_NUM_GPIO)

		return -EINVAL;



	return 0;

}



static int wm8903_gpio_direction_in(struct gpio_chip *chip, unsigned offset)

{

	struct wm8903_priv *wm8903 = gpio_to_wm8903(chip);

	struct snd_soc_codec *codec = wm8903->codec;

	unsigned int mask, val;



	mask = WM8903_GP1_FN_MASK | WM8903_GP1_DIR_MASK;

	val = (WM8903_GPn_FN_GPIO_INPUT << WM8903_GP1_FN_SHIFT) |

		WM8903_GP1_DIR;



	return snd_soc_update_bits(codec, WM8903_GPIO_CONTROL_1 + offset,

				   mask, val);

}



static int wm8903_gpio_get(struct gpio_chip *chip, unsigned offset)

{

	struct wm8903_priv *wm8903 = gpio_to_wm8903(chip);

	struct snd_soc_codec *codec = wm8903->codec;

	int reg;



	reg = snd_soc_read(codec, WM8903_GPIO_CONTROL_1 + offset);



	return (reg & WM8903_GP1_LVL_MASK) >> WM8903_GP1_LVL_SHIFT;

}



static int wm8903_gpio_direction_out(struct gpio_chip *chip,

				     unsigned offset, int value)

{

	struct wm8903_priv *wm8903 = gpio_to_wm8903(chip);

	struct snd_soc_codec *codec = wm8903->codec;

	unsigned int mask, val;



	mask = WM8903_GP1_FN_MASK | WM8903_GP1_DIR_MASK | WM8903_GP1_LVL_MASK;

	val = (WM8903_GPn_FN_GPIO_OUTPUT << WM8903_GP1_FN_SHIFT) |

		(value << WM8903_GP2_LVL_SHIFT);



	return snd_soc_update_bits(codec, WM8903_GPIO_CONTROL_1 + offset,

				   mask, val);

}



static void wm8903_gpio_set(struct gpio_chip *chip, unsigned offset, int value)

{

	struct wm8903_priv *wm8903 = gpio_to_wm8903(chip);

	struct snd_soc_codec *codec = wm8903->codec;



	snd_soc_update_bits(codec, WM8903_GPIO_CONTROL_1 + offset,

			    WM8903_GP1_LVL_MASK, value << WM8903_GP1_LVL_SHIFT);

}



static struct gpio_chip wm8903_template_chip = {

	.label			= "wm8903",

	.owner			= THIS_MODULE,

	.request		= wm8903_gpio_request,

	.direction_input	= wm8903_gpio_direction_in,

	.get			= wm8903_gpio_get,

	.direction_output	= wm8903_gpio_direction_out,

	.set			= wm8903_gpio_set,

	.can_sleep		= 1,

};



static void wm8903_init_gpio(struct snd_soc_codec *codec)

{

	struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);

	struct wm8903_platform_data *pdata = dev_get_platdata(codec->dev);

	int ret;



	wm8903->gpio_chip = wm8903_template_chip;

	wm8903->gpio_chip.ngpio = WM8903_NUM_GPIO;

	wm8903->gpio_chip.dev = codec->dev;



	if (pdata && pdata->gpio_base)

		wm8903->gpio_chip.base = pdata->gpio_base;

	else

		wm8903->gpio_chip.base = -1;



	ret = gpiochip_add(&wm8903->gpio_chip);

	if (ret != 0)

		dev_err(codec->dev, "Failed to add GPIOs: %d\n", ret);

}



static void wm8903_free_gpio(struct snd_soc_codec *codec)

{

	struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = gpiochip_remove(&wm8903->gpio_chip);

	if (ret != 0)

		dev_err(codec->dev, "Failed to remove GPIOs: %d\n", ret);

}

#else

static void wm8903_init_gpio(struct snd_soc_codec *codec)

{

}



static void wm8903_free_gpio(struct snd_soc_codec *codec)

{

}

#endif



static int wm8903_probe(struct snd_soc_codec *codec)

static int wm8903_probe(struct snd_soc_codec *codec)

{

{

	struct wm8903_platform_data *pdata = dev_get_platdata(codec->dev);

	struct wm8903_platform_data *pdata = dev_get_platdata(codec->dev);
@@ -1643,6 +1763,7 @@ static int wm8903_probe(struct snd_soc_codec *codec) 
	int trigger, irq_pol;

	int trigger, irq_pol;

	u16 val;

	u16 val;





	wm8903->codec = codec;

	init_completion(&wm8903->wseq);

	init_completion(&wm8903->wseq);





	ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);

	ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
@@ -1667,7 +1788,7 @@ static int wm8903_probe(struct snd_soc_codec *codec) 
	/* Set up GPIOs and microphone detection */

	/* Set up GPIOs and microphone detection */

	if (pdata) {

	if (pdata) {

		for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) {

		for (i = 0; i < ARRAY_SIZE(pdata->gpio_cfg); i++) {

			if (!pdata->gpio_cfg[i])

			if (pdata->gpio_cfg[i] == WM8903_GPIO_NO_CONFIG)

				continue;

				continue;





			snd_soc_write(codec, WM8903_GPIO_CONTROL_1 + i,

			snd_soc_write(codec, WM8903_GPIO_CONTROL_1 + i,
@@ -1749,12 +1870,15 @@ static int wm8903_probe(struct snd_soc_codec *codec) 
				ARRAY_SIZE(wm8903_snd_controls));

				ARRAY_SIZE(wm8903_snd_controls));

	wm8903_add_widgets(codec);

	wm8903_add_widgets(codec);





	wm8903_init_gpio(codec);



	return ret;

	return ret;

}

}





/* power down chip */

/* power down chip */

static int wm8903_remove(struct snd_soc_codec *codec)

static int wm8903_remove(struct snd_soc_codec *codec)

{

{

	wm8903_free_gpio(codec);

	wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);

	wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);

	return 0;

	return 0;

}

}