* [PATCH 1/3] ARM: dts: NSP: add device names to compatible
@ 2021-06-10 20:35 Matthew Hagan
2021-06-10 20:35 ` [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs Matthew Hagan
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Matthew Hagan @ 2021-06-10 20:35 UTC (permalink / raw)
Cc: Florian Fainelli, Matthew Hagan, Rob Herring, Ray Jui,
Scott Branden, bcm-kernel-feedback-list, Viresh Kumar,
Sam Ravnborg, Krzysztof Kozlowski, devicetree, linux-kernel,
linux-arm-kernel
Currently only the SoC type and platform are specified for all NSP
devices. This patch adds the device names.
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
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(-)
diff --git a/arch/arm/boot/dts/bcm958522er.dts b/arch/arm/boot/dts/bcm958522er.dts
index 5443fc079e6e..b6f4d931123c 100644
--- a/arch/arm/boot/dts/bcm958522er.dts
+++ b/arch/arm/boot/dts/bcm958522er.dts
@@ -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";
diff --git a/arch/arm/boot/dts/bcm958525er.dts b/arch/arm/boot/dts/bcm958525er.dts
index e1e3c26cef19..af66caa87bfc 100644
--- a/arch/arm/boot/dts/bcm958525er.dts
+++ b/arch/arm/boot/dts/bcm958525er.dts
@@ -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";
diff --git a/arch/arm/boot/dts/bcm958525xmc.dts b/arch/arm/boot/dts/bcm958525xmc.dts
index f161ba2e7e5e..3d6859e4fd5e 100644
--- a/arch/arm/boot/dts/bcm958525xmc.dts
+++ b/arch/arm/boot/dts/bcm958525xmc.dts
@@ -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";
diff --git a/arch/arm/boot/dts/bcm958622hr.dts b/arch/arm/boot/dts/bcm958622hr.dts
index 83cb877d63db..dca2c9c60857 100644
--- a/arch/arm/boot/dts/bcm958622hr.dts
+++ b/arch/arm/boot/dts/bcm958622hr.dts
@@ -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";
diff --git a/arch/arm/boot/dts/bcm958625hr.dts b/arch/arm/boot/dts/bcm958625hr.dts
index cda6cc281e18..3a62d2d90a18 100644
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -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";
diff --git a/arch/arm/boot/dts/bcm958625k.dts b/arch/arm/boot/dts/bcm958625k.dts
index ffbff0014c65..d331c0a4e6b6 100644
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -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";
diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts
index 3fd39c479a3c..a7953e5acc01 100644
--- a/arch/arm/boot/dts/bcm988312hr.dts
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -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";
--
2.26.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs
2021-06-10 20:35 [PATCH 1/3] ARM: dts: NSP: add device names to compatible Matthew Hagan
@ 2021-06-10 20:35 ` Matthew Hagan
2021-06-24 19:01 ` Rob Herring
2021-06-24 22:30 ` Florian Fainelli
2021-06-10 20:35 ` [PATCH 3/3] ARM: dts: NSP: enable DMA on bcm988312hr Matthew Hagan
2021-06-24 22:29 ` [PATCH 1/3] ARM: dts: NSP: add device names to compatible Florian Fainelli
2 siblings, 2 replies; 7+ messages in thread
From: Matthew Hagan @ 2021-06-10 20:35 UTC (permalink / raw)
Cc: Florian Fainelli, Matthew Hagan, Rob Herring, Ray Jui,
Scott Branden, bcm-kernel-feedback-list, Sam Ravnborg,
Krzysztof Kozlowski, Geert Uytterhoeven, Viresh Kumar,
devicetree, linux-kernel, linux-arm-kernel
Currently only the SoC names are added. This patch expands these to add
the devices.
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
.../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 59 +++++++++++++++----
1 file changed, 49 insertions(+), 10 deletions(-)
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
index 476bc23a7f75..78dfa315f3d0 100644
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
@@ -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
--
2.26.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] ARM: dts: NSP: enable DMA on bcm988312hr
2021-06-10 20:35 [PATCH 1/3] ARM: dts: NSP: add device names to compatible Matthew Hagan
2021-06-10 20:35 ` [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs Matthew Hagan
@ 2021-06-10 20:35 ` Matthew Hagan
2021-06-24 22:31 ` Florian Fainelli
2021-06-24 22:29 ` [PATCH 1/3] ARM: dts: NSP: add device names to compatible Florian Fainelli
2 siblings, 1 reply; 7+ messages in thread
From: Matthew Hagan @ 2021-06-10 20:35 UTC (permalink / raw)
Cc: Florian Fainelli, Matthew Hagan, Rob Herring, Ray Jui,
Scott Branden, bcm-kernel-feedback-list, Viresh Kumar,
Krzysztof Kozlowski, Geert Uytterhoeven, devicetree,
linux-kernel, linux-arm-kernel
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.
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm988312hr.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/bcm988312hr.dts b/arch/arm/boot/dts/bcm988312hr.dts
index a7953e5acc01..7cfb48fb48ba 100644
--- a/arch/arm/boot/dts/bcm988312hr.dts
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -58,6 +58,10 @@ gpio-restart {
/* USB 3 support needed to be complete */
+&dma {
+ status = "okay";
+};
+
&amac0 {
status = "okay";
};
--
2.26.3
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs
2021-06-10 20:35 ` [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs Matthew Hagan
@ 2021-06-24 19:01 ` Rob Herring
2021-06-24 22:30 ` Florian Fainelli
1 sibling, 0 replies; 7+ messages in thread
From: Rob Herring @ 2021-06-24 19:01 UTC (permalink / raw)
To: Matthew Hagan
Cc: Krzysztof Kozlowski, Viresh Kumar, linux-kernel, Ray Jui,
linux-arm-kernel, Rob Herring, Florian Fainelli,
Geert Uytterhoeven, bcm-kernel-feedback-list, Scott Branden,
Sam Ravnborg, devicetree
On Thu, 10 Jun 2021 21:35:11 +0100, Matthew Hagan wrote:
> Currently only the SoC names are added. This patch expands these to add
> the devices.
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
> .../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 59 +++++++++++++++----
> 1 file changed, 49 insertions(+), 10 deletions(-)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] ARM: dts: NSP: add device names to compatible
2021-06-10 20:35 [PATCH 1/3] ARM: dts: NSP: add device names to compatible Matthew Hagan
2021-06-10 20:35 ` [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs Matthew Hagan
2021-06-10 20:35 ` [PATCH 3/3] ARM: dts: NSP: enable DMA on bcm988312hr Matthew Hagan
@ 2021-06-24 22:29 ` Florian Fainelli
2 siblings, 0 replies; 7+ messages in thread
From: Florian Fainelli @ 2021-06-24 22:29 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Rob Herring, Ray Jui, Scott Branden, Viresh Kumar, Sam Ravnborg,
Krzysztof Kozlowski, devicetree, linux-kernel, linux-arm-kernel
On Thu, 10 Jun 2021 21:35:10 +0100, Matthew Hagan <mnhagan88@gmail.com> wrote:
> Currently only the SoC type and platform are specified for all NSP
> devices. This patch adds the device names.
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs
2021-06-10 20:35 ` [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs Matthew Hagan
2021-06-24 19:01 ` Rob Herring
@ 2021-06-24 22:30 ` Florian Fainelli
1 sibling, 0 replies; 7+ messages in thread
From: Florian Fainelli @ 2021-06-24 22:30 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Rob Herring, Ray Jui, Scott Branden, Sam Ravnborg,
Krzysztof Kozlowski, Geert Uytterhoeven, Viresh Kumar,
devicetree, linux-kernel, linux-arm-kernel
On Thu, 10 Jun 2021 21:35:11 +0100, Matthew Hagan <mnhagan88@gmail.com> wrote:
> Currently only the SoC names are added. This patch expands these to add
> the devices.
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 3/3] ARM: dts: NSP: enable DMA on bcm988312hr
2021-06-10 20:35 ` [PATCH 3/3] ARM: dts: NSP: enable DMA on bcm988312hr Matthew Hagan
@ 2021-06-24 22:31 ` Florian Fainelli
0 siblings, 0 replies; 7+ messages in thread
From: Florian Fainelli @ 2021-06-24 22:31 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Rob Herring, Ray Jui, Scott Branden, Viresh Kumar,
Krzysztof Kozlowski, Geert Uytterhoeven, devicetree,
linux-kernel, linux-arm-kernel
On Thu, 10 Jun 2021 21:35:12 +0100, Matthew Hagan <mnhagan88@gmail.com> wrote:
> 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.
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-06-24 22:31 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-10 20:35 [PATCH 1/3] ARM: dts: NSP: add device names to compatible Matthew Hagan
2021-06-10 20:35 ` [PATCH 2/3] dt-bindings: arm: bcm: add NSP devices to SoCs Matthew Hagan
2021-06-24 19:01 ` Rob Herring
2021-06-24 22:30 ` Florian Fainelli
2021-06-10 20:35 ` [PATCH 3/3] ARM: dts: NSP: enable DMA on bcm988312hr Matthew Hagan
2021-06-24 22:31 ` Florian Fainelli
2021-06-24 22:29 ` [PATCH 1/3] ARM: dts: NSP: add device names to compatible Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).