* [PATCH] ASoC: wm8985: add i2c dependency
@ 2016-06-13 15:39 Arnd Bergmann
2016-06-13 15:39 ` [PATCH] ASoC: fix ABE_TWL6040 dependency Arnd Bergmann
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Arnd Bergmann @ 2016-06-13 15:39 UTC (permalink / raw)
To: Liam Girdwood
Cc: Arnd Bergmann, Mark Brown, Charles Keepax, Richard Fitzgerald,
alsa-devel, linux-kernel
The wm8985 driver is now user-selectable, but building it with
I2C disabled results in a link failure:
sound/built-in.o: In function `wm8985_i2c_probe':
:(.text+0x44914): undefined reference to `__devm_regmap_init_i2c'
sound/built-in.o: In function `wm8985_exit':
:(.exit.text+0x3d8): undefined reference to `i2c_del_driver'
sound/built-in.o: In function `wm8985_modinit':
:(.init.text+0x1454): undefined reference to `i2c_register_driver'
This adds a Kconfig dependency the way that the other codec
drivers have it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 811e66de2241 ("ASoC: wm8985: add support for WM8758")
---
sound/soc/codecs/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index cb57f8fe2690..f555a5a004f7 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -986,6 +986,7 @@ config SND_SOC_WM8983
config SND_SOC_WM8985
tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
+ depends on I2C
config SND_SOC_WM8988
tristate
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] ASoC: fix ABE_TWL6040 dependency
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
@ 2016-06-13 15:39 ` Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: fix ABE_TWL6040 dependency" to the asoc tree Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: cs53l30: include gpio/consumer.h Arnd Bergmann
` (3 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Arnd Bergmann @ 2016-06-13 15:39 UTC (permalink / raw)
To: Mark Brown
Cc: Arnd Bergmann, Peter Ujfalusi, Jarkko Nikula, Liam Girdwood,
alsa-devel, linux-omap, linux-kernel
The TWL6040 ASoC support has recently started turning on CLK_TWL6040,
but that fails to build when CONFIG_COMMON_CLK is disabled:
warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects CLK_TWL6040 which has unmet direct dependencies (COMMON_CLK && TWL6040_CORE)
0xF18E38F6 Thu Jun 9 18:57:32 CEST 2016 failed
In file included from ../include/linux/clocksource.h:18:0,
from ../drivers/clocksource/timer-nps.c:34:
../include/linux/of.h:1005:20: error: comparison of distinct pointer types lacks a cast [-Werror]
.data = (fn == (fn_type)NULL) ? fn : fn }
^
This adds a dependency to avoid the invalid configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 443500a3927a ("ASoC: omap: Kconfig: SND_OMAP_SOC_OMAP_ABE_TWL6040 to select CLK_TWL6040")
---
sound/soc/omap/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 5c471d920898..f5451c78ede5 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -100,7 +100,7 @@ config SND_OMAP_SOC_OMAP_TWL4030
config SND_OMAP_SOC_OMAP_ABE_TWL6040
tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
- depends on TWL6040_CORE && SND_OMAP_SOC
+ depends on TWL6040_CORE && SND_OMAP_SOC && COMMON_CLK
depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
select SND_OMAP_SOC_DMIC
select SND_OMAP_SOC_MCPDM
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] ASoC: cs53l30: include gpio/consumer.h
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
2016-06-13 15:39 ` [PATCH] ASoC: fix ABE_TWL6040 dependency Arnd Bergmann
@ 2016-06-13 15:39 ` Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: cs53l30: include gpio/consumer.h" to the asoc tree Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration Arnd Bergmann
` (2 subsequent siblings)
4 siblings, 1 reply; 10+ messages in thread
From: Arnd Bergmann @ 2016-06-13 15:39 UTC (permalink / raw)
To: Mark Brown
Cc: Arnd Bergmann, Brian Austin, Paul Handrigan, Liam Girdwood,
Nicolin Chen, alsa-devel, linux-kernel
When GPIOLIB is disabled, we don't see the declarations from
gpio/consumer.h, so we have to include the header explicitly
to avoid this build error:
sound/soc/codecs/cs53l30.c: In function 'cs53l30_i2c_probe':
sound/soc/codecs/cs53l30.c:931:24: error: implicit declaration of function 'devm_gpiod_get_optional' [-Werror=implicit-function-declaration]
cs53l30->reset_gpio = devm_gpiod_get_optional(dev, reset,
^~~~~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/cs53l30.c:932:13: error: 'GPIOD_OUT_LOW' undeclared (first use in this function)
GPIOD_OUT_LOW);
^~~~~~~~~~~~~
sound/soc/codecs/cs53l30.c:932:13: note: each undeclared identifier is reported only once for each function it appears in
sound/soc/codecs/cs53l30.c:939:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration]
gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/soc/codecs/cs53l30.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index ac90dd79857e..aa511e70099e 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -17,6 +17,7 @@
#include <linux/i2c.h>
#include <linux/module.h>
#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/regulator/consumer.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
2016-06-13 15:39 ` [PATCH] ASoC: fix ABE_TWL6040 dependency Arnd Bergmann
2016-06-13 15:39 ` [PATCH] ASoC: cs53l30: include gpio/consumer.h Arnd Bergmann
@ 2016-06-13 15:39 ` Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: pcm1681/pcm1791: fix typo in declaration" to the asoc tree Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: rcar: fix 'const static' variables Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: wm8985: add i2c dependency" " Mark Brown
4 siblings, 1 reply; 10+ messages in thread
From: Arnd Bergmann @ 2016-06-13 15:39 UTC (permalink / raw)
To: Mark Brown
Cc: Arnd Bergmann, Liam Girdwood, Axel Lin, alsa-devel, linux-kernel
gcc -Wextra warns about an obvious but harmless typo in the
pcm1681_writeable_reg function, which has an extra 'register
keyword', and in pcm179x, which has a second copy of that
declaration:
sound/soc/codecs/pcm1681.c:76:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration]
sound/soc/codecs/pcm179x.c:62:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration]
For consistency with the rest of the file, I'm changing this from
'unsigned register' to 'unsigned int', which has the same meaning
but causes no warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/soc/codecs/pcm1681.c | 2 +-
sound/soc/codecs/pcm179x.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 58325234285c..33e1fc2d1598 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -73,7 +73,7 @@ static bool pcm1681_accessible_reg(struct device *dev, unsigned int reg)
return !((reg == 0x00) || (reg == 0x0f));
}
-static bool pcm1681_writeable_reg(struct device *dev, unsigned register reg)
+static bool pcm1681_writeable_reg(struct device *dev, unsigned int reg)
{
return pcm1681_accessible_reg(dev, reg) &&
(reg != PCM1681_ZERO_DETECT_STATUS);
diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c
index 06a66579ca6d..88fbdd184aa0 100644
--- a/sound/soc/codecs/pcm179x.c
+++ b/sound/soc/codecs/pcm179x.c
@@ -59,7 +59,7 @@ static bool pcm179x_accessible_reg(struct device *dev, unsigned int reg)
return reg >= 0x10 && reg <= 0x17;
}
-static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg)
+static bool pcm179x_writeable_reg(struct device *dev, unsigned int reg)
{
bool accessible;
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH] ASoC: rcar: fix 'const static' variables
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
` (2 preceding siblings ...)
2016-06-13 15:39 ` [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration Arnd Bergmann
@ 2016-06-13 15:39 ` Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: rcar: fix 'const static' variables" to the asoc tree Mark Brown
2016-06-13 16:54 ` Applied "ASoC: wm8985: add i2c dependency" " Mark Brown
4 siblings, 1 reply; 10+ messages in thread
From: Arnd Bergmann @ 2016-06-13 15:39 UTC (permalink / raw)
To: Mark Brown
Cc: Arnd Bergmann, Liam Girdwood, Kuninori Morimoto, alsa-devel,
linux-kernel
When building with 'make W=1', we get a harmless warning about
slightly incorrect prototypes in the rcar audio driver:
sound/soc/sh/rcar/gen.c: In function 'rsnd_gen2_probe':
sound/soc/sh/rcar/gen.c:209:2: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration]
This changes the 'const static' to 'static const' as it should be.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
sound/soc/sh/rcar/gen.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 46c0ba7b6414..7d2fdf8dd188 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -206,7 +206,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
*/
static int rsnd_gen2_probe(struct rsnd_priv *priv)
{
- const static struct rsnd_regmap_field_conf conf_ssiu[] = {
+ static const struct rsnd_regmap_field_conf conf_ssiu[] = {
RSND_GEN_S_REG(SSI_MODE0, 0x800),
RSND_GEN_S_REG(SSI_MODE1, 0x804),
RSND_GEN_S_REG(SSI_MODE2, 0x808),
@@ -221,7 +221,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
RSND_GEN_M_REG(SSI_INT_ENABLE, 0x18, 0x80),
};
- const static struct rsnd_regmap_field_conf conf_scu[] = {
+ static const struct rsnd_regmap_field_conf conf_scu[] = {
RSND_GEN_M_REG(SRC_I_BUSIF_MODE,0x0, 0x20),
RSND_GEN_M_REG(SRC_O_BUSIF_MODE,0x4, 0x20),
RSND_GEN_M_REG(SRC_BUSIF_DALIGN,0x8, 0x20),
@@ -308,7 +308,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
RSND_GEN_M_REG(DVC_VOL7R, 0xe44, 0x100),
RSND_GEN_M_REG(DVC_DVUER, 0xe48, 0x100),
};
- const static struct rsnd_regmap_field_conf conf_adg[] = {
+ static const struct rsnd_regmap_field_conf conf_adg[] = {
RSND_GEN_S_REG(BRRA, 0x00),
RSND_GEN_S_REG(BRRB, 0x04),
RSND_GEN_S_REG(SSICKR, 0x08),
@@ -328,7 +328,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
RSND_GEN_S_REG(SRCOUT_TIMSEL4, 0x58),
RSND_GEN_S_REG(CMDOUT_TIMSEL, 0x5c),
};
- const static struct rsnd_regmap_field_conf conf_ssi[] = {
+ static const struct rsnd_regmap_field_conf conf_ssi[] = {
RSND_GEN_M_REG(SSICR, 0x00, 0x40),
RSND_GEN_M_REG(SSISR, 0x04, 0x40),
RSND_GEN_M_REG(SSITDR, 0x08, 0x40),
@@ -359,14 +359,14 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
static int rsnd_gen1_probe(struct rsnd_priv *priv)
{
- const static struct rsnd_regmap_field_conf conf_adg[] = {
+ static const struct rsnd_regmap_field_conf conf_adg[] = {
RSND_GEN_S_REG(BRRA, 0x00),
RSND_GEN_S_REG(BRRB, 0x04),
RSND_GEN_S_REG(SSICKR, 0x08),
RSND_GEN_S_REG(AUDIO_CLK_SEL0, 0x0c),
RSND_GEN_S_REG(AUDIO_CLK_SEL1, 0x10),
};
- const static struct rsnd_regmap_field_conf conf_ssi[] = {
+ static const struct rsnd_regmap_field_conf conf_ssi[] = {
RSND_GEN_M_REG(SSICR, 0x00, 0x40),
RSND_GEN_M_REG(SSISR, 0x04, 0x40),
RSND_GEN_M_REG(SSITDR, 0x08, 0x40),
--
2.7.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Applied "ASoC: rcar: fix 'const static' variables" to the asoc tree
2016-06-13 15:39 ` [PATCH] ASoC: rcar: fix 'const static' variables Arnd Bergmann
@ 2016-06-13 16:54 ` Mark Brown
0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2016-06-13 16:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mark Brown, Mark Brown, Kuninori Morimoto, alsa-devel,
Liam Girdwood, linux-kernel
The patch
ASoC: rcar: fix 'const static' variables
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From cc9bdcf2a4f0cedf7b7425a54578a82bf31dd8f9 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 13 Jun 2016 17:39:46 +0200
Subject: [PATCH] ASoC: rcar: fix 'const static' variables
When building with 'make W=1', we get a harmless warning about
slightly incorrect prototypes in the rcar audio driver:
sound/soc/sh/rcar/gen.c: In function 'rsnd_gen2_probe':
sound/soc/sh/rcar/gen.c:209:2: error: 'static' is not at beginning of declaration [-Werror=old-style-declaration]
This changes the 'const static' to 'static const' as it should be.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/sh/rcar/gen.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
index 46c0ba7b6414..7d2fdf8dd188 100644
--- a/sound/soc/sh/rcar/gen.c
+++ b/sound/soc/sh/rcar/gen.c
@@ -206,7 +206,7 @@ static int _rsnd_gen_regmap_init(struct rsnd_priv *priv,
*/
static int rsnd_gen2_probe(struct rsnd_priv *priv)
{
- const static struct rsnd_regmap_field_conf conf_ssiu[] = {
+ static const struct rsnd_regmap_field_conf conf_ssiu[] = {
RSND_GEN_S_REG(SSI_MODE0, 0x800),
RSND_GEN_S_REG(SSI_MODE1, 0x804),
RSND_GEN_S_REG(SSI_MODE2, 0x808),
@@ -221,7 +221,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
RSND_GEN_M_REG(SSI_INT_ENABLE, 0x18, 0x80),
};
- const static struct rsnd_regmap_field_conf conf_scu[] = {
+ static const struct rsnd_regmap_field_conf conf_scu[] = {
RSND_GEN_M_REG(SRC_I_BUSIF_MODE,0x0, 0x20),
RSND_GEN_M_REG(SRC_O_BUSIF_MODE,0x4, 0x20),
RSND_GEN_M_REG(SRC_BUSIF_DALIGN,0x8, 0x20),
@@ -308,7 +308,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
RSND_GEN_M_REG(DVC_VOL7R, 0xe44, 0x100),
RSND_GEN_M_REG(DVC_DVUER, 0xe48, 0x100),
};
- const static struct rsnd_regmap_field_conf conf_adg[] = {
+ static const struct rsnd_regmap_field_conf conf_adg[] = {
RSND_GEN_S_REG(BRRA, 0x00),
RSND_GEN_S_REG(BRRB, 0x04),
RSND_GEN_S_REG(SSICKR, 0x08),
@@ -328,7 +328,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
RSND_GEN_S_REG(SRCOUT_TIMSEL4, 0x58),
RSND_GEN_S_REG(CMDOUT_TIMSEL, 0x5c),
};
- const static struct rsnd_regmap_field_conf conf_ssi[] = {
+ static const struct rsnd_regmap_field_conf conf_ssi[] = {
RSND_GEN_M_REG(SSICR, 0x00, 0x40),
RSND_GEN_M_REG(SSISR, 0x04, 0x40),
RSND_GEN_M_REG(SSITDR, 0x08, 0x40),
@@ -359,14 +359,14 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
static int rsnd_gen1_probe(struct rsnd_priv *priv)
{
- const static struct rsnd_regmap_field_conf conf_adg[] = {
+ static const struct rsnd_regmap_field_conf conf_adg[] = {
RSND_GEN_S_REG(BRRA, 0x00),
RSND_GEN_S_REG(BRRB, 0x04),
RSND_GEN_S_REG(SSICKR, 0x08),
RSND_GEN_S_REG(AUDIO_CLK_SEL0, 0x0c),
RSND_GEN_S_REG(AUDIO_CLK_SEL1, 0x10),
};
- const static struct rsnd_regmap_field_conf conf_ssi[] = {
+ static const struct rsnd_regmap_field_conf conf_ssi[] = {
RSND_GEN_M_REG(SSICR, 0x00, 0x40),
RSND_GEN_M_REG(SSISR, 0x04, 0x40),
RSND_GEN_M_REG(SSITDR, 0x08, 0x40),
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Applied "ASoC: pcm1681/pcm1791: fix typo in declaration" to the asoc tree
2016-06-13 15:39 ` [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration Arnd Bergmann
@ 2016-06-13 16:54 ` Mark Brown
0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2016-06-13 16:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mark Brown, Mark Brown, alsa-devel, Axel Lin, Liam Girdwood,
linux-kernel
The patch
ASoC: pcm1681/pcm1791: fix typo in declaration
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From a074ae0ed68385ee403e4247ce8274705fe9c4e0 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 13 Jun 2016 17:39:45 +0200
Subject: [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration
gcc -Wextra warns about an obvious but harmless typo in the
pcm1681_writeable_reg function, which has an extra 'register
keyword', and in pcm179x, which has a second copy of that
declaration:
sound/soc/codecs/pcm1681.c:76:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration]
sound/soc/codecs/pcm179x.c:62:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration]
For consistency with the rest of the file, I'm changing this from
'unsigned register' to 'unsigned int', which has the same meaning
but causes no warning.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/pcm1681.c | 2 +-
sound/soc/codecs/pcm179x.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 58325234285c..33e1fc2d1598 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -73,7 +73,7 @@ static bool pcm1681_accessible_reg(struct device *dev, unsigned int reg)
return !((reg == 0x00) || (reg == 0x0f));
}
-static bool pcm1681_writeable_reg(struct device *dev, unsigned register reg)
+static bool pcm1681_writeable_reg(struct device *dev, unsigned int reg)
{
return pcm1681_accessible_reg(dev, reg) &&
(reg != PCM1681_ZERO_DETECT_STATUS);
diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c
index 06a66579ca6d..88fbdd184aa0 100644
--- a/sound/soc/codecs/pcm179x.c
+++ b/sound/soc/codecs/pcm179x.c
@@ -59,7 +59,7 @@ static bool pcm179x_accessible_reg(struct device *dev, unsigned int reg)
return reg >= 0x10 && reg <= 0x17;
}
-static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg)
+static bool pcm179x_writeable_reg(struct device *dev, unsigned int reg)
{
bool accessible;
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Applied "ASoC: cs53l30: include gpio/consumer.h" to the asoc tree
2016-06-13 15:39 ` [PATCH] ASoC: cs53l30: include gpio/consumer.h Arnd Bergmann
@ 2016-06-13 16:54 ` Mark Brown
0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2016-06-13 16:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mark Brown, Mark Brown, Brian Austin, linux-kernel, alsa-devel,
Paul Handrigan, Liam Girdwood, Nicolin Chen
The patch
ASoC: cs53l30: include gpio/consumer.h
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 53d4b031e3c31cc6160c2d0cdc326fb74280d239 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 13 Jun 2016 17:39:44 +0200
Subject: [PATCH] ASoC: cs53l30: include gpio/consumer.h
When GPIOLIB is disabled, we don't see the declarations from
gpio/consumer.h, so we have to include the header explicitly
to avoid this build error:
sound/soc/codecs/cs53l30.c: In function 'cs53l30_i2c_probe':
sound/soc/codecs/cs53l30.c:931:24: error: implicit declaration of function 'devm_gpiod_get_optional' [-Werror=implicit-function-declaration]
cs53l30->reset_gpio = devm_gpiod_get_optional(dev, reset,
^~~~~~~~~~~~~~~~~~~~~~~
sound/soc/codecs/cs53l30.c:932:13: error: 'GPIOD_OUT_LOW' undeclared (first use in this function)
GPIOD_OUT_LOW);
^~~~~~~~~~~~~
sound/soc/codecs/cs53l30.c:932:13: note: each undeclared identifier is reported only once for each function it appears in
sound/soc/codecs/cs53l30.c:939:3: error: implicit declaration of function 'gpiod_set_value_cansleep' [-Werror=implicit-function-declaration]
gpiod_set_value_cansleep(cs53l30->reset_gpio, 1);
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/cs53l30.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/codecs/cs53l30.c b/sound/soc/codecs/cs53l30.c
index ac90dd79857e..aa511e70099e 100644
--- a/sound/soc/codecs/cs53l30.c
+++ b/sound/soc/codecs/cs53l30.c
@@ -17,6 +17,7 @@
#include <linux/i2c.h>
#include <linux/module.h>
#include <linux/of_gpio.h>
+#include <linux/gpio/consumer.h>
#include <linux/regulator/consumer.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Applied "ASoC: fix ABE_TWL6040 dependency" to the asoc tree
2016-06-13 15:39 ` [PATCH] ASoC: fix ABE_TWL6040 dependency Arnd Bergmann
@ 2016-06-13 16:54 ` Mark Brown
0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2016-06-13 16:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mark Brown, Mark Brown, alsa-devel, Liam Girdwood, linux-kernel,
Peter Ujfalusi, linux-omap, Jarkko Nikula
The patch
ASoC: fix ABE_TWL6040 dependency
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From d13e4362dec91304143875d9b8e1348bdfe69e63 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 13 Jun 2016 17:39:43 +0200
Subject: [PATCH] ASoC: fix ABE_TWL6040 dependency
The TWL6040 ASoC support has recently started turning on CLK_TWL6040,
but that fails to build when CONFIG_COMMON_CLK is disabled:
warning: (SND_OMAP_SOC_OMAP_ABE_TWL6040) selects CLK_TWL6040 which has unmet direct dependencies (COMMON_CLK && TWL6040_CORE)
0xF18E38F6 Thu Jun 9 18:57:32 CEST 2016 failed
In file included from ../include/linux/clocksource.h:18:0,
from ../drivers/clocksource/timer-nps.c:34:
../include/linux/of.h:1005:20: error: comparison of distinct pointer types lacks a cast [-Werror]
.data = (fn == (fn_type)NULL) ? fn : fn }
^
This adds a dependency to avoid the invalid configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 443500a3927a ("ASoC: omap: Kconfig: SND_OMAP_SOC_OMAP_ABE_TWL6040 to select CLK_TWL6040")
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/omap/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 5185a3844da9..c82fa542c9e7 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -100,7 +100,7 @@ config SND_OMAP_SOC_OMAP_TWL4030
config SND_OMAP_SOC_OMAP_ABE_TWL6040
tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
- depends on TWL6040_CORE && SND_OMAP_SOC
+ depends on TWL6040_CORE && SND_OMAP_SOC && COMMON_CLK
depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
select SND_OMAP_SOC_DMIC
select SND_OMAP_SOC_MCPDM
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Applied "ASoC: wm8985: add i2c dependency" to the asoc tree
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
` (3 preceding siblings ...)
2016-06-13 15:39 ` [PATCH] ASoC: rcar: fix 'const static' variables Arnd Bergmann
@ 2016-06-13 16:54 ` Mark Brown
4 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2016-06-13 16:54 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Mark Brown, Liam Girdwood, alsa-devel, linux-kernel, Mark Brown,
Charles Keepax, Richard Fitzgerald
The patch
ASoC: wm8985: add i2c dependency
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 05252513fbb9874a292a78aa577e5d42bb4d5ad0 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 13 Jun 2016 17:39:42 +0200
Subject: [PATCH] ASoC: wm8985: add i2c dependency
The wm8985 driver is now user-selectable, but building it with
I2C disabled results in a link failure:
sound/built-in.o: In function `wm8985_i2c_probe':
:(.text+0x44914): undefined reference to `__devm_regmap_init_i2c'
sound/built-in.o: In function `wm8985_exit':
:(.exit.text+0x3d8): undefined reference to `i2c_del_driver'
sound/built-in.o: In function `wm8985_modinit':
:(.init.text+0x1454): undefined reference to `i2c_register_driver'
This adds a Kconfig dependency the way that the other codec
drivers have it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 811e66de2241 ("ASoC: wm8985: add support for WM8758")
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 5c635f7ec0aa..f8f6dc6c6a98 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -945,6 +945,7 @@ config SND_SOC_WM8983
config SND_SOC_WM8985
tristate "Wolfson Microelectronics WM8985 and WM8758 codec driver"
+ depends on I2C
config SND_SOC_WM8988
tristate
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-06-13 16:56 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
2016-06-13 15:39 ` [PATCH] ASoC: fix ABE_TWL6040 dependency Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: fix ABE_TWL6040 dependency" to the asoc tree Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: cs53l30: include gpio/consumer.h Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: cs53l30: include gpio/consumer.h" to the asoc tree Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: pcm1681/pcm1791: fix typo in declaration" to the asoc tree Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: rcar: fix 'const static' variables Arnd Bergmann
2016-06-13 16:54 ` Applied "ASoC: rcar: fix 'const static' variables" to the asoc tree Mark Brown
2016-06-13 16:54 ` Applied "ASoC: wm8985: add i2c dependency" " Mark Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).