diff options
| author | Mattias Wallin <mattias.wallin@stericsson.com> | 2010-05-06 13:21:31 +0200 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2010-09-02 22:45:37 -0600 |
| commit | 8d1bb34cbd0c6450963d4a8698de33afe4f43c2a (patch) | |
| tree | 06c49bc00e40f13ecc57b535bb2f3d5762a89f4a /sound/soc | |
| parent | ec3b75e071f4c5bead693ba5fdeda2c5232c942e (diff) | |
SND: sound codec ab3550 abx500 updates
This patch updates the ab3550 codec for the abx500 API changes.
Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Change-Id: I6336fdd0c6d852b0a63457788790038cb9636c55
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/2424
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 2 | ||||
| -rwxr-xr-x | sound/soc/codecs/ab3550.c | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index 2b5b0682ec1..d6e4b41e3c6 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -262,7 +262,7 @@ config SND_SOC_WM9713 config SND_SOC_AB3550 tristate "ST-Ericsson AB3550 Mixed Signal Circuit CODEC" - depends on SND_SOC_U8500 && MFD_AB3550_CORE + depends on SND_SOC_U8500 && AB3550_CORE default m help Select this to support the AB3550 codec block. diff --git a/sound/soc/codecs/ab3550.c b/sound/soc/codecs/ab3550.c index d68adf7dcf9..5ee08672792 100755 --- a/sound/soc/codecs/ab3550.c +++ b/sound/soc/codecs/ab3550.c @@ -23,7 +23,7 @@ #include <sound/initval.h> #include <sound/soc.h> #include <sound/soc-dapm.h> -#include <linux/mfd/abx.h> +#include <linux/mfd/abx500.h> #include <linux/bitops.h> #include "ab3550.h" @@ -32,15 +32,16 @@ #define I2C_BANK 0 -static struct abx_dev *ab3550_dev = NULL; +static struct device *ab3550_dev = NULL; -#define SET_REG(reg, val) abx_set_register_interruptible( \ +#define SET_REG(reg, val) abx500_set_register_interruptible( \ ab3550_dev, I2C_BANK, (reg), (val)) -#define MASK_SET_REG(reg, mask, val) abx_mask_and_set_register_interruptible( \ +#define MASK_SET_REG(reg, mask, val) \ + abx500_mask_and_set_register_interruptible( \ ab3550_dev, I2C_BANK, (reg), (mask), (val)) -#define GET_REG(reg, val) abx_get_register_interruptible( \ +#define GET_REG(reg, val) abx500_get_register_interruptible( \ ab3550_dev, I2C_BANK, (reg), (val)) #define AB3550_SUPPORTED_RATE (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 | \ @@ -941,7 +942,7 @@ static int ab3550_platform_probe(struct platform_device *pdev) int ret = 0; printk(KERN_DEBUG "%s invoked with pdev = %p.\n", __func__, pdev); - ab3550_dev = platform_get_drvdata(pdev); + ab3550_dev = &pdev->dev; return ret; } |