| Message ID | 20230712124934.32232-1-matuszpd@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 269f399dc19f0e5c51711c3ba3bd06e0ef6ef403 |
| Headers | show |
| Series | ASoC: fsl_sai: Disable bit clock with transmitter | expand |
On Wed, Jul 12, 2023 at 8:53 PM Matus Gajdos <matuszpd@gmail.com> wrote: > Otherwise bit clock remains running writing invalid data to the DAC. > > Signed-off-by: Matus Gajdos <matuszpd@gmail.com> > Acked-by: Shengjiu Wang <shengjiu.wang@gmail.com> Best regards Wang Shengjiu > --- > sound/soc/fsl/fsl_sai.c | 2 +- > sound/soc/fsl/fsl_sai.h | 1 + > 2 files changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index 5e09f634c61b..dcc7fbe7acac 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -719,7 +719,7 @@ static void fsl_sai_config_disable(struct fsl_sai > *sai, int dir) > u32 xcsr, count = 100; > > regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), > - FSL_SAI_CSR_TERE, 0); > + FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE, 0); > > /* TERE will remain set till the end of current frame */ > do { > diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h > index 8254c3547b87..550df87b6a06 100644 > --- a/sound/soc/fsl/fsl_sai.h > +++ b/sound/soc/fsl/fsl_sai.h > @@ -91,6 +91,7 @@ > /* SAI Transmit/Receive Control Register */ > #define FSL_SAI_CSR_TERE BIT(31) > #define FSL_SAI_CSR_SE BIT(30) > +#define FSL_SAI_CSR_BCE BIT(28) > #define FSL_SAI_CSR_FR BIT(25) > #define FSL_SAI_CSR_SR BIT(24) > #define FSL_SAI_CSR_xF_SHIFT 16 > -- > 2.25.1 > >
On Wed, Jul 12, 2023 at 9:53 AM Matus Gajdos <matuszpd@gmail.com> wrote: > > Otherwise bit clock remains running writing invalid data to the DAC. > > Signed-off-by: Matus Gajdos <matuszpd@gmail.com> Should this contain a Fixes tag so that it could be backported to stable kernels?
On Mon, Jul 17, 2023 at 09:31:38AM -0300, Fabio Estevam wrote: > On Wed, Jul 12, 2023 at 9:53 AM Matus Gajdos <matuszpd@gmail.com> wrote: > > > > Otherwise bit clock remains running writing invalid data to the DAC. > > > > Signed-off-by: Matus Gajdos <matuszpd@gmail.com> > > Should this contain a Fixes tag so that it could be backported to > stable kernels? I'll just put a non-specific Cc stable tag on it, that should be enough to get it backported.
On Mon, Jul 17, 2023 at 9:55 AM Mark Brown <broonie@kernel.org> wrote: > I'll just put a non-specific Cc stable tag on it, that should be enough > to get it backported. Sounds good. Thanks, Mark.
On Wed, 12 Jul 2023 14:49:33 +0200, Matus Gajdos wrote: > Otherwise bit clock remains running writing invalid data to the DAC. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/1] ASoC: fsl_sai: Disable bit clock with transmitter commit: 269f399dc19f0e5c51711c3ba3bd06e0ef6ef403 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
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index 5e09f634c61b..dcc7fbe7acac 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -719,7 +719,7 @@ static void fsl_sai_config_disable(struct fsl_sai *sai, int dir) u32 xcsr, count = 100; regmap_update_bits(sai->regmap, FSL_SAI_xCSR(tx, ofs), - FSL_SAI_CSR_TERE, 0); + FSL_SAI_CSR_TERE | FSL_SAI_CSR_BCE, 0); /* TERE will remain set till the end of current frame */ do { diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 8254c3547b87..550df87b6a06 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -91,6 +91,7 @@ /* SAI Transmit/Receive Control Register */ #define FSL_SAI_CSR_TERE BIT(31) #define FSL_SAI_CSR_SE BIT(30) +#define FSL_SAI_CSR_BCE BIT(28) #define FSL_SAI_CSR_FR BIT(25) #define FSL_SAI_CSR_SR BIT(24) #define FSL_SAI_CSR_xF_SHIFT 16
Otherwise bit clock remains running writing invalid data to the DAC. Signed-off-by: Matus Gajdos <matuszpd@gmail.com> --- sound/soc/fsl/fsl_sai.c | 2 +- sound/soc/fsl/fsl_sai.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)