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

Commit a1533d94 authored by Barry Song's avatar Barry Song Committed by Mark Brown
Browse files

ASoC: rename ad1938 to ad193x and add support for ad1936/7/8/9 



Signed-off-by: default avatarBarry Song <barry.song@analog.com>
Signed-off-by: default avatarYi Li <yi.li@analog.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 8ecbabd9

sound/soc/codecs/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_L3

	select SND_SOC_AC97_CODEC if SND_SOC_AC97_BUS

	select SND_SOC_AD1836 if SPI_MASTER

	select SND_SOC_AD1938 if SPI_MASTER

	select SND_SOC_AD193X if SND_SOC_I2C_AND_SPI

	select SND_SOC_AD1980 if SND_SOC_AC97_BUS

	select SND_SOC_ADS117X

	select SND_SOC_AD73311 if I2C
@@ -92,7 +92,7 @@ config SND_SOC_AC97_CODEC 
config SND_SOC_AD1836

	tristate



config SND_SOC_AD1938

config SND_SOC_AD193X

	tristate



config SND_SOC_AD1980

sound/soc/codecs/Makefile

+2 −2
Original line number Diff line number Diff line 
snd-soc-ac97-objs := ac97.o

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

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

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

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

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

snd-soc-ads117x-objs := ads117x.o
@@ -64,7 +64,7 @@ snd-soc-wm2000-objs := wm2000.o 


obj-$(CONFIG_SND_SOC_AC97_CODEC)	+= snd-soc-ac97.o

obj-$(CONFIG_SND_SOC_AD1836)	+= snd-soc-ad1836.o

obj-$(CONFIG_SND_SOC_AD1938)	+= snd-soc-ad1938.o

obj-$(CONFIG_SND_SOC_AD193X)	+= snd-soc-ad193x.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

sound/soc/codecs/ad1938.h

deleted100644 → 0
+0 −100
Original line number Diff line number Diff line 
/*

 * File:         sound/soc/codecs/ad1836.h

 * Based on:

 * Author:       Barry Song <Barry.Song@analog.com>

 *

 * Created:      May 25, 2009

 * Description:  definitions for AD1938 registers

 *

 * Modified:

 *

 * Bugs:         Enter bugs at http://blackfin.uclinux.org/

 *

 * 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.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, see the file COPYING, or write

 * to the Free Software Foundation, Inc.,

 * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA

 */



#ifndef __AD1938_H__

#define __AD1938_H__



#define AD1938_PLL_CLK_CTRL0    0

#define AD1938_PLL_POWERDOWN           0x01

#define AD1938_PLL_CLK_CTRL1    1

#define AD1938_DAC_CTRL0        2

#define AD1938_DAC_POWERDOWN           0x01

#define AD1938_DAC_SERFMT_MASK		0xC0

#define AD1938_DAC_SERFMT_STEREO	(0 << 6)

#define AD1938_DAC_SERFMT_TDM		(1 << 6)

#define AD1938_DAC_CTRL1        3

#define AD1938_DAC_2_CHANNELS   0

#define AD1938_DAC_4_CHANNELS   1

#define AD1938_DAC_8_CHANNELS   2

#define AD1938_DAC_16_CHANNELS  3

#define AD1938_DAC_CHAN_SHFT    1

#define AD1938_DAC_CHAN_MASK    (3 << AD1938_DAC_CHAN_SHFT)

#define AD1938_DAC_LCR_MASTER   (1 << 4)

#define AD1938_DAC_BCLK_MASTER  (1 << 5)

#define AD1938_DAC_LEFT_HIGH    (1 << 3)

#define AD1938_DAC_BCLK_INV     (1 << 7)

#define AD1938_DAC_CTRL2        4

#define AD1938_DAC_WORD_LEN_MASK	0xC

#define AD1938_DAC_MASTER_MUTE  1

#define AD1938_DAC_CHNL_MUTE    5

#define AD1938_DACL1_MUTE       0

#define AD1938_DACR1_MUTE       1

#define AD1938_DACL2_MUTE       2

#define AD1938_DACR2_MUTE       3

#define AD1938_DACL3_MUTE       4

#define AD1938_DACR3_MUTE       5

#define AD1938_DACL4_MUTE       6

#define AD1938_DACR4_MUTE       7

#define AD1938_DAC_L1_VOL       6

#define AD1938_DAC_R1_VOL       7

#define AD1938_DAC_L2_VOL       8

#define AD1938_DAC_R2_VOL       9

#define AD1938_DAC_L3_VOL       10

#define AD1938_DAC_R3_VOL       11

#define AD1938_DAC_L4_VOL       12

#define AD1938_DAC_R4_VOL       13

#define AD1938_ADC_CTRL0        14

#define AD1938_ADC_POWERDOWN           0x01

#define AD1938_ADC_HIGHPASS_FILTER	1

#define AD1938_ADCL1_MUTE 		2

#define AD1938_ADCR1_MUTE 		3

#define AD1938_ADCL2_MUTE 		4

#define AD1938_ADCR2_MUTE 		5

#define AD1938_ADC_CTRL1        15

#define AD1938_ADC_SERFMT_MASK		0x60

#define AD1938_ADC_SERFMT_STEREO	(0 << 5)

#define AD1938_ADC_SERFMT_TDM		(1 << 2)

#define AD1938_ADC_SERFMT_AUX		(2 << 5)

#define AD1938_ADC_WORD_LEN_MASK	0x3

#define AD1938_ADC_CTRL2        16

#define AD1938_ADC_2_CHANNELS   0

#define AD1938_ADC_4_CHANNELS   1

#define AD1938_ADC_8_CHANNELS   2

#define AD1938_ADC_16_CHANNELS  3

#define AD1938_ADC_CHAN_SHFT    4

#define AD1938_ADC_CHAN_MASK    (3 << AD1938_ADC_CHAN_SHFT)

#define AD1938_ADC_LCR_MASTER   (1 << 3)

#define AD1938_ADC_BCLK_MASTER  (1 << 6)

#define AD1938_ADC_LEFT_HIGH    (1 << 2)

#define AD1938_ADC_BCLK_INV     (1 << 1)



#define AD1938_NUM_REGS          17



extern struct snd_soc_dai ad1938_dai;

extern struct snd_soc_codec_device soc_codec_dev_ad1938;

#endif

sound/soc/codecs/ad1938.c→sound/soc/codecs/ad193x.c

+560 −0

File changed and moved.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/ad193x.h

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

 * AD193X Audio Codec driver

 *

 * Copyright 2010 Analog Devices Inc.

 *

 * Licensed under the GPL-2 or later.

 */



#ifndef __AD193X_H__

#define __AD193X_H__



#define AD193X_PLL_CLK_CTRL0    0x800

#define AD193X_PLL_POWERDOWN           0x01

#define AD193X_PLL_CLK_CTRL1    0x801

#define AD193X_DAC_CTRL0        0x802

#define AD193X_DAC_POWERDOWN           0x01

#define AD193X_DAC_SERFMT_MASK		0xC0

#define AD193X_DAC_SERFMT_STEREO	(0 << 6)

#define AD193X_DAC_SERFMT_TDM		(1 << 6)

#define AD193X_DAC_CTRL1        0x803

#define AD193X_DAC_2_CHANNELS   0

#define AD193X_DAC_4_CHANNELS   1

#define AD193X_DAC_8_CHANNELS   2

#define AD193X_DAC_16_CHANNELS  3

#define AD193X_DAC_CHAN_SHFT    1

#define AD193X_DAC_CHAN_MASK    (3 << AD193X_DAC_CHAN_SHFT)

#define AD193X_DAC_LCR_MASTER   (1 << 4)

#define AD193X_DAC_BCLK_MASTER  (1 << 5)

#define AD193X_DAC_LEFT_HIGH    (1 << 3)

#define AD193X_DAC_BCLK_INV     (1 << 7)

#define AD193X_DAC_CTRL2        0x804

#define AD193X_DAC_WORD_LEN_MASK	0xC

#define AD193X_DAC_MASTER_MUTE  1

#define AD193X_DAC_CHNL_MUTE    0x805

#define AD193X_DACL1_MUTE       0

#define AD193X_DACR1_MUTE       1

#define AD193X_DACL2_MUTE       2

#define AD193X_DACR2_MUTE       3

#define AD193X_DACL3_MUTE       4

#define AD193X_DACR3_MUTE       5

#define AD193X_DACL4_MUTE       6

#define AD193X_DACR4_MUTE       7

#define AD193X_DAC_L1_VOL       0x806

#define AD193X_DAC_R1_VOL       0x807

#define AD193X_DAC_L2_VOL       0x808

#define AD193X_DAC_R2_VOL       0x809

#define AD193X_DAC_L3_VOL       0x80a

#define AD193X_DAC_R3_VOL       0x80b

#define AD193X_DAC_L4_VOL       0x80c

#define AD193X_DAC_R4_VOL       0x80d

#define AD193X_ADC_CTRL0        0x80e

#define AD193X_ADC_POWERDOWN           0x01

#define AD193X_ADC_HIGHPASS_FILTER	1

#define AD193X_ADCL1_MUTE 		2

#define AD193X_ADCR1_MUTE 		3

#define AD193X_ADCL2_MUTE 		4

#define AD193X_ADCR2_MUTE 		5

#define AD193X_ADC_CTRL1        0x80f

#define AD193X_ADC_SERFMT_MASK		0x60

#define AD193X_ADC_SERFMT_STEREO	(0 << 5)

#define AD193X_ADC_SERFMT_TDM		(1 << 2)

#define AD193X_ADC_SERFMT_AUX		(2 << 5)

#define AD193X_ADC_WORD_LEN_MASK	0x3

#define AD193X_ADC_CTRL2        0x810

#define AD193X_ADC_2_CHANNELS   0

#define AD193X_ADC_4_CHANNELS   1

#define AD193X_ADC_8_CHANNELS   2

#define AD193X_ADC_16_CHANNELS  3

#define AD193X_ADC_CHAN_SHFT    4

#define AD193X_ADC_CHAN_MASK    (3 << AD193X_ADC_CHAN_SHFT)

#define AD193X_ADC_LCR_MASTER   (1 << 3)

#define AD193X_ADC_BCLK_MASTER  (1 << 6)

#define AD193X_ADC_LEFT_HIGH    (1 << 2)

#define AD193X_ADC_BCLK_INV     (1 << 1)



#define AD193X_NUM_REGS          17



extern struct snd_soc_dai ad193x_dai;

extern struct snd_soc_codec_device soc_codec_dev_ad193x;

extern int ad193x_bus_probe(struct device *dev, void *ctrl_data, int bus_type);

extern int ad193x_bus_remove(struct device *dev);



#endif