ASoC: fsl-sai: add default register map for regmap cache
diff mbox

Message ID 1445843945-13319-2-git-send-email-zidan.wang@freescale.com
State Accepted
Commit 3f6f5b0cb3e3dc8fdd4eb826f30257df423b37cb
Headers show

Commit Message

Zidan Wang Oct. 26, 2015, 7:19 a.m. UTC
FSL_SAI_TDR register is writable and not readable. According to
regmap_volatile() function, if FSL_SAI_TDR want to be volatile,
it should be readable. So we should remove FSL_SAI_TDR from volatile
register list.

If the flat cache don't have default register map, when do regcache_sync
operation, the non volatile and writable registers will be synchronised
to 0. FSL_SAI_TDR reigster will be written a 0 and cause channel swap.
So add default register map for flat cache, and such register will not
be written.

Signed-off-by: Zidan Wang <zidan.wang@freescale.com>
---
 sound/soc/fsl/fsl_sai.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

Comments

Nicolin Chen Oct. 27, 2015, 7:40 p.m. UTC | #1
On Mon, Oct 26, 2015 at 03:19:03PM +0800, Zidan Wang wrote:
> FSL_SAI_TDR register is writable and not readable. According to
> regmap_volatile() function, if FSL_SAI_TDR want to be volatile,
> it should be readable. So we should remove FSL_SAI_TDR from volatile
> register list.

It'd be nicer to see the other two commit logs are as detailed
as this one. When people in the future rewind one of the other
drivers through git-log, they will be less clear since they may
not pay attention to this one. But I can ignore this time as it 
doesn't matter imo.

> If the flat cache don't have default register map, when do regcache_sync
> operation, the non volatile and writable registers will be synchronised
> to 0. FSL_SAI_TDR reigster will be written a 0 and cause channel swap.
> So add default register map for flat cache, and such register will not
> be written.
> 
> Signed-off-by: Zidan Wang <zidan.wang@freescale.com>

For the whole series,

Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>

Thank you

> ---
>  sound/soc/fsl/fsl_sai.c | 20 ++++++++++++++++++--
>  1 file changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index 784725b..18101b9 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -608,6 +608,22 @@ static const struct snd_soc_component_driver fsl_component = {
>  	.name           = "fsl-sai",
>  };
>  
> +static struct reg_default fsl_sai_reg_defaults[] = {
> +	{FSL_SAI_TCR1, 0},
> +	{FSL_SAI_TCR2, 0},
> +	{FSL_SAI_TCR3, 0},
> +	{FSL_SAI_TCR4, 0},
> +	{FSL_SAI_TCR5, 0},
> +	{FSL_SAI_TDR,  0},
> +	{FSL_SAI_TMR,  0},
> +	{FSL_SAI_RCR1, 0},
> +	{FSL_SAI_RCR2, 0},
> +	{FSL_SAI_RCR3, 0},
> +	{FSL_SAI_RCR4, 0},
> +	{FSL_SAI_RCR5, 0},
> +	{FSL_SAI_RMR,  0},
> +};
> +
>  static bool fsl_sai_readable_reg(struct device *dev, unsigned int reg)
>  {
>  	switch (reg) {
> @@ -641,13 +657,11 @@ static bool fsl_sai_volatile_reg(struct device *dev, unsigned int reg)
>  	case FSL_SAI_RCSR:
>  	case FSL_SAI_TFR:
>  	case FSL_SAI_RFR:
> -	case FSL_SAI_TDR:
>  	case FSL_SAI_RDR:
>  		return true;
>  	default:
>  		return false;
>  	}
> -
>  }
>  
>  static bool fsl_sai_writeable_reg(struct device *dev, unsigned int reg)
> @@ -680,6 +694,8 @@ static const struct regmap_config fsl_sai_regmap_config = {
>  	.val_bits = 32,
>  
>  	.max_register = FSL_SAI_RMR,
> +	.reg_defaults = fsl_sai_reg_defaults,
> +	.num_reg_defaults = ARRAY_SIZE(fsl_sai_reg_defaults),
>  	.readable_reg = fsl_sai_readable_reg,
>  	.volatile_reg = fsl_sai_volatile_reg,
>  	.writeable_reg = fsl_sai_writeable_reg,
> -- 
> 1.9.1
>

Patch
diff mbox

diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 784725b..18101b9 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -608,6 +608,22 @@  static const struct snd_soc_component_driver fsl_component = {
 	.name           = "fsl-sai",
 };
 
+static struct reg_default fsl_sai_reg_defaults[] = {
+	{FSL_SAI_TCR1, 0},
+	{FSL_SAI_TCR2, 0},
+	{FSL_SAI_TCR3, 0},
+	{FSL_SAI_TCR4, 0},
+	{FSL_SAI_TCR5, 0},
+	{FSL_SAI_TDR,  0},
+	{FSL_SAI_TMR,  0},
+	{FSL_SAI_RCR1, 0},
+	{FSL_SAI_RCR2, 0},
+	{FSL_SAI_RCR3, 0},
+	{FSL_SAI_RCR4, 0},
+	{FSL_SAI_RCR5, 0},
+	{FSL_SAI_RMR,  0},
+};
+
 static bool fsl_sai_readable_reg(struct device *dev, unsigned int reg)
 {
 	switch (reg) {
@@ -641,13 +657,11 @@  static bool fsl_sai_volatile_reg(struct device *dev, unsigned int reg)
 	case FSL_SAI_RCSR:
 	case FSL_SAI_TFR:
 	case FSL_SAI_RFR:
-	case FSL_SAI_TDR:
 	case FSL_SAI_RDR:
 		return true;
 	default:
 		return false;
 	}
-
 }
 
 static bool fsl_sai_writeable_reg(struct device *dev, unsigned int reg)
@@ -680,6 +694,8 @@  static const struct regmap_config fsl_sai_regmap_config = {
 	.val_bits = 32,
 
 	.max_register = FSL_SAI_RMR,
+	.reg_defaults = fsl_sai_reg_defaults,
+	.num_reg_defaults = ARRAY_SIZE(fsl_sai_reg_defaults),
 	.readable_reg = fsl_sai_readable_reg,
 	.volatile_reg = fsl_sai_volatile_reg,
 	.writeable_reg = fsl_sai_writeable_reg,