git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From 5d1972f99f893ac9394d2a795a3b21385b9e34a5 Mon Sep 17 00:00:00 2001
   2 From: j-schambacher <joerg@hifiberry.com>
   3 Date: Wed, 13 Mar 2024 10:11:27 +0100
   4 Subject: [PATCH 1293/1295] overlays: Sets i2s_clk_producer as default for
   5  Hifiberry DACplusADC
   6
   7 As we have never released a (standard) DACplusADC board with onboard
   8 clocks, we can simply use a fixed setup avoiding incompatibilities
   9 with Pi5 during driver init. Setting 'hifiberry-dacplusadc,slave' in
  10 the overlays disables the failing clock probing mechanism.
  11
  12 Removes 'slave' parameter description from README which is still
  13 supported but not needed.
  14
  15 Signed-off-by: j-schambacher <joerg@hifiberry.com>
  16 ---
  17  arch/arm/boot/dts/overlays/README                    |  4 +---
  18  .../dts/overlays/hifiberry-dacplusadc-overlay.dts    | 12 +++++-------
  19  2 files changed, 6 insertions(+), 10 deletions(-)
  20
  21 --- a/arch/arm/boot/dts/overlays/README
  22 +++ b/arch/arm/boot/dts/overlays/README
  23 @@ -1773,7 +1773,7 @@ Params: <None>
  24
  25
  26  Name:   hifiberry-dac8x
  27 -Info:   Configures the HifiBerry DAC8X audio cards (only on PI5)
  28 +Info:   Configures the HifiBerry DAC8X audio cards (only on Pi5)
  29  Load:   dtoverlay=hifiberry-dac8x
  30  Params: <None>
  31
  32 @@ -1860,8 +1860,6 @@ Params: 24db_digital_gain       Allow ga
  33                                  responsibility of the user to ensure that
  34                                  the Digital volume control is set to a value
  35                                  that does not result in clipping/distortion!)
  36 -        slave                   Force DAC+ADC into slave mode, using Pi as
  37 -                                master for bit clock and frame clock.
  38          leds_off                If set to 'true' the onboard indicator LEDs
  39                                  are switched off at all times.
  40
  41 --- a/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
  42 +++ b/arch/arm/boot/dts/overlays/hifiberry-dacplusadc-overlay.dts
  43 @@ -1,4 +1,4 @@
  44 -// Definitions for HiFiBerry DAC+ADC
  45 +// Definitions for HiFiBerry DAC+ADC, no onboard clocks
  46  /dts-v1/;
  47  /plugin/;
  48
  49 @@ -15,8 +15,8 @@
  50                 };
  51         };
  52
  53 -       frag1: fragment@1 {
  54 -               target = <&i2s_clk_consumer>;
  55 +       fragment@1 {
  56 +               target = <&i2s_clk_producer>;
  57                 __overlay__ {
  58                         status = "okay";
  59                 };
  60 @@ -58,7 +58,8 @@
  61                 target = <&sound>;
  62                 hifiberry_dacplusadc: __overlay__ {
  63                         compatible = "hifiberry,hifiberry-dacplusadc";
  64 -                       i2s-controller = <&i2s_clk_consumer>;
  65 +                       i2s-controller = <&i2s_clk_producer>;
  66 +                       hifiberry-dacplusadc,slave;
  67                         status = "okay";
  68                 };
  69         };
  70 @@ -66,9 +67,6 @@
  71         __overrides__ {
  72                 24db_digital_gain =
  73                         <&hifiberry_dacplusadc>,"hifiberry,24db_digital_gain?";
  74 -               slave = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,slave?",
  75 -                       <&frag1>,"target:0=",<&i2s_clk_producer>,
  76 -                       <&hifiberry_dacplusadc>,"i2s-controller:0=",<&i2s_clk_producer>;
  77                 leds_off = <&hifiberry_dacplusadc>,"hifiberry-dacplusadc,leds_off?";
  78         };
  79  };