From 316c17cd6e7940ae1cdb3b66f80e15d9159a44fd Mon Sep 17 00:00:00 2001 From: Giedrius Date: Mon, 22 Jan 2024 13:29:24 +0000 Subject: [PATCH 0846/1002] Pisound: Set the spi-speed-hz for Pisound in the Device Tree overlay, and specify spi-speed-hz override for Pi 5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Giedrius Trainavičius --- arch/arm/boot/dts/overlays/Makefile | 1 + arch/arm/boot/dts/overlays/README | 8 ++++- arch/arm/boot/dts/overlays/overlay_map.dts | 10 ++++++ .../arm/boot/dts/overlays/pisound-overlay.dts | 4 ++- .../boot/dts/overlays/pisound-pi5-overlay.dts | 31 +++++++++++++++++++ 5 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 arch/arm/boot/dts/overlays/pisound-pi5-overlay.dts diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile index 715a15936259..73ab4e458893 100644 --- 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 621840ba898e..42f0926d81f3 100644 --- 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: +Name: pisound-pi5 +Info: Pi 5 specific overlay override for Blokas Labs Pisound card, see pisound +Load: dtoverlay=pisound-pi5 +Params: + + Name: pitft22 Info: Adafruit PiTFT 2.2" screen Load: dtoverlay=pitft22,= diff --git a/arch/arm/boot/dts/overlays/overlay_map.dts b/arch/arm/boot/dts/overlays/overlay_map.dts index 87dfbf987289..d70a3cf3d778 100644 --- a/arch/arm/boot/dts/overlays/overlay_map.dts +++ b/arch/arm/boot/dts/overlays/overlay_map.dts @@ -203,6 +203,16 @@ pi3-miniuart-bt { 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 d6637003dd95..226bcbdf8a09 100644 --- 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 @@ pisound_spi: pisound_spi@0{ compatible = "blokaslabs,pisound-spi"; reg = <0>; spi-max-frequency = <1000000>; + spi-speed-hz = <150000>; }; }; }; @@ -76,6 +77,7 @@ fragment@5 { __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 index 000000000000..a54974c446a0 --- /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"; +}; -- 2.44.0