* [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available
@ 2011-08-12 14:52 Vasily Khoruzhick
2011-08-12 14:52 ` [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header Vasily Khoruzhick
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Vasily Khoruzhick @ 2011-08-12 14:52 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, alsa-devel, Jassi Brar; +Cc: Vasily Khoruzhick
Otherwise we get linker error like:
ERROR: "regmap_init_spi" [sound/soc/snd-soc-core.ko] undefined!
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
sound/soc/soc-io.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index e471ed6..c1565e4 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -122,16 +122,18 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
config.val_bits = data_bits;
switch (control) {
+#ifdef CONFIG_REGMAP_I2C
case SND_SOC_I2C:
codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
&config);
break;
-
+#endif
+#ifdef CONFIG_REGMAP_SPI
case SND_SOC_SPI:
codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
&config);
break;
-
+#endif
case SND_SOC_REGMAP:
/* Device has made its own regmap arrangements */
break;
--
1.7.5.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header
2011-08-12 14:52 [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Vasily Khoruzhick
@ 2011-08-12 14:52 ` Vasily Khoruzhick
2011-08-13 7:07 ` Jassi Brar
2011-08-12 14:53 ` [PATCH 3/3] ASoC: rx1950: " Vasily Khoruzhick
2011-08-12 14:59 ` [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Mark Brown
2 siblings, 1 reply; 6+ messages in thread
From: Vasily Khoruzhick @ 2011-08-12 14:52 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, alsa-devel, Jassi Brar; +Cc: Vasily Khoruzhick
Add linux/types.h to fix this compilation error:
In file included from arch/arm/mach-s3c2410/include/mach/gpio-fns.h:27:0,
from arch/arm/mach-s3c2410/include/mach/gpio.h:27,
from /home/anarsoul/work/pda-linux/linux-next/arch/arm/include/asm/gpio.h:5,
from include/linux/gpio.h:18,
from sound/soc/samsung/rx1950_uda1380.c:20:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:29:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:30:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_drvstr_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:57:2: error: expected specifier-qualifier-list before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:148:47: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:156:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_getpull’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:175:24: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h: In function ‘s3c_gpio_cfgrange_nopull’:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: ‘s3c_gpio_pull_t’ undeclared (first use in this function)
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: note: each undeclared identifier is reported only once for each function it appears in
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: expected ‘)’ before numeric constant
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: too many arguments to function ‘s3c_gpio_cfgall_range’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:174:12: note: declared here
arch/arm/plat-samsung/include/plat/gpio-cfg.h: At top level:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:199:26: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_get_drvstr’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:210:50: error: expected declaration specifiers or ‘...’ before ‘s5p_gpio_drvstr_t’
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
sound/soc/samsung/h1940_uda1380.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c
index 241f55d..c6c6589 100644
--- a/sound/soc/samsung/h1940_uda1380.c
+++ b/sound/soc/samsung/h1940_uda1380.c
@@ -13,6 +13,7 @@
*
*/
+#include <linux/types.h>
#include <linux/gpio.h>
#include <sound/soc.h>
--
1.7.5.rc3
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] ASoC: rx1950: Fix compilation error due to missing header
2011-08-12 14:52 [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Vasily Khoruzhick
2011-08-12 14:52 ` [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header Vasily Khoruzhick
@ 2011-08-12 14:53 ` Vasily Khoruzhick
2011-08-12 14:59 ` [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Vasily Khoruzhick @ 2011-08-12 14:53 UTC (permalink / raw)
To: Liam Girdwood, Mark Brown, alsa-devel, Jassi Brar; +Cc: Vasily Khoruzhick
Add linux/types.h to fix this compilation error:
In file included from arch/arm/mach-s3c2410/include/mach/gpio-fns.h:27:0,
from arch/arm/mach-s3c2410/include/mach/gpio.h:27,
from /home/anarsoul/work/pda-linux/linux-next/arch/arm/include/asm/gpio.h:5,
from include/linux/gpio.h:18,
from sound/soc/samsung/rx1950_uda1380.c:20:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:29:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:30:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_drvstr_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:57:2: error: expected specifier-qualifier-list before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:148:47: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:156:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_getpull’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:175:24: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
arch/arm/plat-samsung/include/plat/gpio-cfg.h: In function ‘s3c_gpio_cfgrange_nopull’:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: ‘s3c_gpio_pull_t’ undeclared (first use in this function)
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: note: each undeclared identifier is reported only once for each function it appears in
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: expected ‘)’ before numeric constant
arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: too many arguments to function ‘s3c_gpio_cfgall_range’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:174:12: note: declared here
arch/arm/plat-samsung/include/plat/gpio-cfg.h: At top level:
arch/arm/plat-samsung/include/plat/gpio-cfg.h:199:26: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_get_drvstr’
arch/arm/plat-samsung/include/plat/gpio-cfg.h:210:50: error: expected declaration specifiers or ‘...’ before ‘s5p_gpio_drvstr_t’
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
sound/soc/samsung/rx1950_uda1380.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/samsung/rx1950_uda1380.c b/sound/soc/samsung/rx1950_uda1380.c
index 1e574a5..bc8c167 100644
--- a/sound/soc/samsung/rx1950_uda1380.c
+++ b/sound/soc/samsung/rx1950_uda1380.c
@@ -17,6 +17,7 @@
*
*/
+#include <linux/types.h>
#include <linux/gpio.h>
#include <sound/soc.h>
--
1.7.5.rc3
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available
2011-08-12 14:52 [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Vasily Khoruzhick
2011-08-12 14:52 ` [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header Vasily Khoruzhick
2011-08-12 14:53 ` [PATCH 3/3] ASoC: rx1950: " Vasily Khoruzhick
@ 2011-08-12 14:59 ` Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-08-12 14:59 UTC (permalink / raw)
To: Vasily Khoruzhick; +Cc: alsa-devel, Jassi Brar, Liam Girdwood
On Fri, 2011-08-12 at 17:52 +0300, Vasily Khoruzhick wrote:
> Otherwise we get linker error like:
> ERROR: "regmap_init_spi" [sound/soc/snd-soc-core.ko] undefined!
Too late, already fixed in git by Stephen and Axel. But thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header
2011-08-12 14:52 ` [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header Vasily Khoruzhick
@ 2011-08-13 7:07 ` Jassi Brar
2011-08-14 10:23 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Jassi Brar @ 2011-08-13 7:07 UTC (permalink / raw)
To: Vasily Khoruzhick; +Cc: alsa-devel, Mark Brown, Liam Girdwood
On Fri, Aug 12, 2011 at 8:22 PM, Vasily Khoruzhick <anarsoul@gmail.com> wrote:
> Add linux/types.h to fix this compilation error:
>
> In file included from arch/arm/mach-s3c2410/include/mach/gpio-fns.h:27:0,
> from arch/arm/mach-s3c2410/include/mach/gpio.h:27,
> from /home/anarsoul/work/pda-linux/linux-next/arch/arm/include/asm/gpio.h:5,
> from include/linux/gpio.h:18,
> from sound/soc/samsung/rx1950_uda1380.c:20:
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:29:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_pull_t’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:30:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_drvstr_t’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:57:2: error: expected specifier-qualifier-list before ‘s3c_gpio_pull_t’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:148:47: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:156:24: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s3c_gpio_getpull’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:175:24: error: expected declaration specifiers or ‘...’ before ‘s3c_gpio_pull_t’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h: In function ‘s3c_gpio_cfgrange_nopull’:
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: ‘s3c_gpio_pull_t’ undeclared (first use in this function)
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: note: each undeclared identifier is reported only once for each function it appears in
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: expected ‘)’ before numeric constant
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:180:47: error: too many arguments to function ‘s3c_gpio_cfgall_range’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:174:12: note: declared here
> arch/arm/plat-samsung/include/plat/gpio-cfg.h: At top level:
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:199:26: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘s5p_gpio_get_drvstr’
> arch/arm/plat-samsung/include/plat/gpio-cfg.h:210:50: error: expected declaration specifiers or ‘...’ before ‘s5p_gpio_drvstr_t’
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Should be ok if the changelog is trimmed ?
Patch 2 and 3
Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header
2011-08-13 7:07 ` Jassi Brar
@ 2011-08-14 10:23 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2011-08-14 10:23 UTC (permalink / raw)
To: Jassi Brar; +Cc: Vasily Khoruzhick, alsa-devel, Liam Girdwood
On Sat, Aug 13, 2011 at 12:37:00PM +0530, Jassi Brar wrote:
> Patch 2 and 3
> Acked-by: Jassi Brar <jassisinghbrar@gmail.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-14 10:23 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-12 14:52 [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Vasily Khoruzhick
2011-08-12 14:52 ` [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header Vasily Khoruzhick
2011-08-13 7:07 ` Jassi Brar
2011-08-14 10:23 ` Mark Brown
2011-08-12 14:53 ` [PATCH 3/3] ASoC: rx1950: " Vasily Khoruzhick
2011-08-12 14:59 ` [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available 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.