Merge branch 'for-2.6.39' into for-2.6.40
This commit is contained in:
commit
a0b1550677
|
@ -45,25 +45,25 @@
|
|||
/* platform domain */
|
||||
#define SND_SOC_DAPM_INPUT(wname) \
|
||||
{ .id = snd_soc_dapm_input, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0}
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM }
|
||||
#define SND_SOC_DAPM_OUTPUT(wname) \
|
||||
{ .id = snd_soc_dapm_output, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0}
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM }
|
||||
#define SND_SOC_DAPM_MIC(wname, wevent) \
|
||||
{ .id = snd_soc_dapm_mic, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0, .event = wevent, \
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
|
||||
.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD}
|
||||
#define SND_SOC_DAPM_HP(wname, wevent) \
|
||||
{ .id = snd_soc_dapm_hp, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0, .event = wevent, \
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
|
||||
.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
|
||||
#define SND_SOC_DAPM_SPK(wname, wevent) \
|
||||
{ .id = snd_soc_dapm_spk, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0, .event = wevent, \
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
|
||||
.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
|
||||
#define SND_SOC_DAPM_LINE(wname, wevent) \
|
||||
{ .id = snd_soc_dapm_line, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0, .event = wevent, \
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
|
||||
.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD}
|
||||
|
||||
/* path domain */
|
||||
|
@ -189,11 +189,11 @@
|
|||
/* events that are pre and post DAPM */
|
||||
#define SND_SOC_DAPM_PRE(wname, wevent) \
|
||||
{ .id = snd_soc_dapm_pre, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0, .event = wevent, \
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
|
||||
.event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_PRE_PMD}
|
||||
#define SND_SOC_DAPM_POST(wname, wevent) \
|
||||
{ .id = snd_soc_dapm_post, .name = wname, .kcontrols = NULL, \
|
||||
.num_kcontrols = 0, .event = wevent, \
|
||||
.num_kcontrols = 0, .reg = SND_SOC_NOPM, .event = wevent, \
|
||||
.event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD}
|
||||
|
||||
/* stream domain */
|
||||
|
|
|
@ -772,6 +772,7 @@ static int sgtl5000_pcm_hw_params(struct snd_pcm_substream *substream,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_REGULATOR
|
||||
static int ldo_regulator_is_enabled(struct regulator_dev *dev)
|
||||
{
|
||||
struct ldo_regulator *ldo = rdev_get_drvdata(dev);
|
||||
|
@ -901,6 +902,19 @@ static int ldo_regulator_remove(struct snd_soc_codec *codec)
|
|||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
static int ldo_regulator_register(struct snd_soc_codec *codec,
|
||||
struct regulator_init_data *init_data,
|
||||
int voltage)
|
||||
{
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
static int ldo_regulator_remove(struct snd_soc_codec *codec)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* set dac bias
|
||||
|
|
|
@ -110,12 +110,12 @@ static int imx_ssi_dma_alloc(struct snd_pcm_substream *substream,
|
|||
slave_config.direction = DMA_TO_DEVICE;
|
||||
slave_config.dst_addr = dma_params->dma_addr;
|
||||
slave_config.dst_addr_width = buswidth;
|
||||
slave_config.dst_maxburst = dma_params->burstsize;
|
||||
slave_config.dst_maxburst = dma_params->burstsize * buswidth;
|
||||
} else {
|
||||
slave_config.direction = DMA_FROM_DEVICE;
|
||||
slave_config.src_addr = dma_params->dma_addr;
|
||||
slave_config.src_addr_width = buswidth;
|
||||
slave_config.src_maxburst = dma_params->burstsize;
|
||||
slave_config.src_maxburst = dma_params->burstsize * buswidth;
|
||||
}
|
||||
|
||||
ret = dmaengine_slave_config(iprtd->dma_chan, &slave_config);
|
||||
|
@ -303,6 +303,11 @@ static struct snd_soc_platform_driver imx_soc_platform_mx2 = {
|
|||
|
||||
static int __devinit imx_soc_platform_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct imx_ssi *ssi = platform_get_drvdata(pdev);
|
||||
|
||||
ssi->dma_params_tx.burstsize = 6;
|
||||
ssi->dma_params_rx.burstsize = 4;
|
||||
|
||||
return snd_soc_register_platform(&pdev->dev, &imx_soc_platform_mx2);
|
||||
}
|
||||
|
||||
|
|
|
@ -234,7 +234,4 @@ void imx_pcm_free(struct snd_pcm *pcm);
|
|||
*/
|
||||
#define IMX_SSI_DMABUF_SIZE (64 * 1024)
|
||||
|
||||
#define DMA_RXFIFO_BURST 0x4
|
||||
#define DMA_TXFIFO_BURST 0x6
|
||||
|
||||
#endif /* _IMX_SSI_H */
|
||||
|
|
Loading…
Reference in a new issue