[PATCH V3 RESEND 0/4] ARM: dts: bcm283x: Improve device-trees and bindings

[PATCH V3 RESEND 0/4] ARM: dts: bcm283x: Improve device-trees and bindings

[Stefan Wahren]

This series fix some dtbs_check warning for the Raspberry Pi boards
and convert 2 txt DT bindings for BCM2835 to YAML.

I hope it's okay to combine ARM & arm64 DT fixes.

Changes in V3:
- drop already applied patches (brcm,bcm2835-dma, brcm,bcm2835-mbox,
  pwm-bcm2835) from [1]
- add new patches to address bcm2836-l1-intc
- drop accidentially added Reviewed-by for patch 1
- add Raspberry Pi Kernel Maintenance as maintainer

Changes in V2:
- drop already applied patches (bcm2835-sdhost, bcm2835-thermal)
- drop patch "dmaengine: bcm2835: also support generic dma-channel-mask"
- keep brcm,bcm2835-dma for ABI compatibility which also resolve
  dependency between patch 2 and 3
- drop quotes in patch 2 as noted by Rob Herring
- add interrupt description as suggested by Rob
- add Rob's and Uwe's Reviewed-by

[1] - https://lore.kernel.org/linux-arm-kernel/20230617133620.53129-1-stefan.wahren@i2se.com/

Stefan Wahren (4):
  dt-bindings: timer: convert bcm2835-system-timer bindings to YAML
  dt-bindings: interrupt-controller: convert bcm2836-l1-intc to yaml
  ARM: dts: bcm2837/bcm2712: adjust local intc node names
  ARM: dts: bcm271x: add missing properties to local_intc

 .../brcm,bcm2836-l1-intc.txt                  | 37 --------------
 .../brcm,bcm2836-l1-intc.yaml                 | 51 +++++++++++++++++++
 .../timer/brcm,bcm2835-system-timer.txt       | 22 --------
 .../timer/brcm,bcm2835-system-timer.yaml      | 50 ++++++++++++++++++
 arch/arm/boot/dts/broadcom/bcm2711.dtsi       |  2 +
 arch/arm/boot/dts/broadcom/bcm2837.dtsi       |  2 +-
 arch/arm64/boot/dts/broadcom/bcm2712.dtsi     |  4 +-
 7 files changed, 107 insertions(+), 61 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml
 delete mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
 create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.yaml

--
2.34.1

[PATCH V3 RESEND 1/4] dt-bindings: timer: convert bcm2835-system-timer bindings to YAML

[Stefan Wahren]

Convert the DT binding document for bcm2835-system-timer from .txt
to YAML.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 .../timer/brcm,bcm2835-system-timer.txt       | 22 --------
 .../timer/brcm,bcm2835-system-timer.yaml      | 50 +++++++++++++++++++
 2 files changed, 50 insertions(+), 22 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
 create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.yaml

diff --git a/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt b/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
deleted file mode 100644
index 844bd5fbd04c..000000000000
--- a/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-BCM2835 System Timer
-
-The System Timer peripheral provides four 32-bit timer channels and a
-single 64-bit free running counter. Each channel has an output compare
-register, which is compared against the 32 least significant bits of the
-free running counter values, and generates an interrupt.
-
-Required properties:
-
-- compatible : should be "brcm,bcm2835-system-timer"
-- reg : Specifies base physical address and size of the registers.
-- interrupts : A list of 4 interrupt sinks; one per timer channel.
-- clock-frequency : The frequency of the clock that drives the counter, in Hz.
-
-Example:
-
-timer {
-	compatible = "brcm,bcm2835-system-timer";
-	reg = <0x7e003000 0x1000>;
-	interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
-	clock-frequency = <1000000>;
-};
diff --git a/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.yaml b/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.yaml
new file mode 100644
index 000000000000..f5804b5b0e63
--- /dev/null
+++ b/Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.yaml
@@ -0,0 +1,50 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/timer/brcm,bcm2835-system-timer.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: BCM2835 System Timer
+
+maintainers:
+  - Stefan Wahren <wahrenst@gmx.net>
+  - Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
+
+description:
+  The System Timer peripheral provides four 32-bit timer channels and a
+  single 64-bit free running counter. Each channel has an output compare
+  register, which is compared against the 32 least significant bits of the
+  free running counter values, and generates an interrupt.
+
+properties:
+  compatible:
+    const: brcm,bcm2835-system-timer
+
+  reg:
+    maxItems: 1
+
+  interrupts:
+    items:
+      - description: System Timer Compare 0 match (used by VideoCore GPU)
+      - description: System Timer Compare 1 match (usable for ARM core)
+      - description: System Timer Compare 2 match (used by VideoCore GPU)
+      - description: System Timer Compare 3 match (usable for ARM core)
+
+  clock-frequency: true
+
+required:
+  - compatible
+  - reg
+  - interrupts
+
+additionalProperties: false
+
+examples:
+  - |
+    timer@7e003000 {
+      compatible = "brcm,bcm2835-system-timer";
+      reg = <0x7e003000 0x1000>;
+      interrupts = <1 0>, <1 1>, <1 2>, <1 3>;
+      clock-frequency = <1000000>;
+    };
+...
--
2.34.1

[PATCH V3 RESEND 2/4] dt-bindings: interrupt-controller: convert bcm2836-l1-intc to yaml

[Stefan Wahren]

Convert the DT binding document for BCM2836 per-CPU interrupt
controller from .txt to YAML.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 .../brcm,bcm2836-l1-intc.txt                  | 37 --------------
 .../brcm,bcm2836-l1-intc.yaml                 | 51 +++++++++++++++++++
 2 files changed, 51 insertions(+), 37 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
 create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml

diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
deleted file mode 100644
index 8ced1696c325..000000000000
--- a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-BCM2836 per-CPU interrupt controller
-
-The BCM2836 has a per-cpu interrupt controller for the timer, PMU
-events, and SMP IPIs.  One of the CPUs may receive interrupts for the
-peripheral (GPU) events, which chain to the BCM2835-style interrupt
-controller.
-
-Required properties:
-
-- compatible:	 	Should be "brcm,bcm2836-l1-intc"
-- reg:			Specifies base physical address and size of the
-			  registers
-- interrupt-controller:	Identifies the node as an interrupt controller
-- #interrupt-cells:	Specifies the number of cells needed to encode an
-			  interrupt source. The value shall be 2
-
-Please refer to interrupts.txt in this directory for details of the common
-Interrupt Controllers bindings used by client devices.
-
-The interrupt sources are as follows:
-
-0: CNTPSIRQ
-1: CNTPNSIRQ
-2: CNTHPIRQ
-3: CNTVIRQ
-8: GPU_FAST
-9: PMU_FAST
-
-Example:
-
-local_intc: local_intc {
-	compatible = "brcm,bcm2836-l1-intc";
-	reg = <0x40000000 0x100>;
-	interrupt-controller;
-	#interrupt-cells = <2>;
-	interrupt-parent = <&local_intc>;
-};
diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml
new file mode 100644
index 000000000000..5fda626c80ce
--- /dev/null
+++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml
@@ -0,0 +1,51 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/interrupt-controller/brcm,bcm2836-l1-intc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: BCM2836 per-CPU interrupt controller
+
+maintainers:
+  - Stefan Wahren <wahrenst@gmx.net>
+  - Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
+
+description:
+  The BCM2836 has a per-cpu interrupt controller for the timer, PMU
+  events, and SMP IPIs. One of the CPUs may receive interrupts for the
+  peripheral (GPU) events, which chain to the BCM2835-style interrupt
+  controller.
+
+allOf:
+  - $ref: /schemas/interrupt-controller.yaml#
+
+properties:
+  compatible:
+    const: brcm,bcm2836-l1-intc
+
+  reg:
+    maxItems: 1
+
+  interrupt-controller: true
+
+  '#interrupt-cells':
+    const: 2
+
+required:
+  - compatible
+  - reg
+  - interrupt-controller
+  - '#interrupt-cells'
+
+additionalProperties: false
+
+examples:
+  - |
+    local_intc: interrupt-controller@40000000 {
+        compatible = "brcm,bcm2836-l1-intc";
+        reg = <0x40000000 0x100>;
+        interrupt-controller;
+        #interrupt-cells = <2>;
+        interrupt-parent = <&local_intc>;
+    };
+...
--
2.34.1

[PATCH V3 RESEND 3/4] ARM: dts: bcm2837/bcm2712: adjust local intc node names

[Stefan Wahren]

After converting the bcm2836-l1-intc DT binding to YAML, the DT schema
checks gave warnings like:

'local_intc@40000000' does not match '^interrupt-controller(@[0-9a-f,]+)*$'

So fix them accordingly.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 arch/arm/boot/dts/broadcom/bcm2837.dtsi   | 2 +-
 arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/broadcom/bcm2837.dtsi b/arch/arm/boot/dts/broadcom/bcm2837.dtsi
index 84c08b46519d..c281697142b1 100644
--- a/arch/arm/boot/dts/broadcom/bcm2837.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2837.dtsi
@@ -9,7 +9,7 @@ soc {
 			 <0x40000000 0x40000000 0x00001000>;
 		dma-ranges = <0xc0000000 0x00000000 0x3f000000>;

-		local_intc: local_intc@40000000 {
+		local_intc: interrupt-controller@40000000 {
 			compatible = "brcm,bcm2836-l1-intc";
 			reg = <0x40000000 0x100>;
 			interrupt-controller;
diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
index bccb7318ce7e..6e5a984c1d4e 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
@@ -221,7 +221,7 @@ mailbox: mailbox@7c013880 {
 			#mbox-cells = <0>;
 		};

-		local_intc: local-intc@7cd00000 {
+		local_intc: interrupt-controller@7cd00000 {
 			compatible = "brcm,bcm2836-l1-intc";
 			reg = <0x7cd00000 0x100>;
 		};
--
2.34.1

[PATCH V3 RESEND 4/4] ARM: dts: bcm271x: add missing properties to local_intc

[Stefan Wahren]

After converting the bcm2836-l1-intc DT binding to YAML, the DT schema
checks gave warnings like:

interrupt-controller@40000000: 'interrupt-controller' is a required property
interrupt-controller@40000000: '#interrupt-cells' is a required property

So add them accordingly.

Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
---
 arch/arm/boot/dts/broadcom/bcm2711.dtsi   | 2 ++
 arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/arch/arm/boot/dts/broadcom/bcm2711.dtsi b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
index e4e42af21ef3..313b1046d74f 100644
--- a/arch/arm/boot/dts/broadcom/bcm2711.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm2711.dtsi
@@ -51,6 +51,8 @@ soc {
 		local_intc: interrupt-controller@40000000 {
 			compatible = "brcm,bcm2836-l1-intc";
 			reg = <0x40000000 0x100>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};

 		gicv2: interrupt-controller@40041000 {
diff --git a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
index 6e5a984c1d4e..7d192a5be851 100644
--- a/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
+++ b/arch/arm64/boot/dts/broadcom/bcm2712.dtsi
@@ -224,6 +224,8 @@ mailbox: mailbox@7c013880 {
 		local_intc: interrupt-controller@7cd00000 {
 			compatible = "brcm,bcm2836-l1-intc";
 			reg = <0x7cd00000 0x100>;
+			interrupt-controller;
+			#interrupt-cells = <2>;
 		};

 		uart10: serial@7d001000 {
--
2.34.1

Re: [PATCH V3 RESEND 2/4] dt-bindings: interrupt-controller: convert bcm2836-l1-intc to yaml

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 4054 bytes --]

On Mon, Aug 12, 2024 at 10:03:56PM +0200, Stefan Wahren wrote:
> Convert the DT binding document for BCM2836 per-CPU interrupt
> controller from .txt to YAML.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---
>  .../brcm,bcm2836-l1-intc.txt                  | 37 --------------
>  .../brcm,bcm2836-l1-intc.yaml                 | 51 +++++++++++++++++++
>  2 files changed, 51 insertions(+), 37 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
>  create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml
> 
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
> deleted file mode 100644
> index 8ced1696c325..000000000000
> --- a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -BCM2836 per-CPU interrupt controller
> -
> -The BCM2836 has a per-cpu interrupt controller for the timer, PMU
> -events, and SMP IPIs.  One of the CPUs may receive interrupts for the
> -peripheral (GPU) events, which chain to the BCM2835-style interrupt
> -controller.
> -
> -Required properties:
> -
> -- compatible:	 	Should be "brcm,bcm2836-l1-intc"
> -- reg:			Specifies base physical address and size of the
> -			  registers
> -- interrupt-controller:	Identifies the node as an interrupt controller
> -- #interrupt-cells:	Specifies the number of cells needed to encode an
> -			  interrupt source. The value shall be 2
> -
> -Please refer to interrupts.txt in this directory for details of the common
> -Interrupt Controllers bindings used by client devices.
> -
> -The interrupt sources are as follows:
> -
> -0: CNTPSIRQ
> -1: CNTPNSIRQ
> -2: CNTHPIRQ
> -3: CNTVIRQ
> -8: GPU_FAST
> -9: PMU_FAST
> -
> -Example:
> -
> -local_intc: local_intc {
> -	compatible = "brcm,bcm2836-l1-intc";
> -	reg = <0x40000000 0x100>;
> -	interrupt-controller;
> -	#interrupt-cells = <2>;
> -	interrupt-parent = <&local_intc>;
> -};
> diff --git a/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml
> new file mode 100644
> index 000000000000..5fda626c80ce
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml
> @@ -0,0 +1,51 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/interrupt-controller/brcm,bcm2836-l1-intc.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: BCM2836 per-CPU interrupt controller
> +
> +maintainers:
> +  - Stefan Wahren <wahrenst@gmx.net>
> +  - Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
> +
> +description:
> +  The BCM2836 has a per-cpu interrupt controller for the timer, PMU
> +  events, and SMP IPIs. One of the CPUs may receive interrupts for the
> +  peripheral (GPU) events, which chain to the BCM2835-style interrupt
> +  controller.
> +
> +allOf:
> +  - $ref: /schemas/interrupt-controller.yaml#
> +
> +properties:
> +  compatible:
> +    const: brcm,bcm2836-l1-intc
> +
> +  reg:
> +    maxItems: 1
> +
> +  interrupt-controller: true
> +
> +  '#interrupt-cells':
> +    const: 2
> +
> +required:
> +  - compatible
> +  - reg
> +  - interrupt-controller
> +  - '#interrupt-cells'
> +
> +additionalProperties: false
> +
> +examples:
> +  - |
> +    local_intc: interrupt-controller@40000000 {

If, for some reason, there's a respin - drop the label.
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

> +        compatible = "brcm,bcm2836-l1-intc";
> +        reg = <0x40000000 0x100>;
> +        interrupt-controller;
> +        #interrupt-cells = <2>;
> +        interrupt-parent = <&local_intc>;
> +    };
> +...
> --
> 2.34.1
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH V3 RESEND 1/4] dt-bindings: timer: convert bcm2835-system-timer bindings to YAML

[Conor Dooley]

[-- Attachment #1: Type: text/plain, Size: 259 bytes --]

On Mon, Aug 12, 2024 at 10:03:55PM +0200, Stefan Wahren wrote:
> Convert the DT binding document for bcm2835-system-timer from .txt
> to YAML.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>

Reviewed-by: Conor Dooley <conor.dooley@microchip.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH V3 RESEND 1/4] dt-bindings: timer: convert bcm2835-system-timer bindings to YAML

[Florian Fainelli]

From: Florian Fainelli <f.fainelli@gmail.com>

On Mon, 12 Aug 2024 22:03:55 +0200, Stefan Wahren <wahrenst@gmx.net> wrote:
> Convert the DT binding document for bcm2835-system-timer from .txt
> to YAML.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian

Re: [PATCH V3 RESEND 2/4] dt-bindings: interrupt-controller: convert bcm2836-l1-intc to yaml

[Florian Fainelli]

From: Florian Fainelli <f.fainelli@gmail.com>

On Mon, 12 Aug 2024 22:03:56 +0200, Stefan Wahren <wahrenst@gmx.net> wrote:
> Convert the DT binding document for BCM2836 per-CPU interrupt
> controller from .txt to YAML.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian

Re: [PATCH V3 RESEND 3/4] ARM: dts: bcm2837/bcm2712: adjust local intc node names

[Florian Fainelli]

From: Florian Fainelli <f.fainelli@gmail.com>

On Mon, 12 Aug 2024 22:03:57 +0200, Stefan Wahren <wahrenst@gmx.net> wrote:
> After converting the bcm2836-l1-intc DT binding to YAML, the DT schema
> checks gave warnings like:
> 
> 'local_intc@40000000' does not match '^interrupt-controller(@[0-9a-f,]+)*$'
> 
> So fix them accordingly.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree-arm64/next, thanks!
--
Florian

Re: [PATCH V3 RESEND 4/4] ARM: dts: bcm271x: add missing properties to local_intc

[Florian Fainelli]

From: Florian Fainelli <f.fainelli@gmail.com>

On Mon, 12 Aug 2024 22:03:58 +0200, Stefan Wahren <wahrenst@gmx.net> wrote:
> After converting the bcm2836-l1-intc DT binding to YAML, the DT schema
> checks gave warnings like:
> 
> interrupt-controller@40000000: 'interrupt-controller' is a required property
> interrupt-controller@40000000: '#interrupt-cells' is a required property
> 
> So add them accordingly.
> 
> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/devicetree-arm64/next, thanks!
--
Florian