Hi Rob, Maxime,
This patch series converts most files under D/dt-bindings/arm/bcm/ with
the exception of bcm63138 and brcmstb to the YAML format. Those two may
be split accordingly later on since document not just the root node.
Changes in v2:
- fixed typo in Vulcan binding
- simplified how SoC compatible strings are specified
- fixed filename in bcm2835 firmware binding
- added 'secondary-boot-reg' constraint
Florian Fainelli (12):
dt-bindings: arm: bcm: Convert Cygnus to YAML
dt-bindings: arm: bcm: Convert Hurricane 2 to YAML
dt-bindings: arm: bcm: Convert Northstar Plus to YAML
dt-bindings: arm: bcm: Convert Northstar 2 to YAML
dt-bindings: arm: bcm: Convert Stingray to YAML
dt-bindings: arm: bcm: Convert BCM21664 to YAML
dt-bindings: arm: bcm: Convert BCM23550 to YAML
dt-bindings: arm: bcm: Convert BCM4708 to YAML
dt-bindings: arm: bcm: Convert BCM11351 to YAML
dt-bindings: arm: bcm: Convert Vulcan to YAML
dt-bindings: arm: Document Broadcom SoCs 'secondary-boot-reg'
dt-bindings: arm: bcm: Convert BCM2835 firmware binding to YAML
.../arm/bcm/brcm,bcm11351-cpu-method.txt | 36 --------
.../bindings/arm/bcm/brcm,bcm11351.txt | 10 ---
.../bindings/arm/bcm/brcm,bcm11351.yaml | 21 +++++
.../bindings/arm/bcm/brcm,bcm21664.txt | 15 ----
.../bindings/arm/bcm/brcm,bcm21664.yaml | 21 +++++
.../arm/bcm/brcm,bcm23550-cpu-method.txt | 36 --------
.../bindings/arm/bcm/brcm,bcm23550.txt | 15 ----
.../bindings/arm/bcm/brcm,bcm23550.yaml | 21 +++++
.../bindings/arm/bcm/brcm,bcm4708.txt | 15 ----
.../bindings/arm/bcm/brcm,bcm4708.yaml | 88 +++++++++++++++++++
.../bindings/arm/bcm/brcm,cygnus.txt | 31 -------
.../bindings/arm/bcm/brcm,cygnus.yaml | 29 ++++++
.../devicetree/bindings/arm/bcm/brcm,hr2.txt | 14 ---
.../devicetree/bindings/arm/bcm/brcm,hr2.yaml | 28 ++++++
.../devicetree/bindings/arm/bcm/brcm,ns2.txt | 9 --
.../devicetree/bindings/arm/bcm/brcm,ns2.yaml | 23 +++++
.../bindings/arm/bcm/brcm,nsp-cpu-method.txt | 39 --------
.../devicetree/bindings/arm/bcm/brcm,nsp.txt | 34 -------
.../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 36 ++++++++
.../bindings/arm/bcm/brcm,stingray.txt | 12 ---
.../bindings/arm/bcm/brcm,stingray.yaml | 24 +++++
.../bindings/arm/bcm/brcm,vulcan-soc.txt | 10 ---
.../bindings/arm/bcm/brcm,vulcan-soc.yaml | 22 +++++
.../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 ---
.../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 33 +++++++
.../devicetree/bindings/arm/cpus.yaml | 33 +++++++
26 files changed, 379 insertions(+), 290 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
--
2.19.1
Update the Broadcom Hurricane 2 SoC binding document for boards/SoCs to use
YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../devicetree/bindings/arm/bcm/brcm,hr2.txt | 14 ----------
.../devicetree/bindings/arm/bcm/brcm,hr2.yaml | 28 +++++++++++++++++++
2 files changed, 28 insertions(+), 14 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
deleted file mode 100644
index a124c7fc4dcd..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Broadcom Hurricane 2 device tree bindings
----------------------------------------
-
-Broadcom Hurricane 2 family of SoCs are used for switching control. These SoCs
-are based on Broadcom's iProc SoC architecture and feature a single core Cortex
-A9 ARM CPUs, DDR2/DDR3 memory, PCIe GEN-2, USB 2.0 and USB 3.0, serial and NAND
-flash and a PCIe attached integrated switching engine.
-
-Boards with Hurricane SoCs shall have the following properties:
-
-Required root node property:
-
-BCM53342
-compatible = "brcm,bcm53342", "brcm,hr2";
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
new file mode 100644
index 000000000000..1158f49b0b83
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
@@ -0,0 +1,28 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,hr2.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom Hurricane 2 device tree bindings
+
+description:
+ Broadcom Hurricane 2 family of SoCs are used for switching control. These SoCs
+ are based on Broadcom's iProc SoC architecture and feature a single core Cortex
+ A9 ARM CPUs, DDR2/DDR3 memory, PCIe GEN-2, USB 2.0 and USB 3.0, serial and NAND
+ flash and a PCIe attached integrated switching engine.
+
+maintainers:
+ - Florian Fainelli <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - ubnt,unifi-switch8
+ - const: brcm,bcm53342
+ - const: brcm,hr2
+
+...
--
2.19.1
Update the Broadcom Northstar Plus SoC binding document for boards/SoCs
to use YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../devicetree/bindings/arm/bcm/brcm,nsp.txt | 34 ------------------
.../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 36 +++++++++++++++++++
2 files changed, 36 insertions(+), 34 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
deleted file mode 100644
index eae53e4556be..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-Broadcom Northstar Plus device tree bindings
---------------------------------------------
-
-Broadcom Northstar Plus family of SoCs are used for switching control
-and management applications as well as residential router/gateway
-applications. The SoC features dual core Cortex A9 ARM CPUs, integrating
-several peripheral interfaces including multiple Gigabit Ethernet PHYs,
-DDR3 memory, PCIE Gen-2, USB 2.0 and USB 3.0, serial and NAND flash,
-SATA and several other IO controllers.
-
-Boards with Northstar Plus SoCs shall have the following properties:
-
-Required root node property:
-
-BCM58522
-compatible = "brcm,bcm58522", "brcm,nsp";
-
-BCM58525
-compatible = "brcm,bcm58525", "brcm,nsp";
-
-BCM58535
-compatible = "brcm,bcm58535", "brcm,nsp";
-
-BCM58622
-compatible = "brcm,bcm58622", "brcm,nsp";
-
-BCM58623
-compatible = "brcm,bcm58623", "brcm,nsp";
-
-BCM58625
-compatible = "brcm,bcm58625", "brcm,nsp";
-
-BCM88312
-compatible = "brcm,bcm88312", "brcm,nsp";
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
new file mode 100644
index 000000000000..fe364cebf57f
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,nsp.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom Northstar Plus device tree bindings
+
+description:
+ Broadcom Northstar Plus family of SoCs are used for switching control
+ and management applications as well as residential router/gateway
+ applications. The SoC features dual core Cortex A9 ARM CPUs, integrating
+ several peripheral interfaces including multiple Gigabit Ethernet PHYs,
+ DDR3 memory, PCIE Gen-2, USB 2.0 and USB 3.0, serial and NAND flash,
+ SATA and several other IO controllers.
+
+maintainers:
+ - Ray Jui <[email protected]>
+ - Scott Branden <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - brcm,bcm58522
+ - brcm,bcm58525
+ - brcm,bcm58535
+ - brcm,bcm58622
+ - brcm,bcm58623
+ - brcm,bcm58625
+ - brcm,bcm88312
+ - const: brcm,nsp
+
+...
--
2.19.1
Update the Broadcom Northstar 2 SoC binding document for boards/SoCs to
use YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../devicetree/bindings/arm/bcm/brcm,ns2.txt | 9 --------
.../devicetree/bindings/arm/bcm/brcm,ns2.yaml | 23 +++++++++++++++++++
2 files changed, 23 insertions(+), 9 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt
deleted file mode 100644
index 35f056f4a1c3..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Broadcom North Star 2 (NS2) device tree bindings
-------------------------------------------------
-
-Boards with NS2 shall have the following properties:
-
-Required root node property:
-
-NS2 SVK board
-compatible = "brcm,ns2-svk", "brcm,ns2";
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
new file mode 100644
index 000000000000..2451704f87f0
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,ns2.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom North Star 2 (NS2) device tree bindings
+
+maintainers:
+ - Ray Jui <[email protected]>
+ - Scott Branden <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - brcm,ns2-svk
+ - brcm,ns2-xmc
+ - const: brcm,ns2
+
+...
--
2.19.1
Update the Broadcom Stingray SoC binding document for boards/SoCs to use
YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../bindings/arm/bcm/brcm,stingray.txt | 12 ----------
.../bindings/arm/bcm/brcm,stingray.yaml | 24 +++++++++++++++++++
2 files changed, 24 insertions(+), 12 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
deleted file mode 100644
index 23a02178dd44..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Broadcom Stingray device tree bindings
-------------------------------------------------
-
-Boards with Stingray shall have the following properties:
-
-Required root node property:
-
-Stingray Combo SVK board
-compatible = "brcm,bcm958742k", "brcm,stingray";
-
-Stingray SST100 board
-compatible = "brcm,bcm958742t", "brcm,stingray";
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
new file mode 100644
index 000000000000..4ad2b2124ab4
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,stingray.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom Stingray device tree bindings
+
+maintainers:
+ - Ray Jui <[email protected]>
+ - Scott Branden <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - brcm,bcm958742k
+ - brcm,bcm958742t
+ - brcm,bcm958802a802x
+ - const: brcm,stingray
+
+...
--
2.19.1
Update the Broadcom BCM23550 SoC binding document for boards/SoCs to use
YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../bindings/arm/bcm/brcm,bcm23550.txt | 15 -------------
.../bindings/arm/bcm/brcm,bcm23550.yaml | 21 +++++++++++++++++++
2 files changed, 21 insertions(+), 15 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt
deleted file mode 100644
index 080baad923d6..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Broadcom BCM23550 device tree bindings
---------------------------------------
-
-This document describes the device tree bindings for boards with the BCM23550
-SoC.
-
-Required root node property:
- - compatible: brcm,bcm23550
-
-Example:
- / {
- model = "BCM23550 SoC";
- compatible = "brcm,bcm23550";
- [...]
- }
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
new file mode 100644
index 000000000000..c4b4efd28a55
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm23550.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom BCM23550 device tree bindings
+
+maintainers:
+ - Florian Fainelli <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - brcm,bcm23550-sparrow
+ - const: brcm,bcm23550
+
+...
--
2.19.1
Update the Broadcom BCM4708 SoC family binding document for boards/SoCs
to use YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../bindings/arm/bcm/brcm,bcm4708.txt | 15 ----
.../bindings/arm/bcm/brcm,bcm4708.yaml | 88 +++++++++++++++++++
2 files changed, 88 insertions(+), 15 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
deleted file mode 100644
index 8608a776caa7..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Broadcom BCM4708 device tree bindings
--------------------------------------------
-
-Boards with the BCM4708 SoC shall have the following properties:
-
-Required root node property:
-
-bcm4708
-compatible = "brcm,bcm4708";
-
-bcm4709
-compatible = "brcm,bcm4709";
-
-bcm53012
-compatible = "brcm,bcm53012";
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
new file mode 100644
index 000000000000..d48313c7ae45
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
@@ -0,0 +1,88 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm4708.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom BCM4708 device tree bindings
+
+description:
+ Broadcom BCM4708/47081/4709/47094/53012 Wi-Fi/network SoCs based
+ on the iProc architecture (Northstar).
+
+maintainers:
+ - Florian Fainelli <[email protected]>
+ - Hauke Mehrtens <[email protected]>
+ - Rafal Milecki <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ oneOf:
+ - description: BCM4708 based boards
+ items:
+ - enum:
+ - asus,rt-ac56u
+ - asus,rt-ac68u
+ - buffalo,wzr-1750dhp
+ - linksys,ea6300-v1
+ - linksys,ea6500-v2
+ - luxul,xap-1510v1
+ - luxul,xwc-1000
+ - netgear,r6250v1
+ - netgear,r6300v2
+ - smartrg,sr400ac
+ - brcm,bcm94708
+ - const: brcm,bcm4708
+
+ - description: BCM47081 based boards
+ items:
+ - enum:
+ - asus,rt-n18u
+ - buffalo,wzr-600dhp2
+ - buffalo,wzr-900dhp
+ - luxul,xap-1410v1
+ - luxul,xwr-1200v1
+ - tplink,archer-c5-v2
+ - const: brcm,bcm47081
+ - const: brcm,bcm4708
+
+ - description: BCM4709 based boards
+ items:
+ - enum:
+ - asus,rt-ac87u
+ - buffalo,wxr-1900dhp
+ - linksys,ea9200
+ - netgear,r7000
+ - netgear,r8000
+ - tplink,archer-c9-v1
+ - brcm,bcm94709
+ - const: brcm,bcm4709
+ - const: brcm,bcm4708
+
+ - description: BCM47094 based boards
+ items:
+ - enum:
+ - dlink,dir-885l
+ - linksys,panamera
+ - luxul,abr-4500-v1
+ - luxul,xap-1610-v1
+ - luxul,xbr-4500-v1
+ - luxul,xwc-2000-v1
+ - luxul,xwr-3100v1
+ - luxul,xwr-3150-v1
+ - netgear,r8500
+ - phicomm,k3
+ - const: brcm,bcm47094
+ - const: brcm,bcm4708
+
+ - description: BCM53012 based boards
+ items:
+ - enum:
+ - brcm,bcm953012er
+ - brcm,bcm953012hr
+ - brcm,bcm953012k
+ - const: brcm,brcm53012
+ - const: brcm,bcm4708
+...
--
2.19.1
Update Vulcan SoC family binding document for boards/SoCs to use YAML.
Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../bindings/arm/bcm/brcm,vulcan-soc.txt | 10 ---------
.../bindings/arm/bcm/brcm,vulcan-soc.yaml | 22 +++++++++++++++++++
2 files changed, 22 insertions(+), 10 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
deleted file mode 100644
index 223ed3471c08..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Broadcom Vulcan device tree bindings
-------------------------------------
-
-Boards with Broadcom Vulcan shall have the following root property:
-
-Broadcom Vulcan Evaluation Board:
- compatible = "brcm,vulcan-eval", "brcm,vulcan-soc";
-
-Generic Vulcan board:
- compatible = "brcm,vulcan-soc";
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
new file mode 100644
index 000000000000..c5b6f31c20b9
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,vulcan-soc.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom Vulcan device tree bindings
+
+maintainers:
+ - Robert Richter <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - brcm,vulcan-eval
+ - cavium,thunderx2-cn9900
+ - const: brcm,vulcan-soc
+
+...
--
2.19.1
Consolidate and move the 'secondary-boot-reg' property from the 3
existing binding documents into the main cpus.yaml documentation, also
make sure that the property is enforced when relevant.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../arm/bcm/brcm,bcm11351-cpu-method.txt | 36 -----------------
.../arm/bcm/brcm,bcm23550-cpu-method.txt | 36 -----------------
.../bindings/arm/bcm/brcm,nsp-cpu-method.txt | 39 -------------------
.../devicetree/bindings/arm/cpus.yaml | 33 ++++++++++++++++
4 files changed, 33 insertions(+), 111 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
deleted file mode 100644
index e3f996920403..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Broadcom Kona Family CPU Enable Method
---------------------------------------
-This binding defines the enable method used for starting secondary
-CPUs in the following Broadcom SoCs:
- BCM11130, BCM11140, BCM11351, BCM28145, BCM28155, BCM21664
-
-The enable method is specified by defining the following required
-properties in the "cpu" device tree node:
- - enable-method = "brcm,bcm11351-cpu-method";
- - secondary-boot-reg = <...>;
-
-The secondary-boot-reg property is a u32 value that specifies the
-physical address of the register used to request the ROM holding pen
-code release a secondary CPU. The value written to the register is
-formed by encoding the target CPU id into the low bits of the
-physical start address it should jump to.
-
-Example:
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu0: cpu@0 {
- device_type = "cpu";
- compatible = "arm,cortex-a9";
- reg = <0>;
- };
-
- cpu1: cpu@1 {
- device_type = "cpu";
- compatible = "arm,cortex-a9";
- reg = <1>;
- enable-method = "brcm,bcm11351-cpu-method";
- secondary-boot-reg = <0x3500417c>;
- };
- };
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt
deleted file mode 100644
index a3af54c0e404..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-Broadcom Kona Family CPU Enable Method
---------------------------------------
-This binding defines the enable method used for starting secondary
-CPUs in the following Broadcom SoCs:
- BCM23550
-
-The enable method is specified by defining the following required
-properties in the "cpu" device tree node:
- - enable-method = "brcm,bcm23550";
- - secondary-boot-reg = <...>;
-
-The secondary-boot-reg property is a u32 value that specifies the
-physical address of the register used to request the ROM holding pen
-code release a secondary CPU. The value written to the register is
-formed by encoding the target CPU id into the low bits of the
-physical start address it should jump to.
-
-Example:
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu0: cpu@0 {
- device_type = "cpu";
- compatible = "arm,cortex-a9";
- reg = <0>;
- };
-
- cpu1: cpu@1 {
- device_type = "cpu";
- compatible = "arm,cortex-a9";
- reg = <1>;
- enable-method = "brcm,bcm23550";
- secondary-boot-reg = <0x3500417c>;
- };
- };
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt
deleted file mode 100644
index 677ef9d9f445..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Broadcom Northstar Plus SoC CPU Enable Method
----------------------------------------------
-This binding defines the enable method used for starting secondary
-CPU in the following Broadcom SoCs:
- BCM58522, BCM58525, BCM58535, BCM58622, BCM58623, BCM58625, BCM88312
-
-The enable method is specified by defining the following required
-properties in the corresponding secondary "cpu" device tree node:
- - enable-method = "brcm,bcm-nsp-smp";
- - secondary-boot-reg = <...>;
-
-The secondary-boot-reg property is a u32 value that specifies the
-physical address of the register which should hold the common
-entry point for a secondary CPU. This entry is cpu node specific
-and should be added per cpu. E.g., in case of NSP (BCM58625) which
-is a dual core CPU SoC, this entry should be added to cpu1 node.
-
-
-Example:
- cpus {
- #address-cells = <1>;
- #size-cells = <0>;
-
- cpu0: cpu@0 {
- device_type = "cpu";
- compatible = "arm,cortex-a9";
- next-level-cache = <&L2>;
- reg = <0>;
- };
-
- cpu1: cpu@1 {
- device_type = "cpu";
- compatible = "arm,cortex-a9";
- next-level-cache = <&L2>;
- enable-method = "brcm,bcm-nsp-smp";
- secondary-boot-reg = <0xffff042c>;
- reg = <1>;
- };
- };
diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
index c23c24ff7575..d7b181a44789 100644
--- a/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@ -272,6 +272,39 @@ properties:
While optional, it is the preferred way to get access to
the cpu-core power-domains.
+ secondary-boot-reg:
+ $ref: '/schemas/types.yaml#/definitions/uint32'
+ description: |
+ Required for systems that have an "enable-method" property value of
+ "brcm,bcm11351-cpu-method", "brcm,bcm23550" or "brcm,bcm-nsp-smp".
+
+ This includes the following SoCs: |
+ BCM11130, BCM11140, BCM11351, BCM28145, BCM28155, BCM21664, BCM23550
+ BCM58522, BCM58525, BCM58535, BCM58622, BCM58623, BCM58625, BCM88312
+
+ The secondary-boot-reg property is a u32 value that specifies the
+ physical address of the register used to request the ROM holding pen
+ code release a secondary CPU. The value written to the register is
+ formed by encoding the target CPU id into the low bits of the
+ physical start address it should jump to.
+
+if:
+ # If the enable-method property contains one of those values
+ properties:
+ enable-method:
+ contains:
+ enum:
+ - brcm,bcm11351-cpu-method
+ - brcm,bcm23550
+ - brcm,bcm-nsp-smp
+ # and if enable-method is present
+ required:
+ - enable-method
+
+then:
+ required:
+ - secondary-boot-reg
+
required:
- device_type
- reg
--
2.19.1
Update the Broadcom BCM11351 SoC family binding document for boards/SoCs
to use YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../bindings/arm/bcm/brcm,bcm11351.txt | 10 ---------
.../bindings/arm/bcm/brcm,bcm11351.yaml | 21 +++++++++++++++++++
2 files changed, 21 insertions(+), 10 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
deleted file mode 100644
index 0ff6560e6094..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Broadcom BCM11351 device tree bindings
--------------------------------------------
-
-Boards with the bcm281xx SoC family (which includes bcm11130, bcm11140,
-bcm11351, bcm28145, bcm28155 SoCs) shall have the following properties:
-
-Required root node property:
-
-compatible = "brcm,bcm11351";
-DEPRECATED: compatible = "bcm,bcm11351";
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
new file mode 100644
index 000000000000..b5ef2666e6b2
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm11351.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom BCM11351 device tree bindings
+
+maintainers:
+ - Florian Fainelli <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - brcm,bcm28155-ap
+ - const: brcm,bcm11351
+
+...
--
2.19.1
Update the Broadcom BCM21664 SoC binding document for boards/SoCs to use
YAML. Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../bindings/arm/bcm/brcm,bcm21664.txt | 15 -------------
.../bindings/arm/bcm/brcm,bcm21664.yaml | 21 +++++++++++++++++++
2 files changed, 21 insertions(+), 15 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
deleted file mode 100644
index e0774255e1a6..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Broadcom BCM21664 device tree bindings
---------------------------------------
-
-This document describes the device tree bindings for boards with the BCM21664
-SoC.
-
-Required root node property:
- - compatible: brcm,bcm21664
-
-Example:
- / {
- model = "BCM21664 SoC";
- compatible = "brcm,bcm21664";
- [...]
- }
diff --git a/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
new file mode 100644
index 000000000000..aafbd6a27708
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
@@ -0,0 +1,21 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/brcm,bcm21664.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom BCM21664 device tree bindings
+
+maintainers:
+ - Florian Fainelli <[email protected]>
+
+properties:
+ $nodename:
+ const: '/'
+ compatible:
+ items:
+ - enum:
+ - brcm,bcm21664-garnet
+ - const: brcm,bcm21664
+
+...
--
2.19.1
Convert the Raspberry Pi BCM2835 firmware binding document to YAML.
Verified with dt_binding_check and dtbs_check.
Signed-off-by: Florian Fainelli <[email protected]>
---
.../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 --------
.../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 33 +++++++++++++++++++
2 files changed, 33 insertions(+), 14 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
deleted file mode 100644
index 6824b3180ffb..000000000000
--- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Raspberry Pi VideoCore firmware driver
-
-Required properties:
-
-- compatible: Should be "raspberrypi,bcm2835-firmware"
-- mboxes: Phandle to the firmware device's Mailbox.
- (See: ../mailbox/mailbox.txt for more information)
-
-Example:
-
-firmware {
- compatible = "raspberrypi,bcm2835-firmware";
- mboxes = <&mailbox>;
-};
diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
new file mode 100644
index 000000000000..db355d970f2b
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Raspberry Pi VideoCore firmware driver
+
+maintainers:
+ - Eric Anholt <[email protected]>
+ - Stefan Wahren <[email protected]>
+
+properties:
+ compatible:
+ const: raspberrypi,bcm2835-firmware simple-bus
+
+ mboxes:
+ $ref: '/schemas/types.yaml#/definitions/phandle'
+ description: |
+ Phandle to the firmware device's Mailbox.
+ (See: ../mailbox/mailbox.txt for more information)
+
+required:
+ - compatible
+ - mboxes
+
+examples:
+ - |
+ firmware {
+ compatible = "raspberrypi,bcm2835-firmware";
+ mboxes = <&mailbox>;
+ };
+...
--
2.19.1
On Tue, Feb 04, 2020 at 03:55:51PM -0800, Florian Fainelli wrote:
> diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
> index c23c24ff7575..d7b181a44789 100644
> --- a/Documentation/devicetree/bindings/arm/cpus.yaml
> +++ b/Documentation/devicetree/bindings/arm/cpus.yaml
> @@ -272,6 +272,39 @@ properties:
> While optional, it is the preferred way to get access to
> the cpu-core power-domains.
>
> + secondary-boot-reg:
> + $ref: '/schemas/types.yaml#/definitions/uint32'
> + description: |
> + Required for systems that have an "enable-method" property value of
> + "brcm,bcm11351-cpu-method", "brcm,bcm23550" or "brcm,bcm-nsp-smp".
> +
> + This includes the following SoCs: |
> + BCM11130, BCM11140, BCM11351, BCM28145, BCM28155, BCM21664, BCM23550
> + BCM58522, BCM58525, BCM58535, BCM58622, BCM58623, BCM58625, BCM88312
> +
> + The secondary-boot-reg property is a u32 value that specifies the
> + physical address of the register used to request the ROM holding pen
> + code release a secondary CPU. The value written to the register is
> + formed by encoding the target CPU id into the low bits of the
> + physical start address it should jump to.
> +
> +if:
> + # If the enable-method property contains one of those values
> + properties:
> + enable-method:
> + contains:
> + enum:
> + - brcm,bcm11351-cpu-method
> + - brcm,bcm23550
> + - brcm,bcm-nsp-smp
> + # and if enable-method is present
Those comments were purely for the explanation, but you can keep them
I guess :)
Regardless on whether or not you keep them, for the whole series
Acked-by: Maxime Ripard <[email protected]>
Maxime
Thanks Florian,
Patch series:
Acked-by: Scott Branden <[email protected]>
On 2020-02-04 3:55 p.m., Florian Fainelli wrote:
> Hi Rob, Maxime,
>
> This patch series converts most files under D/dt-bindings/arm/bcm/ with
> the exception of bcm63138 and brcmstb to the YAML format. Those two may
> be split accordingly later on since document not just the root node.
>
> Changes in v2:
>
> - fixed typo in Vulcan binding
> - simplified how SoC compatible strings are specified
> - fixed filename in bcm2835 firmware binding
> - added 'secondary-boot-reg' constraint
>
>
> Florian Fainelli (12):
> dt-bindings: arm: bcm: Convert Cygnus to YAML
> dt-bindings: arm: bcm: Convert Hurricane 2 to YAML
> dt-bindings: arm: bcm: Convert Northstar Plus to YAML
> dt-bindings: arm: bcm: Convert Northstar 2 to YAML
> dt-bindings: arm: bcm: Convert Stingray to YAML
> dt-bindings: arm: bcm: Convert BCM21664 to YAML
> dt-bindings: arm: bcm: Convert BCM23550 to YAML
> dt-bindings: arm: bcm: Convert BCM4708 to YAML
> dt-bindings: arm: bcm: Convert BCM11351 to YAML
> dt-bindings: arm: bcm: Convert Vulcan to YAML
> dt-bindings: arm: Document Broadcom SoCs 'secondary-boot-reg'
> dt-bindings: arm: bcm: Convert BCM2835 firmware binding to YAML
>
> .../arm/bcm/brcm,bcm11351-cpu-method.txt | 36 --------
> .../bindings/arm/bcm/brcm,bcm11351.txt | 10 ---
> .../bindings/arm/bcm/brcm,bcm11351.yaml | 21 +++++
> .../bindings/arm/bcm/brcm,bcm21664.txt | 15 ----
> .../bindings/arm/bcm/brcm,bcm21664.yaml | 21 +++++
> .../arm/bcm/brcm,bcm23550-cpu-method.txt | 36 --------
> .../bindings/arm/bcm/brcm,bcm23550.txt | 15 ----
> .../bindings/arm/bcm/brcm,bcm23550.yaml | 21 +++++
> .../bindings/arm/bcm/brcm,bcm4708.txt | 15 ----
> .../bindings/arm/bcm/brcm,bcm4708.yaml | 88 +++++++++++++++++++
> .../bindings/arm/bcm/brcm,cygnus.txt | 31 -------
> .../bindings/arm/bcm/brcm,cygnus.yaml | 29 ++++++
> .../devicetree/bindings/arm/bcm/brcm,hr2.txt | 14 ---
> .../devicetree/bindings/arm/bcm/brcm,hr2.yaml | 28 ++++++
> .../devicetree/bindings/arm/bcm/brcm,ns2.txt | 9 --
> .../devicetree/bindings/arm/bcm/brcm,ns2.yaml | 23 +++++
> .../bindings/arm/bcm/brcm,nsp-cpu-method.txt | 39 --------
> .../devicetree/bindings/arm/bcm/brcm,nsp.txt | 34 -------
> .../devicetree/bindings/arm/bcm/brcm,nsp.yaml | 36 ++++++++
> .../bindings/arm/bcm/brcm,stingray.txt | 12 ---
> .../bindings/arm/bcm/brcm,stingray.yaml | 24 +++++
> .../bindings/arm/bcm/brcm,vulcan-soc.txt | 10 ---
> .../bindings/arm/bcm/brcm,vulcan-soc.yaml | 22 +++++
> .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 ---
> .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 33 +++++++
> .../devicetree/bindings/arm/cpus.yaml | 33 +++++++
> 26 files changed, 379 insertions(+), 290 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351-cpu-method.txt
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm11351.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm21664.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550-cpu-method.txt
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm23550.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,cygnus.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,hr2.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,ns2.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,stingray.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,vulcan-soc.yaml
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
>
On 2/4/20 11:49 PM, Maxime Ripard wrote:
> On Tue, Feb 04, 2020 at 03:55:51PM -0800, Florian Fainelli wrote:
>> diff --git a/Documentation/devicetree/bindings/arm/cpus.yaml b/Documentation/devicetree/bindings/arm/cpus.yaml
>> index c23c24ff7575..d7b181a44789 100644
>> --- a/Documentation/devicetree/bindings/arm/cpus.yaml
>> +++ b/Documentation/devicetree/bindings/arm/cpus.yaml
>> @@ -272,6 +272,39 @@ properties:
>> While optional, it is the preferred way to get access to
>> the cpu-core power-domains.
>>
>> + secondary-boot-reg:
>> + $ref: '/schemas/types.yaml#/definitions/uint32'
>> + description: |
>> + Required for systems that have an "enable-method" property value of
>> + "brcm,bcm11351-cpu-method", "brcm,bcm23550" or "brcm,bcm-nsp-smp".
>> +
>> + This includes the following SoCs: |
>> + BCM11130, BCM11140, BCM11351, BCM28145, BCM28155, BCM21664, BCM23550
>> + BCM58522, BCM58525, BCM58535, BCM58622, BCM58623, BCM58625, BCM88312
>> +
>> + The secondary-boot-reg property is a u32 value that specifies the
>> + physical address of the register used to request the ROM holding pen
>> + code release a secondary CPU. The value written to the register is
>> + formed by encoding the target CPU id into the low bits of the
>> + physical start address it should jump to.
>> +
>> +if:
>> + # If the enable-method property contains one of those values
>> + properties:
>> + enable-method:
>> + contains:
>> + enum:
>> + - brcm,bcm11351-cpu-method
>> + - brcm,bcm23550
>> + - brcm,bcm-nsp-smp
>> + # and if enable-method is present
>
> Those comments were purely for the explanation, but you can keep them
> I guess :)
>
> Regardless on whether or not you keep them, for the whole series
> Acked-by: Maxime Ripard <[email protected]>
You could almost have Signed-off-by on this one, thanks a lot for
walking me through examples.
--
Florian
On Tue, Feb 04, 2020 at 03:55:52PM -0800, Florian Fainelli wrote:
> Convert the Raspberry Pi BCM2835 firmware binding document to YAML.
> Verified with dt_binding_check and dtbs_check.
>
> Signed-off-by: Florian Fainelli <[email protected]>
> ---
> .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 --------
> .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 33 +++++++++++++++++++
> 2 files changed, 33 insertions(+), 14 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
> create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
>
> diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
> deleted file mode 100644
> index 6824b3180ffb..000000000000
> --- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -Raspberry Pi VideoCore firmware driver
> -
> -Required properties:
> -
> -- compatible: Should be "raspberrypi,bcm2835-firmware"
> -- mboxes: Phandle to the firmware device's Mailbox.
> - (See: ../mailbox/mailbox.txt for more information)
> -
> -Example:
> -
> -firmware {
> - compatible = "raspberrypi,bcm2835-firmware";
> - mboxes = <&mailbox>;
> -};
> diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> new file mode 100644
> index 000000000000..db355d970f2b
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> @@ -0,0 +1,33 @@
> +# SPDX-License-Identifier: GPL-2.0
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Raspberry Pi VideoCore firmware driver
> +
> +maintainers:
> + - Eric Anholt <[email protected]>
> + - Stefan Wahren <[email protected]>
> +
> +properties:
> + compatible:
> + const: raspberrypi,bcm2835-firmware simple-bus
^
I need to check for spaces with the meta-schema...
> +
> + mboxes:
> + $ref: '/schemas/types.yaml#/definitions/phandle'
Already has a type, just need to define how many items and what they are
if more than one.
> + description: |
> + Phandle to the firmware device's Mailbox.
> + (See: ../mailbox/mailbox.txt for more information)
Drop this. That's every 'mboxes'.
> +
> +required:
> + - compatible
> + - mboxes
> +
> +examples:
> + - |
> + firmware {
> + compatible = "raspberrypi,bcm2835-firmware";
> + mboxes = <&mailbox>;
> + };
> +...
> --
> 2.19.1
>
On Tue, Feb 04, 2020 at 03:55:40PM -0800, Florian Fainelli wrote:
> Hi Rob, Maxime,
>
> This patch series converts most files under D/dt-bindings/arm/bcm/ with
> the exception of bcm63138 and brcmstb to the YAML format. Those two may
> be split accordingly later on since document not just the root node.
>
> Changes in v2:
>
> - fixed typo in Vulcan binding
> - simplified how SoC compatible strings are specified
> - fixed filename in bcm2835 firmware binding
> - added 'secondary-boot-reg' constraint
>
>
> Florian Fainelli (12):
> dt-bindings: arm: bcm: Convert Cygnus to YAML
> dt-bindings: arm: bcm: Convert Hurricane 2 to YAML
> dt-bindings: arm: bcm: Convert Northstar Plus to YAML
> dt-bindings: arm: bcm: Convert Northstar 2 to YAML
> dt-bindings: arm: bcm: Convert Stingray to YAML
> dt-bindings: arm: bcm: Convert BCM21664 to YAML
> dt-bindings: arm: bcm: Convert BCM23550 to YAML
> dt-bindings: arm: bcm: Convert BCM4708 to YAML
> dt-bindings: arm: bcm: Convert BCM11351 to YAML
> dt-bindings: arm: bcm: Convert Vulcan to YAML
> dt-bindings: arm: Document Broadcom SoCs 'secondary-boot-reg'
For all the above,
Reviewed-by: Rob Herring <[email protected]>
> dt-bindings: arm: bcm: Convert BCM2835 firmware binding to YAML
>
On 2/6/20 11:24 AM, Rob Herring wrote:
> On Tue, Feb 04, 2020 at 03:55:40PM -0800, Florian Fainelli wrote:
>> Hi Rob, Maxime,
>>
>> This patch series converts most files under D/dt-bindings/arm/bcm/ with
>> the exception of bcm63138 and brcmstb to the YAML format. Those two may
>> be split accordingly later on since document not just the root node.
>>
>> Changes in v2:
>>
>> - fixed typo in Vulcan binding
>> - simplified how SoC compatible strings are specified
>> - fixed filename in bcm2835 firmware binding
>> - added 'secondary-boot-reg' constraint
>>
>>
>> Florian Fainelli (12):
>> dt-bindings: arm: bcm: Convert Cygnus to YAML
>> dt-bindings: arm: bcm: Convert Hurricane 2 to YAML
>> dt-bindings: arm: bcm: Convert Northstar Plus to YAML
>> dt-bindings: arm: bcm: Convert Northstar 2 to YAML
>> dt-bindings: arm: bcm: Convert Stingray to YAML
>> dt-bindings: arm: bcm: Convert BCM21664 to YAML
>> dt-bindings: arm: bcm: Convert BCM23550 to YAML
>> dt-bindings: arm: bcm: Convert BCM4708 to YAML
>> dt-bindings: arm: bcm: Convert BCM11351 to YAML
>> dt-bindings: arm: bcm: Convert Vulcan to YAML
>> dt-bindings: arm: Document Broadcom SoCs 'secondary-boot-reg'
>
> For all the above,
>
> Reviewed-by: Rob Herring <[email protected]>
Applied 1-11 to devicetree/next, I will resubmit the last one later this
week.
--
Florian
On 2/6/2020 11:23 AM, Rob Herring wrote:
> On Tue, Feb 04, 2020 at 03:55:52PM -0800, Florian Fainelli wrote:
>> Convert the Raspberry Pi BCM2835 firmware binding document to YAML.
>> Verified with dt_binding_check and dtbs_check.
>>
>> Signed-off-by: Florian Fainelli <[email protected]>
>> ---
>> .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 --------
>> .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 33 +++++++++++++++++++
>> 2 files changed, 33 insertions(+), 14 deletions(-)
>> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
>> create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
>>
>> diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
>> deleted file mode 100644
>> index 6824b3180ffb..000000000000
>> --- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
>> +++ /dev/null
>> @@ -1,14 +0,0 @@
>> -Raspberry Pi VideoCore firmware driver
>> -
>> -Required properties:
>> -
>> -- compatible: Should be "raspberrypi,bcm2835-firmware"
>> -- mboxes: Phandle to the firmware device's Mailbox.
>> - (See: ../mailbox/mailbox.txt for more information)
>> -
>> -Example:
>> -
>> -firmware {
>> - compatible = "raspberrypi,bcm2835-firmware";
>> - mboxes = <&mailbox>;
>> -};
>> diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
>> new file mode 100644
>> index 000000000000..db355d970f2b
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
>> @@ -0,0 +1,33 @@
>> +# SPDX-License-Identifier: GPL-2.0
>> +%YAML 1.2
>> +---
>> +$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
>> +$schema: http://devicetree.org/meta-schemas/core.yaml#
>> +
>> +title: Raspberry Pi VideoCore firmware driver
>> +
>> +maintainers:
>> + - Eric Anholt <[email protected]>
>> + - Stefan Wahren <[email protected]>
>> +
>> +properties:
>> + compatible:
>> + const: raspberrypi,bcm2835-firmware simple-bus
> ^
>
> I need to check for spaces with the meta-schema...
I believe I had tried to use:
const: raspberrypi,bcm2835-firmware
const: simple-bus
but this did not work, and I had to resort to doing this.
>
>> +
>> + mboxes:
>> + $ref: '/schemas/types.yaml#/definitions/phandle'
>
> Already has a type, just need to define how many items and what they are
> if more than one.
OK, thanks!
--
Florian
Hi Florian,
On Sun, Mar 22, 2020 at 02:35:17PM -0700, Florian Fainelli wrote:
>
>
> On 2/6/2020 11:23 AM, Rob Herring wrote:
> > On Tue, Feb 04, 2020 at 03:55:52PM -0800, Florian Fainelli wrote:
> >> Convert the Raspberry Pi BCM2835 firmware binding document to YAML.
> >> Verified with dt_binding_check and dtbs_check.
> >>
> >> Signed-off-by: Florian Fainelli <[email protected]>
> >> ---
> >> .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 --------
> >> .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 33 +++++++++++++++++++
> >> 2 files changed, 33 insertions(+), 14 deletions(-)
> >> delete mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
> >> create mode 100644 Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> >>
> >> diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
> >> deleted file mode 100644
> >> index 6824b3180ffb..000000000000
> >> --- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt
> >> +++ /dev/null
> >> @@ -1,14 +0,0 @@
> >> -Raspberry Pi VideoCore firmware driver
> >> -
> >> -Required properties:
> >> -
> >> -- compatible: Should be "raspberrypi,bcm2835-firmware"
> >> -- mboxes: Phandle to the firmware device's Mailbox.
> >> - (See: ../mailbox/mailbox.txt for more information)
> >> -
> >> -Example:
> >> -
> >> -firmware {
> >> - compatible = "raspberrypi,bcm2835-firmware";
> >> - mboxes = <&mailbox>;
> >> -};
> >> diff --git a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> >> new file mode 100644
> >> index 000000000000..db355d970f2b
> >> --- /dev/null
> >> +++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.yaml
> >> @@ -0,0 +1,33 @@
> >> +# SPDX-License-Identifier: GPL-2.0
> >> +%YAML 1.2
> >> +---
> >> +$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
> >> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> >> +
> >> +title: Raspberry Pi VideoCore firmware driver
> >> +
> >> +maintainers:
> >> + - Eric Anholt <[email protected]>
> >> + - Stefan Wahren <[email protected]>
> >> +
> >> +properties:
> >> + compatible:
> >> + const: raspberrypi,bcm2835-firmware simple-bus
> > ^
> >
> > I need to check for spaces with the meta-schema...
>
> I believe I had tried to use:
>
> const: raspberrypi,bcm2835-firmware
> const: simple-bus
>
> but this did not work, and I had to resort to doing this.
That would be:
compatible:
items:
- const: raspberrypi,bcm2835-firmware
- const: simple-bus
It changes slightly from what the initial binding was saying though,
since it wasn't mentionning simple-bus at all? Is that on purpose?
Maxime
On Mon, 2020-03-23 at 09:40 +0100, Maxime Ripard wrote:
> Hi Florian,
>
> On Sun, Mar 22, 2020 at 02:35:17PM -0700, Florian Fainelli wrote:
> >
> > On 2/6/2020 11:23 AM, Rob Herring wrote:
> > > On Tue, Feb 04, 2020 at 03:55:52PM -0800, Florian Fainelli wrote:
> > > > Convert the Raspberry Pi BCM2835 firmware binding document to YAML.
> > > > Verified with dt_binding_check and dtbs_check.
> > > >
> > > > Signed-off-by: Florian Fainelli <[email protected]>
> > > > ---
> > > > .../arm/bcm/raspberrypi,bcm2835-firmware.txt | 14 --------
> > > > .../arm/bcm/raspberrypi,bcm2835-firmware.yaml | 33 +++++++++++++++++++
> > > > 2 files changed, 33 insertions(+), 14 deletions(-)
> > > > delete mode 100644
> > > > Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.txt
> > > > create mode 100644
> > > > Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.yaml
> > > >
> > > > diff --git
> > > > a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.txt
> > > > b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.txt
> > > > deleted file mode 100644
> > > > index 6824b3180ffb..000000000000
> > > > --- a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.txt
> > > > +++ /dev/null
> > > > @@ -1,14 +0,0 @@
> > > > -Raspberry Pi VideoCore firmware driver
> > > > -
> > > > -Required properties:
> > > > -
> > > > -- compatible: Should be "raspberrypi,bcm2835-firmware"
> > > > -- mboxes: Phandle to the firmware device's Mailbox.
> > > > - (See: ../mailbox/mailbox.txt for more
> > > > information)
> > > > -
> > > > -Example:
> > > > -
> > > > -firmware {
> > > > - compatible = "raspberrypi,bcm2835-firmware";
> > > > - mboxes = <&mailbox>;
> > > > -};
> > > > diff --git
> > > > a/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.yaml
> > > > b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.yaml
> > > > new file mode 100644
> > > > index 000000000000..db355d970f2b
> > > > --- /dev/null
> > > > +++ b/Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-
> > > > firmware.yaml
> > > > @@ -0,0 +1,33 @@
> > > > +# SPDX-License-Identifier: GPL-2.0
> > > > +%YAML 1.2
> > > > +---
> > > > +$id:
> > > > http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
> > > > +$schema: http://devicetree.org/meta-schemas/core.yaml#
> > > > +
> > > > +title: Raspberry Pi VideoCore firmware driver
> > > > +
> > > > +maintainers:
> > > > + - Eric Anholt <[email protected]>
> > > > + - Stefan Wahren <[email protected]>
> > > > +
> > > > +properties:
> > > > + compatible:
> > > > + const: raspberrypi,bcm2835-firmware simple-bus
> > > ^
> > >
> > > I need to check for spaces with the meta-schema...
> >
> > I believe I had tried to use:
> >
> > const: raspberrypi,bcm2835-firmware
> > const: simple-bus
> >
> > but this did not work, and I had to resort to doing this.
>
> That would be:
>
> compatible:
> items:
> - const: raspberrypi,bcm2835-firmware
> - const: simple-bus
>
> It changes slightly from what the initial binding was saying though,
> since it wasn't mentionning simple-bus at all? Is that on purpose?
I guess we failed to update the binding after starting to use the firmware
device as a bus.