Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: interrupt-controller: Merge BCM3380 with BCM7120

The two bindings are very similar and should be covered by the same
document, do that so we can get rid of an additional binding file.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20211217160546.497012-3-f.fainelli@gmail.com

authored by

Florian Fainelli and committed by
Rob Herring
94360916 07f7f686

+28 -42
-39
Documentation/devicetree/bindings/interrupt-controller/brcm,bcm3380-l2-intc.txt
··· 1 - Broadcom BCM3380-style Level 1 / Level 2 interrupt controller 2 - 3 - This interrupt controller shows up in various forms on many BCM338x/BCM63xx 4 - chipsets. It has the following properties: 5 - 6 - - outputs a single interrupt signal to its interrupt controller parent 7 - 8 - - contains one or more enable/status word pairs, which often appear at 9 - different offsets in different blocks 10 - 11 - - no atomic set/clear operations 12 - 13 - Required properties: 14 - 15 - - compatible: should be "brcm,bcm3380-l2-intc" 16 - - reg: specifies one or more enable/status pairs, in the following format: 17 - <enable_reg 0x4 status_reg 0x4>... 18 - - interrupt-controller: identifies the node as an interrupt controller 19 - - #interrupt-cells: specifies the number of cells needed to encode an interrupt 20 - source, should be 1. 21 - - interrupts: specifies the interrupt line in the interrupt-parent controller 22 - node, valid values depend on the type of parent interrupt controller 23 - 24 - Optional properties: 25 - 26 - - brcm,irq-can-wake: if present, this means the L2 controller can be used as a 27 - wakeup source for system suspend/resume. 28 - 29 - Example: 30 - 31 - irq0_intc: interrupt-controller@10000020 { 32 - compatible = "brcm,bcm3380-l2-intc"; 33 - reg = <0x10000024 0x4 0x1000002c 0x4>, 34 - <0x10000020 0x4 0x10000028 0x4>; 35 - interrupt-controller; 36 - #interrupt-cells = <1>; 37 - interrupt-parent = <&cpu_intc>; 38 - interrupts = <2>; 39 - };
+28 -3
Documentation/devicetree/bindings/interrupt-controller/brcm,bcm7120-l2-intc.yaml
··· 4 4 $id: http://devicetree.org/schemas/interrupt-controller/brcm,bcm7120-l2-intc.yaml# 5 5 $schema: http://devicetree.org/meta-schemas/core.yaml# 6 6 7 - title: Broadcom BCM7120-style Level 2 interrupt controller 7 + title: Broadcom BCM7120-style Level 2 and Broadcom BCM3380 Level 1 / Level 2 8 8 9 9 maintainers: 10 10 - Florian Fainelli <f.fainelli@gmail.com> ··· 59 59 .. 60 60 31 ........................ X 61 61 62 + The BCM3380 Level 1 / Level 2 interrrupt controller shows up in various forms 63 + on many BCM338x/BCM63xx chipsets. It has the following properties: 64 + 65 + - outputs a single interrupt signal to its interrupt controller parent 66 + 67 + - contains one or more enable/status word pairs, which often appear at 68 + different offsets in different blocks 69 + 70 + - no atomic set/clear operations 71 + 62 72 allOf: 63 73 - $ref: /schemas/interrupt-controller.yaml# 64 74 65 75 properties: 66 76 compatible: 67 - const: brcm,bcm7120-l2-intc 77 + items: 78 + - enum: 79 + - brcm,bcm7120-l2-intc 80 + - brcm,bcm3380-l2-intc 68 81 69 82 reg: 70 - maxItems: 1 83 + minItems: 1 84 + maxItems: 4 71 85 description: > 72 86 Specifies the base physical address and size of the registers 73 87 ··· 137 123 interrupts = <0x0 0x42 0x0>, <0x0 0x40 0x0>; 138 124 brcm,int-map-mask = <0xeb8>, <0x140>; 139 125 brcm,int-fwd-mask = <0x7>; 126 + }; 127 + 128 + - | 129 + irq1_intc: interrupt-controller@10000020 { 130 + compatible = "brcm,bcm3380-l2-intc"; 131 + reg = <0x10000024 0x4>, <0x1000002c 0x4>, 132 + <0x10000020 0x4>, <0x10000028 0x4>; 133 + interrupt-controller; 134 + #interrupt-cells = <1>; 135 + interrupt-parent = <&cpu_intc>; 136 + interrupts = <2>; 140 137 };