shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 20:32:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

phonepad: divide rt3224 and rt3261 from config, want to add dsp function later.

Browse Source
This commit is contained in:
宋秀杰
2012-09-16 16:12:14 +08:00
parent 3056032b0d
commit ce9e0c36ba
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/soc/codecs/Kconfig
View File

@@ -79,6 +79,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_RT5631 if I2C
select SND_SOC_RT5625 if I2C
select SND_SOC_RT3261 if I2C
select SND_SOC_RT3224 if I2C
select SND_SOC_RT5623 if I2C
select SND_SOC_RK610 if I2C
select SND_SOC_WM8903 if I2C
@@ -334,6 +335,9 @@ config SND_SOC_RT5631
config SND_SOC_RT5625
tristate
config SND_SOC_RT3224
tristate
config SND_SOC_RT3261
tristate

2
sound/soc/codecs/Makefile
View File

@@ -91,6 +91,7 @@ snd-soc-rk1000-objs := rk1000_codec.o
snd-soc-jz4740-codec-objs := jz4740.o
snd-soc-rk610-objs := rk610_codec.o
snd-soc-rt3261-objs := rt3261.o rt3261-dsp.o rt3261_ioctl.o rt_codec_ioctl.o
snd-soc-rt3224-objs := rt3261.o rt3261_ioctl.o rt_codec_ioctl.o
snd-soc-rk2928-objs := rk2928_codec.o
# Amp
@@ -100,6 +101,7 @@ snd-soc-tpa6130a2-objs := tpa6130a2.o
snd-soc-wm2000-objs := wm2000.o
snd-soc-wm9090-objs := wm9090.o
obj-$(CONFIG_SND_SOC_RT3261) += snd-soc-rt3261.o
obj-$(CONFIG_SND_SOC_RT3224) += snd-soc-rt3224.o
obj-$(CONFIG_SND_SOC_88PM860X) += snd-soc-88pm860x.o
obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
obj-$(CONFIG_SND_SOC_AD1836) += snd-soc-ad1836.o

10
sound/soc/codecs/rt3261.c
View File

@@ -38,7 +38,7 @@ char debug_write_read = 0;
static struct snd_soc_codec *rt3261_codec;
#if 1
#if 0
#define DBG(x...) printk(KERN_INFO x)
#else
#define DBG(x...)
@@ -3010,7 +3010,7 @@ static int rt3261_probe(struct snd_soc_codec *codec)
snd_soc_dapm_add_routes(&codec->dapm, rt3261_dapm_routes,
ARRAY_SIZE(rt3261_dapm_routes));
#if 0
#if defined (CONFIG_SND_SOC_RT3261)
rt3261->dsp_sw = RT3261_DSP_AEC_NS_FENS;
rt3261_dsp_probe(codec);
@@ -3026,7 +3026,7 @@ static int rt3261_probe(struct snd_soc_codec *codec)
realtek_ce_init_hwdep(codec);
#endif
#endif
#endif
ret = device_create_file(codec->dev, &dev_attr_index_reg);
if (ret != 0) {
@@ -3054,7 +3054,7 @@ static int rt3261_suspend(struct snd_soc_codec *codec, pm_message_t state)
* (3) DSP IIS interface power off
* (4) Toggle pin of codec LDO1 to power off
*/
//rt3261_dsp_suspend(codec, state);
rt3261_dsp_suspend(codec, state);
#endif
rt3261_set_bias_level(codec, SND_SOC_BIAS_OFF);
return 0;
@@ -3065,7 +3065,7 @@ static int rt3261_resume(struct snd_soc_codec *codec)
rt3261_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
#if defined (CONFIG_SND_SOC_RT3261)
/* After opening LDO of codec, then close LDO of DSP. */
//rt3261_dsp_resume(codec);
rt3261_dsp_resume(codec);
#endif
return 0;
}

10
sound/soc/rk29/Kconfig
View File

@@ -115,6 +115,14 @@ choice
if your codec output hardware connect is spk from spkout, choose it
endchoice
config SND_RK29_SOC_RT3224
tristate "SoC I2S Audio support for rockchip - RT3224"
depends on SND_RK29_SOC
select SND_RK29_SOC_I2S
select SND_SOC_RT3224
help
RT3224 is pin to pin as RT3261, but not have dsp function.
config SND_RK29_SOC_RT3261
tristate "SoC I2S Audio support for rockchip - RT3261"
depends on SND_RK29_SOC
@@ -196,7 +204,7 @@ config SND_RK_SOC_RK2928
Say Y if you want to add support for SoC audio on rockchip
with the RK2928 internal codec.
if SND_RK29_SOC_WM8988 || SND_RK29_SOC_RK1000 || SND_RK29_SOC_WM8994 || SND_RK29_SOC_WM8900 || SND_RK29_SOC_RT5621 || SND_RK29_SOC_RT5631 || SND_RK29_SOC_RT5625 || SND_RK29_SOC_RT3261 || SND_RK29_SOC_CS42L52 || SND_RK29_SOC_AIC3111 || SND_RK29_SOC_HDMI || SND_RK29_SOC_RK610 || SND_RK29_SOC_AIC3262 || SND_RK_SOC_RK2928
if SND_RK29_SOC_WM8988 || SND_RK29_SOC_RK1000 || SND_RK29_SOC_WM8994 || SND_RK29_SOC_WM8900 || SND_RK29_SOC_RT5621 || SND_RK29_SOC_RT5631 || SND_RK29_SOC_RT5625 || SND_RK29_SOC_RT3261 || SND_RK29_SOC_RT3224 || SND_RK29_SOC_CS42L52 || SND_RK29_SOC_AIC3111 || SND_RK29_SOC_HDMI || SND_RK29_SOC_RK610 || SND_RK29_SOC_AIC3262 || SND_RK_SOC_RK2928
choice
bool "Set i2s type"
default SND_RK29_CODEC_SOC_SLAVE

2
sound/soc/rk29/Makefile
View File

@@ -21,6 +21,7 @@ snd-soc-rt5621-objs := rk29_rt5621.o
snd-soc-rt5631-objs := rk29_rt5631.o
snd-soc-rt5625-objs := rk29_rt5625.o
snd-soc-rt3261-objs := rk29_rt3261.o
snd-soc-rt3224-objs := rk29_rt3261.o
snd-soc-cs42l52-objs := rk29_cs42l52.o
snd-soc-aic3111-objs := rk29_aic3111.o
snd-soc-wm8988-objs := rk29_wm8988.o
@@ -38,6 +39,7 @@ obj-$(CONFIG_SND_RK29_SOC_RT5621) += snd-soc-rt5621.o
obj-$(CONFIG_SND_RK29_SOC_RT5631) += snd-soc-rt5631.o
obj-$(CONFIG_SND_RK29_SOC_RT5625) += snd-soc-rt5625.o
obj-$(CONFIG_SND_RK29_SOC_RT3261) += snd-soc-rt3261.o
obj-$(CONFIG_SND_RK29_SOC_RT3224) += snd-soc-rt3224.o
obj-$(CONFIG_SND_RK29_SOC_RK1000) += snd-soc-rk1000.o
obj-$(CONFIG_SND_RK29_SOC_CS42L52) += snd-soc-cs42l52.o
obj-$(CONFIG_SND_RK29_SOC_AIC3111) += snd-soc-aic3111.o

2
sound/soc/rk29/rk29_rt3261.c
View File

@@ -24,7 +24,7 @@
#include "rk29_pcm.h"
#include "rk29_i2s.h"
#if 1
#if 0
#define DBG(x...) printk(KERN_INFO x)
#else
#define DBG(x...)