Pisound: Set the spi-speed-hz for Pisound in the Device Tree overlay, and specify...

Signed-off-by: Giedrius Trainavičius <giedrius@blokas.io>

diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
index 715a159..73ab4e4 100644 (file)
--- a/arch/arm/boot/dts/overlays/Makefile
+++ b/arch/arm/boot/dts/overlays/Makefile
@@ -193,6 +193,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
        piscreen.dtbo \
        piscreen2r.dtbo \
        pisound.dtbo \
+       pisound-pi5.dtbo \
        pitft22.dtbo \
        pitft28-capacitive.dtbo \
        pitft28-resistive.dtbo \

diff --git a/arch/arm/boot/dts/overlays/README b/arch/arm/boot/dts/overlays/README
index 621840b..42f0926 100644 (file)
--- a/arch/arm/boot/dts/overlays/README
+++ b/arch/arm/boot/dts/overlays/README
@@ -3492,11 +3492,17 @@ Params: speed                   Display SPI bus speed
 
 
 Name:   pisound
-Info:   Configures the Blokas Labs pisound card
+Info:   Configures the Blokas Labs Pisound card
 Load:   dtoverlay=pisound
 Params: <None>
 
 
+Name:   pisound-pi5
+Info:   Pi 5 specific overlay override for Blokas Labs Pisound card, see pisound
+Load:   dtoverlay=pisound-pi5
+Params: <None>
+
+
 Name:   pitft22
 Info:   Adafruit PiTFT 2.2" screen
 Load:   dtoverlay=pitft22,<param>=<val>

diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts
index 87dfbf9..d70a3cf 100644 (file)
--- a/arch/arm/boot/dts/overlays/overlay_map.dts
+++ b/arch/arm/boot/dts/overlays/overlay_map.dts
@@ -203,6 +203,16 @@
                renamed = "miniuart-bt";
        };
 
+       pisound {
+               bcm2835;
+               bcm2711;
+               bcm2712 = "pisound-pi5";
+       };
+
+       pisound-pi5 {
+               bcm2712;
+       };
+
        pwm1 {
                bcm2711;
        };

diff --git a/arch/arm/boot/dts/overlays/pisound-overlay.dts b/arch/arm/boot/dts/overlays/pisound-overlay.dts
index d663700..226bcbd 100644 (file)
--- a/arch/arm/boot/dts/overlays/pisound-overlay.dts
+++ b/arch/arm/boot/dts/overlays/pisound-overlay.dts
@@ -1,6 +1,6 @@
 /*
  * Pisound Linux kernel module.
- * Copyright (C) 2016-2017  Vilniaus Blokas UAB, https://blokas.io/pisound
+ * Copyright (C) 2016-2024  Vilniaus Blokas UAB, https://blokas.io/pisound
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -56,6 +56,7 @@
                                compatible = "blokaslabs,pisound-spi";
                                reg = <0>;
                                spi-max-frequency = <1000000>;
+                               spi-speed-hz = <150000>;
                        };
                };
        };
@@ -76,6 +77,7 @@
                __overlay__ {
                        compatible = "blokaslabs,pisound";
                        i2s-controller = <&i2s_clk_consumer>;
+                       spi-controller = <&pisound_spi>;
                        status = "okay";
 
                        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts b/arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts
new file mode 100644 (file)
index 0000000..a54974c
--- /dev/null
+++ b/arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts
@@ -0,0 +1,31 @@
+/*
+ * Pisound Linux kernel module.
+ * Copyright (C) 2016-2024  Vilniaus Blokas UAB, https://blokas.io/pisound
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; version 2 of the
+ * License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "pisound-overlay.dts"
+
+&pisound_spi {
+       spi-speed-hz = <100000>;
+};
+
+/ {
+       compatible = "brcm,bcm2712";
+};