summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-30 21:27:16 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-08-30 21:27:16 -0400
commitbe4744bc64f768231c9012473286952f91985699 (patch)
treeff361f6d8e821c360349cbba40309b6323f50ebc
parent7ed795c9683586a5569d7fc8433b81419b818acb (diff)
downloadlongterm-queue-5.2-be4744bc64f768231c9012473286952f91985699.tar.gz
ASoC: meson: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch b/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch
index f7bc3497..6dbcf617 100644
--- a/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch
+++ b/queue/ASoC-meson-axg-tdm-formatters-fix-sclk-inversion.patch
@@ -1,4 +1,4 @@
-From 0d3f01dcdc234001f979a0af0b6b31cb9f25b6c1 Mon Sep 17 00:00:00 2001
+From 7b27cb082192456d5c90a0abc59e9c897f5e2337 Mon Sep 17 00:00:00 2001
From: Jerome Brunet <jbrunet@baylibre.com>
Date: Wed, 29 Jul 2020 17:44:55 +0200
Subject: [PATCH] ASoC: meson: axg-tdm-formatters: fix sclk inversion
@@ -18,10 +18,10 @@ Link: https://lore.kernel.org/r/20200729154456.1983396-4-jbrunet@baylibre.com
Signed-off-by: Mark Brown <broonie@kernel.org>
diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c
-index 358c8c0d861c..f7e8e9da68a0 100644
+index 0c6cce5c5773..9bcaf4b8b57e 100644
--- a/sound/soc/meson/axg-tdm-formatter.c
+++ b/sound/soc/meson/axg-tdm-formatter.c
-@@ -70,7 +70,7 @@ EXPORT_SYMBOL_GPL(axg_tdm_formatter_set_channel_masks);
+@@ -68,7 +68,7 @@ EXPORT_SYMBOL_GPL(axg_tdm_formatter_set_channel_masks);
static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter)
{
struct axg_tdm_stream *ts = formatter->stream;
@@ -30,8 +30,8 @@ index 358c8c0d861c..f7e8e9da68a0 100644
int ret;
/* Do nothing if the formatter is already enabled */
-@@ -96,11 +96,12 @@ static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter)
- return ret;
+@@ -76,11 +76,12 @@ static int axg_tdm_formatter_enable(struct axg_tdm_formatter *formatter)
+ return 0;
/*
- * If sclk is inverted, invert it back and provide the inversion
@@ -60,10 +60,10 @@ index 9ef98e955cb2..a1f0dcc0ff13 100644
struct axg_tdm_formatter_ops {
diff --git a/sound/soc/meson/axg-tdmin.c b/sound/soc/meson/axg-tdmin.c
-index 3d002b4eb939..88ed95ae886b 100644
+index 7f36fb422f56..396a8201001b 100644
--- a/sound/soc/meson/axg-tdmin.c
+++ b/sound/soc/meson/axg-tdmin.c
-@@ -228,7 +228,6 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = {
+@@ -208,7 +208,6 @@ static const struct axg_tdm_formatter_driver axg_tdmin_drv = {
.regmap_cfg = &axg_tdmin_regmap_cfg,
.ops = &axg_tdmin_ops,
.quirks = &(const struct axg_tdm_formatter_hw) {
@@ -71,7 +71,7 @@ index 3d002b4eb939..88ed95ae886b 100644
.skew_offset = 2,
},
};
-@@ -238,7 +237,6 @@ static const struct axg_tdm_formatter_driver g12a_tdmin_drv = {
+@@ -218,7 +217,6 @@ static const struct axg_tdm_formatter_driver g12a_tdmin_drv = {
.regmap_cfg = &axg_tdmin_regmap_cfg,
.ops = &axg_tdmin_ops,
.quirks = &(const struct axg_tdm_formatter_hw) {