mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
f5919b65d4
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>
105 lines
3.3 KiB
Diff
105 lines
3.3 KiB
Diff
From f7045758fffa176ea68730ea855415e619bf516d Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Sat, 3 Mar 2018 16:25:19 +0000
|
|
Subject: [PATCH 240/454] audioinjector-octo: Add continuous clock feature
|
|
|
|
By user request, add a switch to prevent the clocks being stopped when
|
|
the stream is paused, stopped or shutdown. Provide access to the switch
|
|
by adding a 'non-stop-clocks' parameter to the audioinjector-addons
|
|
overlay.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/2409
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
arch/arm/boot/dts/overlays/README | 5 +++--
|
|
.../overlays/audioinjector-addons-overlay.dts | 6 +++++-
|
|
sound/soc/bcm/audioinjector-octo-soundcard.c | 19 +++++++++++--------
|
|
3 files changed, 19 insertions(+), 11 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/overlays/README
|
|
+++ b/arch/arm/boot/dts/overlays/README
|
|
@@ -357,8 +357,9 @@ Params: interrupt GPIO use
|
|
|
|
Name: audioinjector-addons
|
|
Info: Configures the audioinjector.net audio add on soundcards
|
|
-Load: dtoverlay=audioinjector-addons
|
|
-Params: <None>
|
|
+Load: dtoverlay=audioinjector-addons,<param>=<val>
|
|
+Params: non-stop-clocks Keeps the clocks running even when the stream
|
|
+ is paused or stopped (default off)
|
|
|
|
|
|
Name: audioinjector-wm8731-audio
|
|
--- a/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
|
|
+++ b/arch/arm/boot/dts/overlays/audioinjector-addons-overlay.dts
|
|
@@ -42,7 +42,7 @@
|
|
|
|
fragment@2 {
|
|
target = <&sound>;
|
|
- __overlay__ {
|
|
+ snd: __overlay__ {
|
|
compatible = "ai,audioinjector-octo-soundcard";
|
|
mult-gpios = <&gpio 27 0>, <&gpio 22 0>, <&gpio 23 0>,
|
|
<&gpio 24 0>;
|
|
@@ -52,4 +52,8 @@
|
|
status = "okay";
|
|
};
|
|
};
|
|
+
|
|
+ __overrides__ {
|
|
+ non-stop-clocks = <&snd>, "non-stop-clocks?";
|
|
+ };
|
|
};
|
|
--- a/sound/soc/bcm/audioinjector-octo-soundcard.c
|
|
+++ b/sound/soc/bcm/audioinjector-octo-soundcard.c
|
|
@@ -29,6 +29,7 @@
|
|
static struct gpio_descs *mult_gpios;
|
|
static struct gpio_desc *codec_rst_gpio;
|
|
static unsigned int audioinjector_octo_rate;
|
|
+static bool non_stop_clocks;
|
|
|
|
static const unsigned int audioinjector_octo_rates[] = {
|
|
96000, 48000, 32000, 24000, 16000, 8000, 88200, 44100, 29400, 22050, 14700,
|
|
@@ -133,12 +134,16 @@ static int audioinjector_octo_hw_params(
|
|
static int audioinjector_octo_trigger(struct snd_pcm_substream *substream,
|
|
int cmd){
|
|
int mult[4];
|
|
- mult[0] = 0;
|
|
- mult[1] = 0;
|
|
- mult[2] = 0;
|
|
- mult[3] = 0;
|
|
+
|
|
+ memset(mult, 0, sizeof(mult));
|
|
|
|
switch (cmd) {
|
|
+ case SNDRV_PCM_TRIGGER_STOP:
|
|
+ case SNDRV_PCM_TRIGGER_SUSPEND:
|
|
+ case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
|
+ if (!non_stop_clocks)
|
|
+ break;
|
|
+ /* Drop through... */
|
|
case SNDRV_PCM_TRIGGER_START:
|
|
case SNDRV_PCM_TRIGGER_RESUME:
|
|
case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
|
|
@@ -177,10 +182,6 @@ static int audioinjector_octo_trigger(st
|
|
return -EINVAL;
|
|
}
|
|
break;
|
|
- case SNDRV_PCM_TRIGGER_STOP:
|
|
- case SNDRV_PCM_TRIGGER_SUSPEND:
|
|
- case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
|
|
- break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
@@ -276,6 +277,8 @@ static int audioinjector_octo_probe(stru
|
|
if (IS_ERR(codec_rst_gpio))
|
|
return PTR_ERR(codec_rst_gpio);
|
|
|
|
+ non_stop_clocks = of_property_read_bool(pdev->dev.of_node, "non-stop-clocks");
|
|
+
|
|
if (codec_rst_gpio)
|
|
gpiod_set_value(codec_rst_gpio, 1);
|
|
msleep(500);
|