From af0c1aaa724e87e7ef2a632c0f89373a0e048c4c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 2 May 2018 11:05:44 -0700 Subject: [PATCH] drop 4.16 patch --- ...si-maintain-a-mask-of-active-streams.patch | 88 ------------------- queue-4.16/series | 1 - 2 files changed, 89 deletions(-) delete mode 100644 queue-4.16/asoc-fsl_ssi-maintain-a-mask-of-active-streams.patch diff --git a/queue-4.16/asoc-fsl_ssi-maintain-a-mask-of-active-streams.patch b/queue-4.16/asoc-fsl_ssi-maintain-a-mask-of-active-streams.patch deleted file mode 100644 index b6fc34f2d6a..00000000000 --- a/queue-4.16/asoc-fsl_ssi-maintain-a-mask-of-active-streams.patch +++ /dev/null @@ -1,88 +0,0 @@ -From foo@baz Tue May 1 14:59:18 PDT 2018 -From: Nicolin Chen -Date: Mon, 12 Feb 2018 14:03:12 -0800 -Subject: ASoC: fsl_ssi: Maintain a mask of active streams - -From: Nicolin Chen - -[ Upstream commit e0582731abe004163e78ad2dac4cd1196db0908f ] - -Checking TE and RE bits in SCR register doesn't work for AC97 mode -which enables SSIEN, TE and RE in the fsl_ssi_setup_ac97() that's -called during probe(). - -So when running into the trigger(), it will always get the result -of both TE and RE being enabled already, even if actually there is -no active stream. - -This patch fixes this issue by adding a variable to log the active -streams manually. - -Signed-off-by: Nicolin Chen -Tested-by: Caleb Crome -Tested-by: Maciej S. Szmigiero -Reviewed-by: Maciej S. Szmigiero -Signed-off-by: Mark Brown -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - sound/soc/fsl/fsl_ssi.c | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - ---- a/sound/soc/fsl/fsl_ssi.c -+++ b/sound/soc/fsl/fsl_ssi.c -@@ -201,6 +201,7 @@ struct fsl_ssi_soc_data { - * @cpu_dai_drv: CPU DAI driver for this device - * - * @dai_fmt: DAI configuration this device is currently used with -+ * @streams: Mask of current active streams: BIT(TX) and BIT(RX) - * @i2s_net: I2S and Network mode configurations of SCR register - * @use_dma: DMA is used or FIQ with stream filter - * @use_dual_fifo: DMA with support for dual FIFO mode -@@ -245,6 +246,7 @@ struct fsl_ssi { - struct snd_soc_dai_driver cpu_dai_drv; - - unsigned int dai_fmt; -+ u8 streams; - u8 i2s_net; - bool use_dma; - bool use_dual_fifo; -@@ -440,15 +442,14 @@ static void fsl_ssi_fifo_clear(struct fs - static void fsl_ssi_config(struct fsl_ssi *ssi, bool enable, - struct fsl_ssi_regvals *vals) - { -+ int dir = (&ssi->regvals[TX] == vals) ? TX : RX; - struct regmap *regs = ssi->regs; - struct fsl_ssi_regvals *avals; - int nr_active_streams; -- u32 scr; - int keep_active; - -- regmap_read(regs, REG_SSI_SCR, &scr); -- -- nr_active_streams = !!(scr & SSI_SCR_TE) + !!(scr & SSI_SCR_RE); -+ nr_active_streams = !!(ssi->streams & BIT(TX)) + -+ !!(ssi->streams & BIT(RX)); - - if (nr_active_streams - 1 > 0) - keep_active = 1; -@@ -470,6 +471,9 @@ static void fsl_ssi_config(struct fsl_ss - keep_active); - /* Safely disable SCR register for the stream */ - regmap_update_bits(regs, REG_SSI_SCR, scr, 0); -+ -+ /* Log the disabled stream to the mask */ -+ ssi->streams &= ~BIT(dir); - } - - /* -@@ -545,6 +549,9 @@ config_done: - } - /* Enable all remaining bits */ - regmap_update_bits(regs, REG_SSI_SCR, vals->scr, vals->scr); -+ -+ /* Log the enabled stream to the mask */ -+ ssi->streams |= BIT(dir); - } - } - diff --git a/queue-4.16/series b/queue-4.16/series index 9d631fb9209..9520ff3da5a 100644 --- a/queue-4.16/series +++ b/queue-4.16/series @@ -283,7 +283,6 @@ crypto-inside-secure-do-not-overwrite-the-threshold-value.patch crypto-sunxi-ss-add-module_alias-to-sun4i-ss.patch crypto-inside-secure-fix-the-invalidation-step-during-cra_exit.patch audit-return-on-memory-error-to-avoid-null-pointer-dereference.patch -asoc-fsl_ssi-maintain-a-mask-of-active-streams.patch net-stmmac-call-correct-function-in-stmmac_mac_config_rx_queues_routing.patch rcu-call-touch_nmi_watchdog-while-printing-stall-warnings.patch pinctrl-sh-pfc-r8a7796-fix-mod_sel-register-pin-assignment-for-ssi-pins-group.patch -- 2.47.3