Commit b7707a8b authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/chmap',...

Merge remote-tracking branches 'asoc/topic/atmel', 'asoc/topic/chmap', 'asoc/topic/cq93vc' and 'asoc/topic/da7218' into asoc-next
...@@ -24,6 +24,8 @@ Optional properties: ...@@ -24,6 +24,8 @@ Optional properties:
this parameter to choose where the clock from. this parameter to choose where the clock from.
- By default the clock is from TK pin, if the clock from RK pin, this - By default the clock is from TK pin, if the clock from RK pin, this
property is needed. property is needed.
- #sound-dai-cells: Should contain <0>.
- This property makes the SSC into an automatically registered DAI.
Examples: Examples:
- PDC transfer: - PDC transfer:
......
...@@ -2,8 +2,7 @@ Devicetree bindings for the Axentia TSE-850 audio complex ...@@ -2,8 +2,7 @@ Devicetree bindings for the Axentia TSE-850 audio complex
Required properties: Required properties:
- compatible: "axentia,tse850-pcm5142" - compatible: "axentia,tse850-pcm5142"
- axentia,ssc-controller: The phandle of the atmel SSC controller used as - axentia,cpu-dai: The phandle of the cpu dai.
cpu dai.
- axentia,audio-codec: The phandle of the PCM5142 codec. - axentia,audio-codec: The phandle of the PCM5142 codec.
- axentia,add-gpios: gpio specifier that controls the mixer. - axentia,add-gpios: gpio specifier that controls the mixer.
- axentia,loop1-gpios: gpio specifier that controls loop relays on channel 1. - axentia,loop1-gpios: gpio specifier that controls loop relays on channel 1.
...@@ -43,6 +42,12 @@ the PCM5142 codec. ...@@ -43,6 +42,12 @@ the PCM5142 codec.
Example: Example:
&ssc0 {
#sound-dai-cells = <0>;
status = "okay";
};
&i2c { &i2c {
codec: pcm5142@4c { codec: pcm5142@4c {
compatible = "ti,pcm5142"; compatible = "ti,pcm5142";
...@@ -77,7 +82,7 @@ Example: ...@@ -77,7 +82,7 @@ Example:
sound { sound {
compatible = "axentia,tse850-pcm5142"; compatible = "axentia,tse850-pcm5142";
axentia,ssc-controller = <&ssc0>; axentia,cpu-dai = <&ssc0>;
axentia,audio-codec = <&codec>; axentia,audio-codec = <&codec>;
axentia,add-gpios = <&pioA 8 GPIO_ACTIVE_LOW>; axentia,add-gpios = <&pioA 8 GPIO_ACTIVE_LOW>;
......
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#include <linux/of.h> #include <linux/of.h>
#include "../../sound/soc/atmel/atmel_ssc_dai.h"
/* Serialize access to ssc_list and user count */ /* Serialize access to ssc_list and user count */
static DEFINE_SPINLOCK(user_lock); static DEFINE_SPINLOCK(user_lock);
static LIST_HEAD(ssc_list); static LIST_HEAD(ssc_list);
...@@ -145,6 +147,49 @@ static inline const struct atmel_ssc_platform_data * __init ...@@ -145,6 +147,49 @@ static inline const struct atmel_ssc_platform_data * __init
platform_get_device_id(pdev)->driver_data; platform_get_device_id(pdev)->driver_data;
} }
#ifdef CONFIG_SND_ATMEL_SOC_SSC
static int ssc_sound_dai_probe(struct ssc_device *ssc)
{
struct device_node *np = ssc->pdev->dev.of_node;
int ret;
int id;
ssc->sound_dai = false;
if (!of_property_read_bool(np, "#sound-dai-cells"))
return 0;
id = of_alias_get_id(np, "ssc");
if (id < 0)
return id;
ret = atmel_ssc_set_audio(id);
ssc->sound_dai = !ret;
return ret;
}
static void ssc_sound_dai_remove(struct ssc_device *ssc)
{
if (!ssc->sound_dai)
return;
atmel_ssc_put_audio(of_alias_get_id(ssc->pdev->dev.of_node, "ssc"));
}
#else
static inline int ssc_sound_dai_probe(struct ssc_device *ssc)
{
if (of_property_read_bool(ssc->pdev->dev.of_node, "#sound-dai-cells"))
return -ENOTSUPP;
return 0;
}
static inline void ssc_sound_dai_remove(struct ssc_device *ssc)
{
}
#endif
static int ssc_probe(struct platform_device *pdev) static int ssc_probe(struct platform_device *pdev)
{ {
struct resource *regs; struct resource *regs;
...@@ -204,6 +249,9 @@ static int ssc_probe(struct platform_device *pdev) ...@@ -204,6 +249,9 @@ static int ssc_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "Atmel SSC device at 0x%p (irq %d)\n", dev_info(&pdev->dev, "Atmel SSC device at 0x%p (irq %d)\n",
ssc->regs, ssc->irq); ssc->regs, ssc->irq);
if (ssc_sound_dai_probe(ssc))
dev_err(&pdev->dev, "failed to auto-setup ssc for audio\n");
return 0; return 0;
} }
...@@ -211,6 +259,8 @@ static int ssc_remove(struct platform_device *pdev) ...@@ -211,6 +259,8 @@ static int ssc_remove(struct platform_device *pdev)
{ {
struct ssc_device *ssc = platform_get_drvdata(pdev); struct ssc_device *ssc = platform_get_drvdata(pdev);
ssc_sound_dai_remove(ssc);
spin_lock(&user_lock); spin_lock(&user_lock);
list_del(&ssc->list); list_del(&ssc->list);
spin_unlock(&user_lock); spin_unlock(&user_lock);
......
...@@ -248,6 +248,7 @@ struct detailed_timing { ...@@ -248,6 +248,7 @@ struct detailed_timing {
# define DRM_ELD_AUD_SYNCH_DELAY_MAX 0xfa /* 500 ms */ # define DRM_ELD_AUD_SYNCH_DELAY_MAX 0xfa /* 500 ms */
#define DRM_ELD_SPEAKER 7 #define DRM_ELD_SPEAKER 7
# define DRM_ELD_SPEAKER_MASK 0x7f
# define DRM_ELD_SPEAKER_RLRC (1 << 6) # define DRM_ELD_SPEAKER_RLRC (1 << 6)
# define DRM_ELD_SPEAKER_FLRC (1 << 5) # define DRM_ELD_SPEAKER_FLRC (1 << 5)
# define DRM_ELD_SPEAKER_RC (1 << 4) # define DRM_ELD_SPEAKER_RC (1 << 4)
...@@ -413,6 +414,18 @@ static inline int drm_eld_size(const uint8_t *eld) ...@@ -413,6 +414,18 @@ static inline int drm_eld_size(const uint8_t *eld)
return DRM_ELD_HEADER_BLOCK_SIZE + eld[DRM_ELD_BASELINE_ELD_LEN] * 4; return DRM_ELD_HEADER_BLOCK_SIZE + eld[DRM_ELD_BASELINE_ELD_LEN] * 4;
} }
/**
* drm_eld_get_spk_alloc - Get speaker allocation
* @eld: pointer to an ELD memory structure
*
* The returned value is the speakers mask. User has to use %DRM_ELD_SPEAKER
* field definitions to identify speakers.
*/
static inline u8 drm_eld_get_spk_alloc(const uint8_t *eld)
{
return eld[DRM_ELD_SPEAKER] & DRM_ELD_SPEAKER_MASK;
}
/** /**
* drm_eld_get_conn_type - Get device type hdmi/dp connected * drm_eld_get_conn_type - Get device type hdmi/dp connected
* @eld: pointer to an ELD memory structure * @eld: pointer to an ELD memory structure
......
...@@ -20,6 +20,7 @@ struct ssc_device { ...@@ -20,6 +20,7 @@ struct ssc_device {
int user; int user;
int irq; int irq;
bool clk_from_rk_pin; bool clk_from_rk_pin;
bool sound_dai;
}; };
struct ssc_device * __must_check ssc_request(unsigned int ssc_num); struct ssc_device * __must_check ssc_request(unsigned int ssc_num);
......
...@@ -256,6 +256,9 @@ struct snd_soc_dai_driver { ...@@ -256,6 +256,9 @@ struct snd_soc_dai_driver {
int (*resume)(struct snd_soc_dai *dai); int (*resume)(struct snd_soc_dai *dai);
/* compress dai */ /* compress dai */
int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num); int (*compress_new)(struct snd_soc_pcm_runtime *rtd, int num);
/* Optional Callback used at pcm creation*/
int (*pcm_new)(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_dai *dai);
/* DAI is also used for the control bus */ /* DAI is also used for the control bus */
bool bus_control; bool bus_control;
......
...@@ -51,11 +51,7 @@ ...@@ -51,11 +51,7 @@
#include <sound/soc.h> #include <sound/soc.h>
#include <sound/pcm_params.h> #include <sound/pcm_params.h>
#include "atmel_ssc_dai.h"
struct tse850_priv { struct tse850_priv {
int ssc_id;
struct gpio_desc *add; struct gpio_desc *add;
struct gpio_desc *loop1; struct gpio_desc *loop1;
struct gpio_desc *loop2; struct gpio_desc *loop2;
...@@ -329,23 +325,20 @@ static int tse850_dt_init(struct platform_device *pdev) ...@@ -329,23 +325,20 @@ static int tse850_dt_init(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device_node *codec_np, *cpu_np; struct device_node *codec_np, *cpu_np;
struct snd_soc_card *card = &tse850_card;
struct snd_soc_dai_link *dailink = &tse850_dailink; struct snd_soc_dai_link *dailink = &tse850_dailink;
struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
if (!np) { if (!np) {
dev_err(&pdev->dev, "only device tree supported\n"); dev_err(&pdev->dev, "only device tree supported\n");
return -EINVAL; return -EINVAL;
} }
cpu_np = of_parse_phandle(np, "axentia,ssc-controller", 0); cpu_np = of_parse_phandle(np, "axentia,cpu-dai", 0);
if (!cpu_np) { if (!cpu_np) {
dev_err(&pdev->dev, "failed to get dai and pcm info\n"); dev_err(&pdev->dev, "failed to get cpu dai\n");
return -EINVAL; return -EINVAL;
} }
dailink->cpu_of_node = cpu_np; dailink->cpu_of_node = cpu_np;
dailink->platform_of_node = cpu_np; dailink->platform_of_node = cpu_np;
tse850->ssc_id = of_alias_get_id(cpu_np, "ssc");
of_node_put(cpu_np); of_node_put(cpu_np);
codec_np = of_parse_phandle(np, "axentia,audio-codec", 0); codec_np = of_parse_phandle(np, "axentia,audio-codec", 0);
...@@ -415,23 +408,14 @@ static int tse850_probe(struct platform_device *pdev) ...@@ -415,23 +408,14 @@ static int tse850_probe(struct platform_device *pdev)
return ret; return ret;
} }
ret = atmel_ssc_set_audio(tse850->ssc_id);
if (ret != 0) {
dev_err(dev,
"failed to set SSC %d for audio\n", tse850->ssc_id);
goto err_disable_ana;
}
ret = snd_soc_register_card(card); ret = snd_soc_register_card(card);
if (ret) { if (ret) {
dev_err(dev, "snd_soc_register_card failed\n"); dev_err(dev, "snd_soc_register_card failed\n");
goto err_put_audio; goto err_disable_ana;
} }
return 0; return 0;
err_put_audio:
atmel_ssc_put_audio(tse850->ssc_id);
err_disable_ana: err_disable_ana:
regulator_disable(tse850->ana); regulator_disable(tse850->ana);
return ret; return ret;
...@@ -443,7 +427,6 @@ static int tse850_remove(struct platform_device *pdev) ...@@ -443,7 +427,6 @@ static int tse850_remove(struct platform_device *pdev)
struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card); struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card);
snd_soc_unregister_card(card); snd_soc_unregister_card(card);
atmel_ssc_put_audio(tse850->ssc_id);
regulator_disable(tse850->ana); regulator_disable(tse850->ana);
return 0; return 0;
......
...@@ -45,7 +45,7 @@ config SND_SOC_ALL_CODECS ...@@ -45,7 +45,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_ALC5623 if I2C select SND_SOC_ALC5623 if I2C
select SND_SOC_ALC5632 if I2C select SND_SOC_ALC5632 if I2C
select SND_SOC_BT_SCO select SND_SOC_BT_SCO
select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC select SND_SOC_CQ0093VC
select SND_SOC_CS35L32 if I2C select SND_SOC_CS35L32 if I2C
select SND_SOC_CS35L33 if I2C select SND_SOC_CS35L33 if I2C
select SND_SOC_CS35L34 if I2C select SND_SOC_CS35L34 if I2C
......
...@@ -1634,7 +1634,8 @@ static const struct snd_soc_dapm_widget da7218_dapm_widgets[] = { ...@@ -1634,7 +1634,8 @@ static const struct snd_soc_dapm_widget da7218_dapm_widgets[] = {
SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD), SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD),
/* DAI */ /* DAI */
SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_OUT("DAIOUT", "Capture", 0, DA7218_DAI_TDM_CTRL,
DA7218_DAI_OE_SHIFT, DA7218_NO_INVERT),
SND_SOC_DAPM_AIF_IN("DAIIN", "Playback", 0, SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_AIF_IN("DAIIN", "Playback", 0, SND_SOC_NOPM, 0, 0),
/* Output Mixers */ /* Output Mixers */
......
This diff is collapsed.
...@@ -1594,6 +1594,27 @@ static int soc_probe_dai(struct snd_soc_dai *dai, int order) ...@@ -1594,6 +1594,27 @@ static int soc_probe_dai(struct snd_soc_dai *dai, int order)
return 0; return 0;
} }
static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,
struct snd_soc_pcm_runtime *rtd)
{
int i, ret = 0;
for (i = 0; i < num_dais; ++i) {
struct snd_soc_dai_driver *drv = dais[i]->driver;
if (!rtd->dai_link->no_pcm && drv->pcm_new)
ret = drv->pcm_new(rtd, dais[i]);
if (ret < 0) {
dev_err(dais[i]->dev,
"ASoC: Failed to bind %s with pcm device\n",
dais[i]->name);
return ret;
}
}
return 0;
}
static int soc_link_dai_widgets(struct snd_soc_card *card, static int soc_link_dai_widgets(struct snd_soc_card *card,
struct snd_soc_dai_link *dai_link, struct snd_soc_dai_link *dai_link,
struct snd_soc_pcm_runtime *rtd) struct snd_soc_pcm_runtime *rtd)
...@@ -1705,6 +1726,13 @@ static int soc_probe_link_dais(struct snd_soc_card *card, ...@@ -1705,6 +1726,13 @@ static int soc_probe_link_dais(struct snd_soc_card *card,
dai_link->stream_name, ret); dai_link->stream_name, ret);
return ret; return ret;
} }
ret = soc_link_dai_pcm_new(&cpu_dai, 1, rtd);
if (ret < 0)
return ret;
ret = soc_link_dai_pcm_new(rtd->codec_dais,
rtd->num_codecs, rtd);
if (ret < 0)
return ret;
} else { } else {
INIT_DELAYED_WORK(&rtd->delayed_work, INIT_DELAYED_WORK(&rtd->delayed_work,
codec2codec_close_delayed_work); codec2codec_close_delayed_work);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment