target/linux/bcm27xx/patches-6.1/950-0720-ARM-dts-bcm2711-rpi-Add-i2s_dma4.patch

   1 From 358b2d553762030d3e7e66eb4c0bb7140d348c43 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.com>
   3 Date: Thu, 11 May 2023 11:50:57 +0100
   4 Subject: [PATCH] ARM: dts: bcm2711-rpi: Add i2s_dma4
   5
   6 Add an i2s_dma4 parameter to make the I2S interface use 40-bit DMA
   7 channels, taking the opportunity to remove some duplication.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
  10 ---
  11  arch/arm/boot/dts/bcm2711-rpi-4-b.dts  | 4 ----
  12  arch/arm/boot/dts/bcm2711-rpi-400.dts  | 4 ----
  13  arch/arm/boot/dts/bcm2711-rpi-cm4.dts  | 4 ----
  14  arch/arm/boot/dts/bcm2711-rpi-cm4s.dts | 4 ----
  15  arch/arm/boot/dts/bcm2711-rpi-ds.dtsi  | 6 ++++++
  16  arch/arm/boot/dts/overlays/README      | 4 ++++
  17  6 files changed, 10 insertions(+), 16 deletions(-)
  18
  19 --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  20 +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
  21 @@ -414,9 +414,5 @@ cam0_reg: &cam_dummy_reg {
  22
  23                 eth_led0 = <&phy1>,"led-modes:0";
  24                 eth_led1 = <&phy1>,"led-modes:4";
  25 -
  26 -               sd_poll_once = <&emmc2>, "non-removable?";
  27 -               spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
  28 -                          <&spi0>, "dmas:8=", <&dma40>;
  29         };
  30  };
  31 --- a/arch/arm/boot/dts/bcm2711-rpi-400.dts
  32 +++ b/arch/arm/boot/dts/bcm2711-rpi-400.dts
  33 @@ -425,9 +425,5 @@ cam0_reg: &cam_dummy_reg {
  34
  35                 eth_led0 = <&phy1>,"led-modes:0";
  36                 eth_led1 = <&phy1>,"led-modes:4";
  37 -
  38 -               sd_poll_once = <&emmc2>, "non-removable?";
  39 -               spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
  40 -                          <&spi0>, "dmas:8=", <&dma40>;
  41         };
  42  };
  43 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
  44 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4.dts
  45 @@ -437,10 +437,6 @@ cam0_reg: &cam1_reg {
  46                         <&ant2>, "output-high?=off",
  47                         <&ant2>, "output-low?=on";
  48
  49 -               sd_poll_once = <&emmc2>, "non-removable?";
  50 -               spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
  51 -                          <&spi0>, "dmas:8=", <&dma40>;
  52 -
  53                 cam0_reg = <&cam0_reg>,"status";
  54                 cam0_reg_gpio = <&cam0_reg>,"gpio:4",
  55                                   <&cam0_reg>,"gpio:0=", <&gpio>;
  56 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
  57 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm4s.dts
  58 @@ -290,10 +290,6 @@ cam0_reg: &cam0_regulator {
  59                 act_led_activelow = <&act_led>,"gpios:8";
  60                 act_led_trigger = <&act_led>,"linux,default-trigger";
  61
  62 -               sd_poll_once = <&emmc2>, "non-removable?";
  63 -               spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
  64 -                          <&spi0>, "dmas:8=", <&dma40>;
  65 -
  66                 cam0_reg = <&cam0_reg>,"status";
  67                 cam0_reg_gpio = <&cam0_reg>,"gpio:4";
  68                 cam1_reg = <&cam1_reg>,"status";
  69 --- a/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
  70 +++ b/arch/arm/boot/dts/bcm2711-rpi-ds.dtsi
  71 @@ -12,6 +12,12 @@
  72                        <&hdmi1>,"status";
  73                 pcie = <&pcie0>,"status";
  74                 sd = <&emmc2>,"status";
  75 +
  76 +               sd_poll_once = <&emmc2>, "non-removable?";
  77 +               spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
  78 +                          <&spi0>, "dmas:8=", <&dma40>;
  79 +               i2s_dma4 = <&i2s>, "dmas:0=", <&dma40>,
  80 +                          <&i2s>, "dmas:8=", <&dma40>;
  81         };
  82
  83         scb: scb {
  84 --- a/arch/arm/boot/dts/overlays/README
  85 +++ b/arch/arm/boot/dts/overlays/README
  86 @@ -226,6 +226,10 @@ Params:
  87          i2s                     Set to "on" to enable the i2s interface
  88                                  (default "off")
  89
  90 +        i2s_dma4                Use to enable 40-bit DMA on the i2s interface
  91 +                                (the assigned value doesn't matter)
  92 +                                (2711 only)
  93 +
  94          krnbt                   Set to "off" to disable autoprobing of Bluetooth
  95                                  driver without need of hciattach/btattach
  96                                  (default "on")