mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
20fe7e687e
Sync 6.1 patches with the RPi foundation. Since rpi-6.6.y is now the main branch of the RPi foundation, there won't be any new patches for linux 6.1. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
80 lines
2.8 KiB
Diff
80 lines
2.8 KiB
Diff
From 5d1972f99f893ac9394d2a795a3b21385b9e34a5 Mon Sep 17 00:00:00 2001
|
|
From: j-schambacher <joerg@hifiberry.com>
|
|
Date: Wed, 13 Mar 2024 10:11:27 +0100
|
|
Subject: [PATCH 1293/1295] overlays: Sets i2s_clk_producer as default for
|
|
Hifiberry DACplusADC
|
|
|
|
As we have never released a (standard) DACplusADC board with onboard
|
|
clocks, we can simply use a fixed setup avoiding incompatibilities
|
|
with Pi5 during driver init. Setting 'hifiberry-dacplusadc,slave' in
|
|
the overlays disables the failing clock probing mechanism.
|
|
|
|
Removes 'slave' parameter description from README which is still
|
|
supported but not needed.
|
|
|
|
Signed-off-by: j-schambacher <joerg@hifiberry.com>
|
|
---
|
|
arch/arm/boot/dts/overlays/README | 4 +---
|
|
.../dts/overlays/hifiberry-dacplusadc-overlay.dts | 12 +++++-------
|
|
2 files changed, 6 insertions(+), 10 deletions(-)
|
|
|
|
--- a/arch/arm/boot/dts/overlays/README
|
|
+++ b/arch/arm/boot/dts/overlays/README
|
|
@@ -1773,7 +1773,7 @@ Params: <None>
|
|
|
|
|
|
Name: hifiberry-dac8x
|
|
-Info: Configures the HifiBerry DAC8X audio cards (only on PI5)
|
|
+Info: Configures the HifiBerry DAC8X audio cards (only on Pi5)
|
|
Load: dtoverlay=hifiberry-dac8x
|
|
Params: <None>
|
|
|
|
@@ -1860,8 +1860,6 @@ Params: 24db_digital_gain Allow ga
|
|
responsibility of the user to ensure that
|
|
the Digital volume control is set to a value
|
|
that does not result in clipping/distortion!)
|
|
- slave Force DAC+ADC into slave mode, using Pi as
|
|
- master for bit clock and frame clock.
|
|
leds_off If set to 'true' the onboard indicator LEDs
|
|
are switched off at all times.
|
|
|
|
--- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
|
|
+++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
|
|
@@ -1,4 +1,4 @@
|
|
-// Definitions for HiFiBerry DAC+ADC
|
|
+// Definitions for HiFiBerry DAC+ADC, no onboard clocks
|
|
/dts-v1/;
|
|
/plugin/;
|
|
|
|
@@ -15,8 +15,8 @@
|
|
};
|
|
};
|
|
|
|
- frag1: fragment@1 {
|
|
- target = <&i2s_clk_consumer>;
|
|
+ fragment@1 {
|
|
+ target = <&i2s_clk_producer>;
|
|
__overlay__ {
|
|
status = "okay";
|
|
};
|
|
@@ -58,7 +58,8 @@
|
|
target = <&sound>;
|
|
hifiberry_dacplusadc: __overlay__ {
|
|
compatible = "hifiberry,hifiberry-dacplusadc";
|
|
- i2s-controller = <&i2s_clk_consumer>;
|
|
+ i2s-controller = <&i2s_clk_producer>;
|
|
+ hifiberry-dacplusadc,slave;
|
|
status = "okay";
|
|
};
|
|
};
|
|
@@ -66,9 +67,6 @@
|
|
__overrides__ {
|
|
24db_digital_gain =
|
|
<&hifiberry_dacplusadc>,"hifiberry,24db_digital_gain?";
|
|
- slave = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,slave?",
|
|
- <&frag1>,"target:0=",<&i2s_clk_producer>,
|
|
- <&hifiberry_dacplusadc>,"i2s-controller:0=",<&i2s_clk_producer>;
|
|
leds_off = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,leds_off?";
|
|
};
|
|
};
|