* [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap
@ 2015-07-19 1:14 Axel Lin
2015-07-19 1:15 ` [PATCH 2/2] ASoC: cs4349: Drop platform data support Axel Lin
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Axel Lin @ 2015-07-19 1:14 UTC (permalink / raw)
To: Mark Brown
Cc: Brian Austin, alsa-devel, Liam Girdwood, Paul Handrigan, Tim Howe
The first valid register index is 1 rather than 0, and the CS4349_CHIPID
is readonly. So set .writeable_reg to avoid writing to these registers.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
sound/soc/codecs/cs4349.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index f4fccc6..eb55889 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -54,14 +54,17 @@ struct cs4349_private {
static bool cs4349_readable_register(struct device *dev, unsigned int reg)
{
switch (reg) {
- case CS4349_CHIPID:
- case CS4349_MODE:
- case CS4349_VMI:
- case CS4349_MUTE:
- case CS4349_VOLA:
- case CS4349_VOLB:
- case CS4349_RMPFLT:
- case CS4349_MISC:
+ case CS4349_CHIPID ... CS4349_MISC:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static bool cs4349_writeable_register(struct device *dev, unsigned int reg)
+{
+ switch (reg) {
+ case CS4349_MODE ... CS4349_MISC:
return true;
default:
return false;
@@ -272,6 +275,7 @@ static const struct regmap_config cs4349_regmap = {
.reg_defaults = cs4349_reg_defaults,
.num_reg_defaults = ARRAY_SIZE(cs4349_reg_defaults),
.readable_reg = cs4349_readable_register,
+ .writeable_reg = cs4349_writeable_register,
.cache_type = REGCACHE_RBTREE,
};
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] ASoC: cs4349: Drop platform data support
2015-07-19 1:14 [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Axel Lin
@ 2015-07-19 1:15 ` Axel Lin
2015-07-20 17:52 ` Applied "ASoC: cs4349: Drop platform data support" to the asoc tree Mark Brown
2015-07-20 17:52 ` Applied "ASoC: cs4349: Set .writeable_reg for cs4349_regmap" " Mark Brown
2015-07-30 21:19 ` [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Tim Howe
2 siblings, 1 reply; 5+ messages in thread
From: Axel Lin @ 2015-07-19 1:15 UTC (permalink / raw)
To: Mark Brown
Cc: Brian Austin, alsa-devel, Liam Girdwood, Paul Handrigan, Tim Howe
The struct cs4349_platform_data should be defined in a public header in
include/sound/ rather than in sound/soc/codecs folder.
In additional, the platform data support is not properly handled in this
driver so remove it now.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
---
sound/soc/codecs/cs4349.c | 7 +------
sound/soc/codecs/cs4349.h | 7 -------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index eb55889..7befc05 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -45,7 +45,6 @@ static const struct reg_default cs4349_reg_defaults[] = {
/* Private data for the CS4349 */
struct cs4349_private {
struct regmap *regmap;
- struct cs4349_platform_data pdata;
struct gpio_desc *reset_gpio;
unsigned int mode;
int rate;
@@ -283,8 +282,7 @@ static int cs4349_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct cs4349_private *cs4349;
- struct cs4349_platform_data *pdata = dev_get_platdata(&client->dev);
- int ret = 0;
+ int ret;
cs4349 = devm_kzalloc(&client->dev, sizeof(*cs4349), GFP_KERNEL);
if (!cs4349)
@@ -297,9 +295,6 @@ static int cs4349_i2c_probe(struct i2c_client *client,
return ret;
}
- if (pdata)
- cs4349->pdata = *pdata;
-
/* Reset the Device */
cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev,
"reset", GPIOD_OUT_LOW);
diff --git a/sound/soc/codecs/cs4349.h b/sound/soc/codecs/cs4349.h
index 7effa0a..d58c06a 100644
--- a/sound/soc/codecs/cs4349.h
+++ b/sound/soc/codecs/cs4349.h
@@ -19,13 +19,6 @@
#ifndef __CS4349_H__
#define __CS4349_H__
-struct cs4349_platform_data {
-
- /* GPIO for Reset */
- unsigned int gpio_nreset;
-
-};
-
/* CS4349 registers addresses */
#define CS4349_CHIPID 0x01 /* Device and Rev ID, Read Only */
#define CS4349_MODE 0x02 /* Mode Control */
--
2.1.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: cs4349: Drop platform data support" to the asoc tree
2015-07-19 1:15 ` [PATCH 2/2] ASoC: cs4349: Drop platform data support Axel Lin
@ 2015-07-20 17:52 ` Mark Brown
0 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2015-07-20 17:52 UTC (permalink / raw)
To: Axel Lin, Mark Brown; +Cc: alsa-devel
The patch
ASoC: cs4349: Drop platform data support
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 44251551dfca2117e42349136b871b33c8419a59 Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 19 Jul 2015 09:15:38 +0800
Subject: [PATCH] ASoC: cs4349: Drop platform data support
The struct cs4349_platform_data should be defined in a public header in
include/sound/ rather than in sound/soc/codecs folder.
In additional, the platform data support is not properly handled in this
driver so remove it now.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/cs4349.c | 7 +------
sound/soc/codecs/cs4349.h | 7 -------
2 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index a6604a34db34..2569010ee396 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -45,7 +45,6 @@ static const struct reg_default cs4349_reg_defaults[] = {
/* Private data for the CS4349 */
struct cs4349_private {
struct regmap *regmap;
- struct cs4349_platform_data pdata;
struct gpio_desc *reset_gpio;
unsigned int mode;
int rate;
@@ -281,8 +280,7 @@ static int cs4349_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct cs4349_private *cs4349;
- struct cs4349_platform_data *pdata = dev_get_platdata(&client->dev);
- int ret = 0;
+ int ret;
cs4349 = devm_kzalloc(&client->dev, sizeof(*cs4349), GFP_KERNEL);
if (!cs4349)
@@ -295,9 +293,6 @@ static int cs4349_i2c_probe(struct i2c_client *client,
return ret;
}
- if (pdata)
- cs4349->pdata = *pdata;
-
/* Reset the Device */
cs4349->reset_gpio = devm_gpiod_get_optional(&client->dev,
"reset", GPIOD_OUT_LOW);
diff --git a/sound/soc/codecs/cs4349.h b/sound/soc/codecs/cs4349.h
index 7effa0acec28..d58c06a25358 100644
--- a/sound/soc/codecs/cs4349.h
+++ b/sound/soc/codecs/cs4349.h
@@ -19,13 +19,6 @@
#ifndef __CS4349_H__
#define __CS4349_H__
-struct cs4349_platform_data {
-
- /* GPIO for Reset */
- unsigned int gpio_nreset;
-
-};
-
/* CS4349 registers addresses */
#define CS4349_CHIPID 0x01 /* Device and Rev ID, Read Only */
#define CS4349_MODE 0x02 /* Mode Control */
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Applied "ASoC: cs4349: Set .writeable_reg for cs4349_regmap" to the asoc tree
2015-07-19 1:14 [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Axel Lin
2015-07-19 1:15 ` [PATCH 2/2] ASoC: cs4349: Drop platform data support Axel Lin
@ 2015-07-20 17:52 ` Mark Brown
2015-07-30 21:19 ` [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Tim Howe
2 siblings, 0 replies; 5+ messages in thread
From: Mark Brown @ 2015-07-20 17:52 UTC (permalink / raw)
To: Axel Lin, Mark Brown; +Cc: alsa-devel
The patch
ASoC: cs4349: Set .writeable_reg for cs4349_regmap
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 0443de7e7e559eab7df2566d0e46940f753db51d Mon Sep 17 00:00:00 2001
From: Axel Lin <axel.lin@ingics.com>
Date: Sun, 19 Jul 2015 09:14:23 +0800
Subject: [PATCH] ASoC: cs4349: Set .writeable_reg for cs4349_regmap
The first valid register index is 1 rather than 0, and the CS4349_CHIPID
is readonly. So set .writeable_reg to avoid writing to these registers.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/cs4349.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index 4885695e35a7..a6604a34db34 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -54,14 +54,17 @@ struct cs4349_private {
static bool cs4349_readable_register(struct device *dev, unsigned int reg)
{
switch (reg) {
- case CS4349_CHIPID:
- case CS4349_MODE:
- case CS4349_VMI:
- case CS4349_MUTE:
- case CS4349_VOLA:
- case CS4349_VOLB:
- case CS4349_RMPFLT:
- case CS4349_MISC:
+ case CS4349_CHIPID ... CS4349_MISC:
+ return true;
+ default:
+ return false;
+ }
+}
+
+static bool cs4349_writeable_register(struct device *dev, unsigned int reg)
+{
+ switch (reg) {
+ case CS4349_MODE ... CS4349_MISC:
return true;
default:
return false;
@@ -270,6 +273,7 @@ static const struct regmap_config cs4349_regmap = {
.reg_defaults = cs4349_reg_defaults,
.num_reg_defaults = ARRAY_SIZE(cs4349_reg_defaults),
.readable_reg = cs4349_readable_register,
+ .writeable_reg = cs4349_writeable_register,
.cache_type = REGCACHE_RBTREE,
};
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap
2015-07-19 1:14 [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Axel Lin
2015-07-19 1:15 ` [PATCH 2/2] ASoC: cs4349: Drop platform data support Axel Lin
2015-07-20 17:52 ` Applied "ASoC: cs4349: Set .writeable_reg for cs4349_regmap" " Mark Brown
@ 2015-07-30 21:19 ` Tim Howe
2 siblings, 0 replies; 5+ messages in thread
From: Tim Howe @ 2015-07-30 21:19 UTC (permalink / raw)
To: Axel Lin
Cc: alsa-devel, Brian Austin, Paul Handrigan, Liam Girdwood,
Mark Brown, Tim Howe
On Sat, 18 Jul 2015, Axel Lin wrote:
> The first valid register index is 1 rather than 0, and the CS4349_CHIPID
> is readonly. So set .writeable_reg to avoid writing to these registers.
>
> Signed-off-by: Axel Lin <axel.lin@ingics.com>
> ---
> sound/soc/codecs/cs4349.c | 20 ++++++++++++--------
> 1 file changed, 12 insertions(+), 8 deletions(-)
>
For both patches
Thank you!
Acked-by: Tim Howe <tim.howe@cirrus.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-30 21:19 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-19 1:14 [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Axel Lin
2015-07-19 1:15 ` [PATCH 2/2] ASoC: cs4349: Drop platform data support Axel Lin
2015-07-20 17:52 ` Applied "ASoC: cs4349: Drop platform data support" to the asoc tree Mark Brown
2015-07-20 17:52 ` Applied "ASoC: cs4349: Set .writeable_reg for cs4349_regmap" " Mark Brown
2015-07-30 21:19 ` [PATCH 1/2] ASoC: cs4349: Set .writeable_reg for cs4349_regmap Tim Howe
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.