leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: sti: select player for I2S/TDM TX bus

Browse Source 
By default, player#0 is connected to I2S/TDM TX bus.
This patch connects player#1 to I2S/TDM TX bus.

Signed-off-by: Moise Gergaud <moise.gergaud@st.com>
Acked-by: Arnaud Pouliquen <arnaud.pouliquen@st.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Moise Gergaud 2016-04-14 15:29:35 +02:00 committed by Mark Brown
parent 82d4eb91ab
commit 3ee15cac90
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/sti/uniperif.h
View File

@ -1302,6 +1302,7 @@ struct uniperif {
struct device *dev;
int ver; /* IP version, used by register access macros */
struct regmap_field *clk_sel;
struct regmap_field *valid_sel;
/* capabilities */
const struct snd_pcm_hardware *hw;

42
sound/soc/sti/uniperif_player.c
View File

@ -21,7 +21,6 @@
/* sys config registers definitions */
#define SYS_CFG_AUDIO_GLUE 0xA4
#define SYS_CFG_AUDI0_GLUE_PCM_CLKX 8
/*
* Driver specific types.
@ -29,6 +28,7 @@
#define UNIPERIF_PLAYER_CLK_ADJ_MIN -999999
#define UNIPERIF_PLAYER_CLK_ADJ_MAX 1000000
#define UNIPERIF_PLAYER_I2S_OUT 1 /* player id connected to I2S/TDM TX bus */
/*
* Note: snd_pcm_hardware is linked to DMA controller but is declared here to
@ -1013,27 +1013,30 @@ static void uni_player_shutdown(struct snd_pcm_substream *substream,
player->substream = NULL;
}
static int uni_player_parse_dt_clk_glue(struct platform_device *pdev,
struct uniperif *player)
static int uni_player_parse_dt_audio_glue(struct platform_device *pdev,
struct uniperif *player)
{
int bit_offset;
struct device_node *node = pdev->dev.of_node;
struct regmap *regmap;
bit_offset = SYS_CFG_AUDI0_GLUE_PCM_CLKX + player->info->id;
struct reg_field regfield[2] = {
/* PCM_CLK_SEL */
REG_FIELD(SYS_CFG_AUDIO_GLUE,
8 + player->info->id,
8 + player->info->id),
/* PCMP_VALID_SEL */
REG_FIELD(SYS_CFG_AUDIO_GLUE, 0, 1)
};
regmap = syscon_regmap_lookup_by_phandle(node, "st,syscfg");
if (regmap) {
struct reg_field regfield =
REG_FIELD(SYS_CFG_AUDIO_GLUE, bit_offset, bit_offset);
player->clk_sel = regmap_field_alloc(regmap, regfield);
} else {
if (!regmap) {
dev_err(&pdev->dev, "sti-audio-clk-glue syscf not found\n");
return -EINVAL;
}
player->clk_sel = regmap_field_alloc(regmap, regfield[0]);
player->valid_sel = regmap_field_alloc(regmap, regfield[1]);
return 0;
}
@ -1084,8 +1087,8 @@ static int uni_player_parse_dt(struct platform_device *pdev,
/* Save the info structure */
player->info = info;
/* Get the PCM_CLK_SEL bit from audio-glue-ctrl SoC register */
if (uni_player_parse_dt_clk_glue(pdev, player))
/* Get PCM_CLK_SEL & PCMP_VALID_SEL from audio-glue-ctrl SoC reg */
if (uni_player_parse_dt_audio_glue(pdev, player))
return -EINVAL;
return 0;
@ -1139,6 +1142,17 @@ int uni_player_init(struct platform_device *pdev,
}
}
/* connect to I2S/TDM TX bus */
if (player->valid_sel &&
(player->info->id == UNIPERIF_PLAYER_I2S_OUT)) {
ret = regmap_field_write(player->valid_sel, player->info->id);
if (ret) {
dev_err(player->dev,
"%s: unable to connect to tdm bus", __func__);
return ret;
}
}
ret = devm_request_irq(&pdev->dev, player->irq,
uni_player_irq_handler, IRQF_SHARED,
dev_name(&pdev->dev), player);