* [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches
@ 2010-12-01 6:50 Kuninori Morimoto
2010-12-01 6:50 ` [PATCH 1/2] ASoC: sh: fsi-ak4642: tidyup unnecessary variables Kuninori Morimoto
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2010-12-01 6:50 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Dear Mark, Liam
These are FSI-AK4642 modify patches.
Kuninori Morimoto (2):
ASoC: sh: fsi-ak4642: tidyup unnecessary variables
ASoC: sh: fsi-ak4642: midify card name
BTW, current Mark's for-2.6.38 branch has below issue ?
----------------------
/linux-2.6/sound/soc/soc-core.c: In function 'soc_probe_aux_dev':
/linux-2.6/sound/soc/soc-core.c:1647: error: 'struct snd_soc_dapm_context' has no member named 'list'
/linux-2.6/sound/soc/soc-core.c:1647: error: 'struct snd_soc_card' has no member named 'dapm_list'
make[4]: *** [sound/soc/soc-core.o] Error 1
make[4]: *** Waiting for unfinished jobs....
----------------------
Best regards
--
Kuninori Morimoto
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] ASoC: sh: fsi-ak4642: tidyup unnecessary variables
2010-12-01 6:50 [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Kuninori Morimoto
@ 2010-12-01 6:50 ` Kuninori Morimoto
2010-12-01 6:50 ` [PATCH 2/2] ASoC: sh: fsi-ak4642: midify card name Kuninori Morimoto
2010-12-01 9:52 ` [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Liam Girdwood
2 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2010-12-01 6:50 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi-ak4642.c | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index 4ef279c..839ba6c 100644
--- a/sound/soc/sh/fsi-ak4642.c
+++ b/sound/soc/sh/fsi-ak4642.c
@@ -34,14 +34,8 @@ static int fsi_ak4642_dai_init(struct snd_soc_pcm_runtime *rtd)
}
static struct snd_soc_dai_link fsi_dai_link = {
- /* .name */
- /* .stream_name */
- /* .cpu_dai_name */
.codec_dai_name = "ak4642-hifi",
- /* .platform_name */
- /* .codec_name */
.init = fsi_ak4642_dai_init,
- .ops = NULL,
};
static struct snd_soc_card fsi_soc_card = {
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: sh: fsi-ak4642: midify card name
2010-12-01 6:50 [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Kuninori Morimoto
2010-12-01 6:50 ` [PATCH 1/2] ASoC: sh: fsi-ak4642: tidyup unnecessary variables Kuninori Morimoto
@ 2010-12-01 6:50 ` Kuninori Morimoto
2010-12-01 9:52 ` [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Liam Girdwood
2 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2010-12-01 6:50 UTC (permalink / raw)
To: Mark Brown; +Cc: Linux-ALSA, Liam Girdwood
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
sound/soc/sh/fsi-ak4642.c | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/sound/soc/sh/fsi-ak4642.c b/sound/soc/sh/fsi-ak4642.c
index 839ba6c..a14820a 100644
--- a/sound/soc/sh/fsi-ak4642.c
+++ b/sound/soc/sh/fsi-ak4642.c
@@ -14,6 +14,7 @@
struct fsi_ak4642_data {
const char *name;
+ const char *card;
const char *cpu_dai;
const char *codec;
const char *platform;
@@ -39,7 +40,6 @@ static struct snd_soc_dai_link fsi_dai_link = {
};
static struct snd_soc_card fsi_soc_card = {
- .name = "FSI (AK4642)",
.dai_link = &fsi_dai_link,
.num_links = 1,
};
@@ -69,6 +69,7 @@ static int fsi_ak4642_probe(struct platform_device *pdev)
fsi_dai_link.cpu_dai_name = pdata->cpu_dai;
fsi_dai_link.platform_name = pdata->platform;
fsi_dai_link.codec_name = pdata->codec;
+ fsi_soc_card.name = pdata->card;
platform_set_drvdata(fsi_snd_device, &fsi_soc_card);
ret = platform_device_add(fsi_snd_device);
@@ -88,6 +89,7 @@ static int fsi_ak4642_remove(struct platform_device *pdev)
static struct fsi_ak4642_data fsi_a_ak4642 = {
.name = "AK4642",
+ .card = "FSIA (AK4642)",
.cpu_dai = "fsia-dai",
.codec = "ak4642-codec.0-0012",
.platform = "sh_fsi.0",
@@ -95,6 +97,7 @@ static struct fsi_ak4642_data fsi_a_ak4642 = {
static struct fsi_ak4642_data fsi_b_ak4642 = {
.name = "AK4642",
+ .card = "FSIB (AK4642)",
.cpu_dai = "fsib-dai",
.codec = "ak4642-codec.0-0012",
.platform = "sh_fsi.0",
@@ -102,6 +105,7 @@ static struct fsi_ak4642_data fsi_b_ak4642 = {
static struct fsi_ak4642_data fsi_a_ak4643 = {
.name = "AK4643",
+ .card = "FSIA (AK4643)",
.cpu_dai = "fsia-dai",
.codec = "ak4642-codec.0-0013",
.platform = "sh_fsi.0",
@@ -109,6 +113,7 @@ static struct fsi_ak4642_data fsi_a_ak4643 = {
static struct fsi_ak4642_data fsi_b_ak4643 = {
.name = "AK4643",
+ .card = "FSIB (AK4643)",
.cpu_dai = "fsib-dai",
.codec = "ak4642-codec.0-0013",
.platform = "sh_fsi.0",
@@ -116,6 +121,7 @@ static struct fsi_ak4642_data fsi_b_ak4643 = {
static struct fsi_ak4642_data fsi2_a_ak4642 = {
.name = "AK4642",
+ .card = "FSI2A (AK4642)",
.cpu_dai = "fsia-dai",
.codec = "ak4642-codec.0-0012",
.platform = "sh_fsi2",
@@ -123,6 +129,7 @@ static struct fsi_ak4642_data fsi2_a_ak4642 = {
static struct fsi_ak4642_data fsi2_b_ak4642 = {
.name = "AK4642",
+ .card = "FSI2B (AK4642)",
.cpu_dai = "fsib-dai",
.codec = "ak4642-codec.0-0012",
.platform = "sh_fsi2",
@@ -130,6 +137,7 @@ static struct fsi_ak4642_data fsi2_b_ak4642 = {
static struct fsi_ak4642_data fsi2_a_ak4643 = {
.name = "AK4643",
+ .card = "FSI2A (AK4643)",
.cpu_dai = "fsia-dai",
.codec = "ak4642-codec.0-0013",
.platform = "sh_fsi2",
@@ -137,6 +145,7 @@ static struct fsi_ak4642_data fsi2_a_ak4643 = {
static struct fsi_ak4642_data fsi2_b_ak4643 = {
.name = "AK4643",
+ .card = "FSI2B (AK4643)",
.cpu_dai = "fsib-dai",
.codec = "ak4642-codec.0-0013",
.platform = "sh_fsi2",
--
1.7.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches
2010-12-01 6:50 [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Kuninori Morimoto
2010-12-01 6:50 ` [PATCH 1/2] ASoC: sh: fsi-ak4642: tidyup unnecessary variables Kuninori Morimoto
2010-12-01 6:50 ` [PATCH 2/2] ASoC: sh: fsi-ak4642: midify card name Kuninori Morimoto
@ 2010-12-01 9:52 ` Liam Girdwood
2010-12-01 11:50 ` Mark Brown
2 siblings, 1 reply; 5+ messages in thread
From: Liam Girdwood @ 2010-12-01 9:52 UTC (permalink / raw)
To: Kuninori Morimoto; +Cc: Linux-ALSA, Mark Brown
On Wed, 2010-12-01 at 15:50 +0900, Kuninori Morimoto wrote:
> Dear Mark, Liam
>
> These are FSI-AK4642 modify patches.
>
> Kuninori Morimoto (2):
> ASoC: sh: fsi-ak4642: tidyup unnecessary variables
> ASoC: sh: fsi-ak4642: midify card name
>
>
Both
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches
2010-12-01 9:52 ` [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Liam Girdwood
@ 2010-12-01 11:50 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2010-12-01 11:50 UTC (permalink / raw)
To: Liam Girdwood; +Cc: Linux-ALSA, Kuninori Morimoto
On Wed, Dec 01, 2010 at 09:52:03AM +0000, Liam Girdwood wrote:
> Both
>
> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Applied, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-12-01 11:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-01 6:50 [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Kuninori Morimoto
2010-12-01 6:50 ` [PATCH 1/2] ASoC: sh: fsi-ak4642: tidyup unnecessary variables Kuninori Morimoto
2010-12-01 6:50 ` [PATCH 2/2] ASoC: sh: fsi-ak4642: midify card name Kuninori Morimoto
2010-12-01 9:52 ` [PATCH 0/2] ASoC: sh: fsi-ak4642: modify patches Liam Girdwood
2010-12-01 11:50 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.