aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm2708/patches-4.14/950-0161-ASoC-bcm2835-fix-hw_params-error-when-device-is-in-p.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2018-11-10 13:03:18 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2018-12-18 23:19:21 +0200
commitf5919b65d4c671fd5083838c7a445f319f9a13c8 (patch)
tree2c791d2a5dea5bbbb0b85f86f74afce2647c0726 /target/linux/brcm2708/patches-4.14/950-0161-ASoC-bcm2835-fix-hw_params-error-when-device-is-in-p.patch
parent822b4c3b250a254e74407056ccfd5c6aa38da162 (diff)
downloadupstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.gz
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.tar.bz2
upstream-f5919b65d4c671fd5083838c7a445f319f9a13c8.zip
brcm2708: add kernel 4.14 support
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/brcm2708/patches-4.14/950-0161-ASoC-bcm2835-fix-hw_params-error-when-device-is-in-p.patch')
-rw-r--r--target/linux/brcm2708/patches-4.14/950-0161-ASoC-bcm2835-fix-hw_params-error-when-device-is-in-p.patch69
1 files changed, 69 insertions, 0 deletions
diff --git a/target/linux/brcm2708/patches-4.14/950-0161-ASoC-bcm2835-fix-hw_params-error-when-device-is-in-p.patch b/target/linux/brcm2708/patches-4.14/950-0161-ASoC-bcm2835-fix-hw_params-error-when-device-is-in-p.patch
new file mode 100644
index 0000000000..e94199288b
--- /dev/null
+++ b/target/linux/brcm2708/patches-4.14/950-0161-ASoC-bcm2835-fix-hw_params-error-when-device-is-in-p.patch
@@ -0,0 +1,69 @@
+From 0f409e6c30a04eb85792a6883e81ad2af118c7bd Mon Sep 17 00:00:00 2001
+From: Matthias Reichl <github@hias.horus.com>
+Date: Thu, 18 Jan 2018 12:36:44 +0100
+Subject: [PATCH 161/454] ASoC: bcm2835: fix hw_params error when device is in
+ prepared state (#2345)
+
+commit 8d5737a5f53902a916ee1e1cb248c9b8b883b2ea upstream.
+
+If bcm2835 is configured as bitclock master calling hw_params()
+after prepare() fails with EBUSY. This also makes it impossible to
+use bcm2835 in full duplex mode.
+
+The error is caused by the split clock setup: clk_set_rate
+is called in hw_params, clk_prepare_enable in prepare. As hw_params
+doesn't check if the clock was already enabled clk_set_rate
+fails with EBUSY.
+
+Fix this by moving clock startup from prepare to hw_params and
+let hw_params properly deal with an already set up or enabled
+clock.
+
+Signed-off-by: Matthias Reichl <hias@horus.com>
+---
+ sound/soc/bcm/bcm2835-i2s.c | 20 ++++++++++++++------
+ 1 file changed, 14 insertions(+), 6 deletions(-)
+
+--- a/sound/soc/bcm/bcm2835-i2s.c
++++ b/sound/soc/bcm/bcm2835-i2s.c
+@@ -130,6 +130,7 @@ struct bcm2835_i2s_dev {
+ struct regmap *i2s_regmap;
+ struct clk *clk;
+ bool clk_prepared;
++ int clk_rate;
+ };
+
+ static void bcm2835_i2s_start_clock(struct bcm2835_i2s_dev *dev)
+@@ -419,10 +420,19 @@ static int bcm2835_i2s_hw_params(struct
+ }
+
+ /* Clock should only be set up here if CPU is clock master */
+- if (bit_clock_master) {
+- ret = clk_set_rate(dev->clk, bclk_rate);
+- if (ret)
+- return ret;
++ if (bit_clock_master &&
++ (!dev->clk_prepared || dev->clk_rate != bclk_rate)) {
++ if (dev->clk_prepared)
++ bcm2835_i2s_stop_clock(dev);
++
++ if (dev->clk_rate != bclk_rate) {
++ ret = clk_set_rate(dev->clk, bclk_rate);
++ if (ret)
++ return ret;
++ dev->clk_rate = bclk_rate;
++ }
++
++ bcm2835_i2s_start_clock(dev);
+ }
+
+ /* Setup the frame format */
+@@ -618,8 +628,6 @@ static int bcm2835_i2s_prepare(struct sn
+ struct bcm2835_i2s_dev *dev = snd_soc_dai_get_drvdata(dai);
+ uint32_t cs_reg;
+
+- bcm2835_i2s_start_clock(dev);
+-
+ /*
+ * Clear both FIFOs if the one that should be started
+ * is not empty at the moment. This should only happen