Skip to contentSkip to conversation

ARM: dts: NSP: add device names to compatible

PATCH Applied Matthew Hagan 3 participants 7 messages Jun 10, 2021 – Jun 24, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: dts: NSP: add device names to compatible

Currently only the SoC type and platform are specified for all NSP devices. This patch adds the device names.

---
 arch/arm/boot/dts/bcm958522er.dts  | 2 +-
 arch/arm/boot/dts/bcm958525er.dts  | 2 +-
 arch/arm/boot/dts/bcm958525xmc.dts | 2 +-
 arch/arm/boot/dts/bcm958622hr.dts  | 2 +-
 arch/arm/boot/dts/bcm958625hr.dts  | 2 +-
 arch/arm/boot/dts/bcm958625k.dts   | 2 +-
 arch/arm/boot/dts/bcm988312hr.dts  | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/bcm958522er.dts +1 -1
index 5443fc079e6e..b6f4d931123c 100644
@@ -37,7 +37,7 @@
 
 / {
 	model = "NorthStar Plus SVK (BCM958522ER)";
-	compatible = "brcm,bcm58522", "brcm,nsp";
+	compatible = "brcm,bcm958522er", "brcm,bcm58522", "brcm,nsp";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
arch/arm/boot/dts/bcm958525er.dts +1 -1
index e1e3c26cef19..af66caa87bfc 100644
@@ -37,7 +37,7 @@
 
 / {
 	model = "NorthStar Plus SVK (BCM958525ER)";
-	compatible = "brcm,bcm58525", "brcm,nsp";
+	compatible = "brcm,bcm958525er", "brcm,bcm58525", "brcm,nsp";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
arch/arm/boot/dts/bcm958525xmc.dts +1 -1
index f161ba2e7e5e..3d6859e4fd5e 100644
@@ -37,7 +37,7 @@
 
 / {
 	model = "NorthStar Plus XMC (BCM958525xmc)";
-	compatible = "brcm,bcm58525", "brcm,nsp";
+	compatible = "brcm,bcm958525xmc", "brcm,bcm58525", "brcm,nsp";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
arch/arm/boot/dts/bcm958622hr.dts +1 -1
index 83cb877d63db..dca2c9c60857 100644
@@ -37,7 +37,7 @@
 
 / {
 	model = "NorthStar Plus SVK (BCM958622HR)";
-	compatible = "brcm,bcm58622", "brcm,nsp";
+	compatible = "brcm,bcm958622hr", "brcm,bcm58622", "brcm,nsp";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
arch/arm/boot/dts/bcm958625hr.dts +1 -1
index cda6cc281e18..3a62d2d90a18 100644
@@ -37,7 +37,7 @@
 
 / {
 	model = "NorthStar Plus SVK (BCM958625HR)";
-	compatible = "brcm,bcm58625", "brcm,nsp";
+	compatible = "brcm,bcm958625hr", "brcm,bcm58625", "brcm,nsp";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
arch/arm/boot/dts/bcm958625k.dts +1 -1
index ffbff0014c65..d331c0a4e6b6 100644
@@ -36,7 +36,7 @@
 
 / {
 	model = "NorthStar Plus SVK (BCM958625K)";
-	compatible = "brcm,bcm58625", "brcm,nsp";
+	compatible = "brcm,bcm958625k", "brcm,bcm58625", "brcm,nsp";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
arch/arm/boot/dts/bcm988312hr.dts +1 -1
index 3fd39c479a3c..a7953e5acc01 100644
@@ -37,7 +37,7 @@
 
 / {
 	model = "NorthStar Plus SVK (BCM988312HR)";
-	compatible = "brcm,bcm88312", "brcm,nsp";
+	compatible = "brcm,bcm988312hr", "brcm,bcm88312", "brcm,nsp";
 
 	chosen {
 		stdout-path = "serial0:115200n8";
Signature · 1 line
2.26.3
#1 lore raw

PATCH 2/3 dt-bindings: arm: bcm: add NSP devices to SoCs

Currently only the SoC names are added. This patch expands these to add the devices.

---
 .../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 59 +++++++++++++++----
 1 file changed, 49 insertions(+), 10 deletions(-)
Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml +49 -10
index 476bc23a7f75..78dfa315f3d0 100644
@@ -22,16 +22,55 @@ properties:
   $nodename:
     const: '/'
   compatible:
-    items:
-      - enum:
-          - brcm,bcm58522
-          - brcm,bcm58525
-          - brcm,bcm58535
-          - brcm,bcm58622
-          - brcm,bcm58623
-          - brcm,bcm58625
-          - brcm,bcm88312
-      - const: brcm,nsp
+    oneOf:
+      - description: BCM58522 based boards
+        items:
+          - enum:
+              - brcm,bcm958522er
+          - const: brcm,bcm58522
+          - const: brcm,nsp
+
+      - description: BCM58525 based boards
+        items:
+          - enum:
+              - brcm,bcm958525er
+              - brcm,bcm958525xmc
+          - const: brcm,bcm58525
+          - const: brcm,nsp
+
+      - description: BCM58535 based boards
+        items:
+          - const: brcm,bcm58535
+          - const: brcm,nsp
+
+      - description: BCM58622 based boards
+        items:
+          - enum:
+              - brcm,bcm958622hr
+          - const: brcm,bcm58622
+          - const: brcm,nsp
+
+      - description: BCM58623 based boards
+        items:
+          - enum:
+              - brcm,bcm958623hr
+          - const: brcm,bcm58623
+          - const: brcm,nsp
+
+      - description: BCM58625 based boards
+        items:
+          - enum:
+              - brcm,bcm958625hr
+              - brcm,bcm958625k
+          - const: brcm,bcm58625
+          - const: brcm,nsp
+
+      - description: BCM88312 based boards
+        items:
+          - enum:
+              - brcm,bcm988312hr
+          - const: brcm,bcm88312
+          - const: brcm,nsp
 
 additionalProperties: true
 
Signature · 1 line
2.26.3
maintainer Reviewed-by on v1 2/3
#2 lore raw

Re: [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs

Quoted 8 lines · Matthew Hagan

Currently only the SoC names are added. This patch expands these to add the devices.

---
 .../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 59 +++++++++++++++----
 1 file changed, 49 insertions(+), 10 deletions(-)
#4 lore raw

PATCH 3/3 ARM: dts: NSP: enable DMA on bcm988312hr

In reply to Matthew Hagan

The previous patch "ARM: dts: NSP: Disable PL330 by default, add dma-coherent property" set the DMAC to disabled by default, requiring it to be manually enabled on each device. The bcm988312hr was mistakenly omitted. This patch adds it back.

---
 arch/arm/boot/dts/bcm988312hr.dts | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/bcm988312hr.dts +4 -0
index a7953e5acc01..7cfb48fb48ba 100644
@@ -58,6 +58,10 @@ gpio-restart {
 
 /* USB 3 support needed to be complete */
 
+&dma {
+	status = "okay";
+};
+
 &amac0 {
 	status = "okay";
 };
Signature · 1 line
2.26.3
#5 lore raw

Re: [PATCH 3/3] ARM: dts: NSP: enable DMA on bcm988312hr

Quoted 7 lines · Matthew Hagan

The previous patch "ARM: dts: NSP: Disable PL330 by default, add dma-coherent property" set the DMAC to disabled by default, requiring it to be manually enabled on each device. The bcm988312hr was mistakenly omitted. This patch adds it back.

---

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