mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2025-12-10 08:44:39 +01:00
9b28f32815
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.88
Manually rebased:
- bcm27xx/patches-6.6/950-0327-media-i2c-ov7251-Make-the-enable-GPIO-optional.patch[1]
- bcm27xx/patches-6.6/950-0521-PCI-brcmstb-Add-BCM2712-support.patch[2]
- generic/hack-6.6/610-net-page_pool-try-to-free-deferred-skbs-while-waitin.patch[3]
- generic/pending-6.6/734-net-ethernet-mediatek-enlarge-DMA-reserve-buffer.patch[4]
All other patches automatically rebased.
1. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=f249c05416ea0bef24c9dbed0e653d2fad87b127
2. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=1fea7726276e5d6526ecd4e7ccb4c91a6135deb5
3. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=95f17738b86fd198924d874a5639bcdc49c7e5b8
4. https://web.git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.88&id=a2874f0dff63829d1f540003e2d83adb610ee64a
Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/18607
(cherry picked from commit a72a2fd7e0)
Link: https://github.com/openwrt/openwrt/pull/18730
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
32 lines
1 KiB
Diff
32 lines
1 KiB
Diff
From 1c6dcea926ae19ef7d073b89f101ae0d67e3c877 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Mon, 20 Nov 2023 15:17:34 +0000
|
|
Subject: [PATCH 0732/1085] ASoC: dwc: Remove check in set_bclk_ratio handling
|
|
|
|
A check added to dw_i2s_set_bclk_ratio that the data format is
|
|
consistent with the ratio seems reasonable but breaks when the
|
|
ratio is changed before the format. Remove the check - it is
|
|
unnecessary.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/5724
|
|
Fixes: 9c6694c24f26 ("ASOC: dwc: Fix 16-bit audio handling")
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
sound/soc/dwc/dwc-i2s.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
--- a/sound/soc/dwc/dwc-i2s.c
|
|
+++ b/sound/soc/dwc/dwc-i2s.c
|
|
@@ -527,11 +527,8 @@ static int dw_i2s_set_bclk_ratio(struct
|
|
unsigned int ratio)
|
|
{
|
|
struct dw_i2s_dev *dev = snd_soc_dai_get_drvdata(cpu_dai);
|
|
- struct i2s_clk_config_data *config = &dev->config;
|
|
|
|
dev_dbg(dev->dev, "%s(%d)\n", __func__, ratio);
|
|
- if (ratio < config->data_width * 2)
|
|
- return -EINVAL;
|
|
|
|
switch (ratio) {
|
|
case 32:
|