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

Commit dcdec639 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'ads117x' of... 

Merge branch 'ads117x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.33
parents b2a2236d f3d0e82f

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_AD1836 if SPI_MASTER

	select SND_SOC_AD1938 if SPI_MASTER

	select SND_SOC_AD1980 if SND_SOC_AC97_BUS

	select SND_SOC_ADS117X

	select SND_SOC_AD73311 if I2C

	select SND_SOC_AK4104 if SPI_MASTER

	select SND_SOC_AK4535 if I2C
@@ -92,6 +93,9 @@ config SND_SOC_AD1980 
config SND_SOC_AD73311

	tristate

	

config SND_SOC_ADS117X

	tristate



config SND_SOC_AK4104

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ snd-soc-ad1836-objs := ad1836.o 
snd-soc-ad1938-objs := ad1938.o

snd-soc-ad1980-objs := ad1980.o

snd-soc-ad73311-objs := ad73311.o

snd-soc-ads117x-objs := ads117x.o

snd-soc-ak4104-objs := ak4104.o

snd-soc-ak4535-objs := ak4535.o

snd-soc-ak4642-objs := ak4642.o
@@ -58,6 +59,7 @@ obj-$(CONFIG_SND_SOC_AD1836) += snd-soc-ad1836.o 
obj-$(CONFIG_SND_SOC_AD1938)	+= snd-soc-ad1938.o

obj-$(CONFIG_SND_SOC_AD1980)	+= snd-soc-ad1980.o

obj-$(CONFIG_SND_SOC_AD73311) += snd-soc-ad73311.o

obj-$(CONFIG_SND_SOC_ADS117X)	+= snd-soc-ads117x.o

obj-$(CONFIG_SND_SOC_AK4104)	+= snd-soc-ak4104.o

obj-$(CONFIG_SND_SOC_AK4535)	+= snd-soc-ak4535.o

obj-$(CONFIG_SND_SOC_AK4642)	+= snd-soc-ak4642.o

sound/soc/codecs/ads117x.c

0 → 100644
+123 −0
Original line number Diff line number Diff line 
/*

 * ads117x.c  --  Driver for ads1174/8 ADC chips

 *

 * Copyright 2009 ShotSpotter Inc.

 * Author: Graeme Gregory <gg@slimlogic.co.uk>

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/device.h>

#include <sound/core.h>

#include <sound/pcm.h>

#include <sound/initval.h>

#include <sound/soc.h>



#include "ads117x.h"



#define ADS117X_RATES (SNDRV_PCM_RATE_8000_48000)



#define ADS117X_FORMATS (SNDRV_PCM_FMTBIT_S16_LE)



struct snd_soc_dai ads117x_dai = {

/* ADC */

	.name = "ADS117X ADC",

	.id = 1,

	.capture = {

		.stream_name = "Capture",

		.channels_min = 1,

		.channels_max = 32,

		.rates = ADS117X_RATES,

		.formats = ADS117X_FORMATS,},

};

EXPORT_SYMBOL_GPL(ads117x_dai);



static int ads117x_probe(struct platform_device *pdev)

{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_codec *codec;

	int ret;



	codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);

	if (codec == NULL)

		return -ENOMEM;



	socdev->card->codec = codec;

	mutex_init(&codec->mutex);

	INIT_LIST_HEAD(&codec->dapm_widgets);

	INIT_LIST_HEAD(&codec->dapm_paths);

	codec->name = "ADS117X";

	codec->owner = THIS_MODULE;

	codec->dai = &ads117x_dai;

	codec->num_dai = 1;



	/* register pcms */

	ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);

	if (ret < 0) {

		printk(KERN_ERR "ads117x: failed to create pcms\n");

		kfree(codec);

		return ret;

	}



	return 0;

}



static int ads117x_remove(struct platform_device *pdev)

{

	struct snd_soc_device *socdev = platform_get_drvdata(pdev);

	struct snd_soc_codec *codec = socdev->card->codec;



	snd_soc_free_pcms(socdev);

	kfree(codec);



	return 0;

}



struct snd_soc_codec_device soc_codec_dev_ads117x = {

	.probe =	ads117x_probe,

	.remove =	ads117x_remove,

};

EXPORT_SYMBOL_GPL(soc_codec_dev_ads117x);



static __devinit int ads117x_platform_probe(struct platform_device *pdev)

{

	ads117x_dai.dev = &pdev->dev;

	return snd_soc_register_dai(&ads117x_dai);

}



static int __devexit ads117x_platform_remove(struct platform_device *pdev)

{

	snd_soc_unregister_dai(&ads117x_dai);

	return 0;

}



static struct platform_driver ads117x_codec_driver = {

	.driver = {

			.name = "ads117x",

			.owner = THIS_MODULE,

	},



	.probe = ads117x_platform_probe,

	.remove = __devexit_p(ads117x_platform_remove),

};



static int __init ads117x_init(void)

{

	return platform_driver_register(&ads117x_codec_driver);

}

module_init(ads117x_init);



static void __exit ads117x_exit(void)

{

	platform_driver_unregister(&ads117x_codec_driver);

}

module_exit(ads117x_exit);



MODULE_DESCRIPTION("ASoC ads117x driver");

MODULE_AUTHOR("Graeme Gregory");

MODULE_LICENSE("GPL");

sound/soc/codecs/ads117x.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/*

 * ads117x.h  --  Driver for ads1174/8 ADC chips

 *

 * Copyright 2009 ShotSpotter Inc.

 * Author: Graeme Gregory <gg@slimlogic.co.uk>

 *

 *  This program is free software; you can redistribute  it and/or modify it

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 */

extern struct snd_soc_dai ads117x_dai;

extern struct snd_soc_codec_device soc_codec_dev_ads117x;