mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +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>
142 lines
3.8 KiB
Diff
142 lines
3.8 KiB
Diff
From e4981de3c02a5d73085ba036be4e104a6b034791 Mon Sep 17 00:00:00 2001
|
|
From: Matt Flax <flatmax@flatmax.org>
|
|
Date: Tue, 28 Aug 2018 18:42:13 +1000
|
|
Subject: [PATCH 411/454] Add support for audioinjector.net ultra soundcard.
|
|
(#2664)
|
|
|
|
Uses the simple-audio-card ALSA machine driver. Sets up the machine
|
|
driver in the device tree overlay file. The overlays/Makefile is
|
|
altered to add the audioinjector-ultra.dtbo dtb overlay.
|
|
|
|
Adds CONFIG_SND_SOC_CS4265 to the defconfig files.
|
|
|
|
Signed-off-by: Matt Flax <flatmax@flatmax.org>
|
|
---
|
|
arch/arm/boot/dts/overlays/Makefile | 1 +
|
|
arch/arm/boot/dts/overlays/README | 6 ++
|
|
.../overlays/audioinjector-ultra-overlay.dts | 71 +++++++++++++++++++
|
|
arch/arm/configs/bcm2709_defconfig | 1 +
|
|
arch/arm/configs/bcmrpi_defconfig | 1 +
|
|
5 files changed, 80 insertions(+)
|
|
create mode 100644 arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
|
|
|
|
--- a/arch/arm/boot/dts/overlays/Makefile
|
|
+++ b/arch/arm/boot/dts/overlays/Makefile
|
|
@@ -17,6 +17,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
|
|
applepi-dac.dtbo \
|
|
at86rf233.dtbo \
|
|
audioinjector-addons.dtbo \
|
|
+ audioinjector-ultra.dtbo \
|
|
audioinjector-wm8731-audio.dtbo \
|
|
audremap.dtbo \
|
|
balena-fin.dtbo \
|
|
--- a/arch/arm/boot/dts/overlays/README
|
|
+++ b/arch/arm/boot/dts/overlays/README
|
|
@@ -411,6 +411,12 @@ Params: non-stop-clocks Keeps th
|
|
is paused or stopped (default off)
|
|
|
|
|
|
+Name: audioinjector-ultra
|
|
+Info: Configures the audioinjector.net ultra soundcard
|
|
+Load: dtoverlay=audioinjector-ultra
|
|
+Params: <None>
|
|
+
|
|
+
|
|
Name: audioinjector-wm8731-audio
|
|
Info: Configures the audioinjector.net audio add on soundcard
|
|
Load: dtoverlay=audioinjector-wm8731-audio
|
|
--- /dev/null
|
|
+++ b/arch/arm/boot/dts/overlays/audioinjector-ultra-overlay.dts
|
|
@@ -0,0 +1,71 @@
|
|
+// Definitions for audioinjector.net audio add on soundcard
|
|
+/dts-v1/;
|
|
+/plugin/;
|
|
+
|
|
+/ {
|
|
+ compatible = "brcm,bcm2708";
|
|
+
|
|
+ fragment@0 {
|
|
+ target = <&i2s>;
|
|
+ __overlay__ {
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@1 {
|
|
+ target = <&i2c1>;
|
|
+ __overlay__ {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ status = "okay";
|
|
+
|
|
+ cs4265: cs4265@4e {
|
|
+ #sound-dai-cells = <0>;
|
|
+ compatible = "cirrus,cs4265";
|
|
+ reg = <0x4e>;
|
|
+ reset-gpios = <&gpio 5 0>;
|
|
+ status = "okay";
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ fragment@2 {
|
|
+ target = <&sound>;
|
|
+ __overlay__ {
|
|
+ compatible = "simple-audio-card";
|
|
+ i2s-controller = <&i2s>;
|
|
+ status = "okay";
|
|
+
|
|
+ simple-audio-card,name = "audioinjector-ultra";
|
|
+
|
|
+ simple-audio-card,widgets =
|
|
+ "Line", "OUTPUTS",
|
|
+ "Line", "INPUTS";
|
|
+
|
|
+ simple-audio-card,routing =
|
|
+ "OUTPUTS","LINEOUTL",
|
|
+ "OUTPUTS","LINEOUTR",
|
|
+ "OUTPUTS","SPDIFOUT",
|
|
+ "LINEINL","INPUTS",
|
|
+ "LINEINR","INPUTS",
|
|
+ "MICL","INPUTS",
|
|
+ "MICR","INPUTS";
|
|
+
|
|
+ simple-audio-card,format = "i2s";
|
|
+
|
|
+ simple-audio-card,bitclock-master = <&sound_master>;
|
|
+ simple-audio-card,frame-master = <&sound_master>;
|
|
+
|
|
+ simple-audio-card,cpu {
|
|
+ sound-dai = <&i2s>;
|
|
+ dai-tdm-slot-num = <2>;
|
|
+ dai-tdm-slot-width = <32>;
|
|
+ };
|
|
+
|
|
+ sound_master: simple-audio-card,codec {
|
|
+ sound-dai = <&cs4265>;
|
|
+ system-clock-frequency = <12288000>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+};
|
|
--- a/arch/arm/configs/bcm2709_defconfig
|
|
+++ b/arch/arm/configs/bcm2709_defconfig
|
|
@@ -917,6 +917,7 @@ CONFIG_SND_SOC_AK4554=m
|
|
CONFIG_SND_SOC_CS4271_I2C=m
|
|
CONFIG_SND_SOC_SPDIF=m
|
|
CONFIG_SND_SOC_WM8804_I2C=m
|
|
+CONFIG_SND_SOC_CS4265=m
|
|
CONFIG_SND_SIMPLE_CARD=m
|
|
CONFIG_HID_BATTERY_STRENGTH=y
|
|
CONFIG_HIDRAW=y
|
|
--- a/arch/arm/configs/bcmrpi_defconfig
|
|
+++ b/arch/arm/configs/bcmrpi_defconfig
|
|
@@ -910,6 +910,7 @@ CONFIG_SND_SOC_AK4554=m
|
|
CONFIG_SND_SOC_CS4271_I2C=m
|
|
CONFIG_SND_SOC_SPDIF=m
|
|
CONFIG_SND_SOC_WM8804_I2C=m
|
|
+CONFIG_SND_SOC_CS4265=m
|
|
CONFIG_SND_SIMPLE_CARD=m
|
|
CONFIG_HID_BATTERY_STRENGTH=y
|
|
CONFIG_HIDRAW=y
|