From: Mark Brown <broonie@kernel.org>
To: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>,
Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org
Subject: Applied "ASoC: fsl_ssi: remove register defaults" to the asoc tree
Date: Sun, 10 Jan 2016 12:22:25 +0000 [thread overview]
Message-ID: <E1aIF0r-0008O2-AV@debutante> (raw)
In-Reply-To: <5677107C.60904@maciej.szmigiero.name>
The patch
ASoC: fsl_ssi: remove register defaults
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 9f2d0be4c64f96ac575d164ede47becec1eececf Mon Sep 17 00:00:00 2001
From: "Maciej S. Szmigiero" <mail@maciej.szmigiero.name>
Date: Sun, 20 Dec 2015 21:33:00 +0100
Subject: [PATCH] ASoC: fsl_ssi: remove register defaults
There is no guarantee that on fsl_ssi module load
SSI registers will have their power-on-reset values.
In fact, if the driver is reloaded the values in
registers will be whatever they were set to previously.
This fixes hard lockup on fsl_ssi module reload,
at least in AC'97 mode.
Fixes: 05cf237972fe ("ASoC: fsl_ssi: Add driver suspend and resume to support MEGA Fast")
Signed-off-by: Maciej S. Szmigiero <mail@maciej.szmigiero.name>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/fsl/fsl_ssi.c | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index 40dfd8a36484..f6ef7d64acb3 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@ -112,20 +112,6 @@ struct fsl_ssi_rxtx_reg_val {
struct fsl_ssi_reg_val tx;
};
-static const struct reg_default fsl_ssi_reg_defaults[] = {
- {CCSR_SSI_SCR, 0x00000000},
- {CCSR_SSI_SIER, 0x00003003},
- {CCSR_SSI_STCR, 0x00000200},
- {CCSR_SSI_SRCR, 0x00000200},
- {CCSR_SSI_STCCR, 0x00040000},
- {CCSR_SSI_SRCCR, 0x00040000},
- {CCSR_SSI_SACNT, 0x00000000},
- {CCSR_SSI_STMSK, 0x00000000},
- {CCSR_SSI_SRMSK, 0x00000000},
- {CCSR_SSI_SACCEN, 0x00000000},
- {CCSR_SSI_SACCDIS, 0x00000000},
-};
-
static bool fsl_ssi_readable_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
@@ -190,8 +176,6 @@ static const struct regmap_config fsl_ssi_regconfig = {
.val_bits = 32,
.reg_stride = 4,
.val_format_endian = REGMAP_ENDIAN_NATIVE,
- .reg_defaults = fsl_ssi_reg_defaults,
- .num_reg_defaults = ARRAY_SIZE(fsl_ssi_reg_defaults),
.readable_reg = fsl_ssi_readable_reg,
.volatile_reg = fsl_ssi_volatile_reg,
.precious_reg = fsl_ssi_precious_reg,
--
2.7.0.rc3
next prev parent reply other threads:[~2016-01-10 12:22 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-20 20:33 [PATCH 3/3] ASoC: fsl_ssi: remove register defaults Maciej S. Szmigiero
2015-12-23 13:13 ` Fabio Estevam
2016-01-10 12:22 ` Mark Brown [this message]
2016-01-10 21:36 ` Timur Tabi
2016-01-11 12:04 ` Fabio Estevam
2016-01-11 12:10 ` Fabio Estevam
2016-01-11 13:57 ` Maciej S. Szmigiero
2016-01-11 14:05 ` Fabio Estevam
2016-01-16 23:56 ` Maciej S. Szmigiero
2016-01-17 0:10 ` Timur Tabi
2016-01-17 1:01 ` Maciej S. Szmigiero
2016-01-17 5:16 ` Timur Tabi
2016-01-17 14:16 ` Maciej S. Szmigiero
2016-01-17 14:39 ` Maciej S. Szmigiero
2016-01-17 18:38 ` Timur Tabi
2016-01-17 22:02 ` Maciej S. Szmigiero
2016-01-18 12:51 ` Fabio Estevam
2016-01-18 19:08 ` Maciej S. Szmigiero
2016-01-27 18:37 ` Applied "ASoC: fsl_ssi: remove explicit register defaults" to the asoc tree Mark Brown
2016-02-22 3:14 ` Mark Brown
2016-01-11 14:00 ` [PATCH 3/3] ASoC: fsl_ssi: remove register defaults Mark Brown
2016-01-11 14:10 ` Maciej S. Szmigiero
2016-01-11 14:54 ` Mark Brown
2016-01-11 15:45 ` Timur Tabi
2016-01-11 16:12 ` Mark Brown
2016-01-12 1:23 ` Timur Tabi
2016-01-12 1:34 ` Mark Brown
2016-01-12 1:53 ` Timur Tabi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1aIF0r-0008O2-AV@debutante \
--to=broonie@kernel.org \
--cc=alsa-devel@alsa-project.org \
--cc=mail@maciej.szmigiero.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).