This is a first tentative to convert some of the simplest Amlogic dt-bindings to the yaml format. All have been tested using : $ make ARCH=arm64 dtbs_check Issues with the amlogic arm64 DTs has already been identified thanks to the validation scripts. The DT fixes will be pushed once these yaml bindings are acked. Neil Armstrong (9): dt-bindings: mailbox: meson-mhu: convert to yaml dt-bindings: rng: amlogic,meson-rng: convert to yaml dt-bindings: spi: meson: convert to yaml dt-bindings: reset: amlogic,meson-reset: convert to yaml dt-bindings: arm: amlogic: amlogic,meson-gx-ao-secure: convert to yaml dt-bindings: phy: meson-g12a-usb2-phy: convert to yaml dt-bindings: phy: meson-g12a-usb3-pcie-phy: convert to yaml dt-bindings: serial: meson-uart: convert to yaml dt-bindings: watchdog: meson-gxbb-wdt: convert to yaml .../amlogic/amlogic,meson-gx-ao-secure.txt | 28 ------- .../amlogic/amlogic,meson-gx-ao-secure.yaml | 42 +++++++++++ .../devicetree/bindings/mailbox/meson-mhu.txt | 34 --------- .../bindings/mailbox/meson-mhu.yaml | 53 +++++++++++++ .../bindings/phy/meson-g12a-usb2-phy.txt | 22 ------ .../bindings/phy/meson-g12a-usb2-phy.yaml | 67 +++++++++++++++++ .../bindings/phy/meson-g12a-usb3-pcie-phy.txt | 22 ------ .../phy/meson-g12a-usb3-pcie-phy.yaml | 61 +++++++++++++++ .../bindings/reset/amlogic,meson-reset.txt | 19 ----- .../bindings/reset/amlogic,meson-reset.yaml | 40 ++++++++++ .../bindings/rng/amlogic,meson-rng.txt | 21 ------ .../bindings/rng/amlogic,meson-rng.yaml | 37 +++++++++ .../bindings/serial/amlogic,meson-uart.txt | 38 ---------- .../bindings/serial/amlogic,meson-uart.yaml | 75 +++++++++++++++++++ .../bindings/spi/amlogic,meson-gx-spicc.yaml | 74 ++++++++++++++++++ .../bindings/spi/amlogic,meson6-spifc.yaml | 57 ++++++++++++++ .../devicetree/bindings/spi/spi-meson.txt | 55 -------------- .../bindings/watchdog/meson-gxbb-wdt.txt | 16 ---- .../bindings/watchdog/meson-gxbb-wdt.yaml | 37 +++++++++ 19 files changed, 543 insertions(+), 255 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml delete mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.txt create mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.yaml delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml delete mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml delete mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml delete mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml delete mode 100644 Documentation/devicetree/bindings/spi/spi-meson.txt delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.yaml -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../devicetree/bindings/mailbox/meson-mhu.txt | 34 ------------ .../bindings/mailbox/meson-mhu.yaml | 53 +++++++++++++++++++ 2 files changed, 53 insertions(+), 34 deletions(-) delete mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.txt create mode 100644 Documentation/devicetree/bindings/mailbox/meson-mhu.yaml diff --git a/Documentation/devicetree/bindings/mailbox/meson-mhu.txt b/Documentation/devicetree/bindings/mailbox/meson-mhu.txt deleted file mode 100644 index a530310772b9..000000000000 --- a/Documentation/devicetree/bindings/mailbox/meson-mhu.txt +++ /dev/null @@ -1,34 +0,0 @@ -Amlogic Meson MHU Mailbox Driver -================================ - -The Amlogic's Meson SoCs Message-Handling-Unit (MHU) is a mailbox controller -that has 3 independent channels/links to communicate with remote processor(s). -MHU links are hardwired on a platform. A link raises interrupt for any -received data. However, there is no specified way of knowing if the sent -data has been read by the remote. This driver assumes the sender polls -STAT register and the remote clears it after having read the data. - -Mailbox Device Node: -==================== - -Required properties: --------------------- -- compatible: Shall be "amlogic,meson-gxbb-mhu" -- reg: Contains the mailbox register address range (base - address and length) -- #mbox-cells Shall be 1 - the index of the channel needed. -- interrupts: Contains the interrupt information corresponding to - each of the 2 links of MHU. - -Example: --------- - - mailbox: mailbox@c883c404 { - #mbox-cells = <1>; - compatible = "amlogic,meson-gxbb-mhu"; - reg = <0 0xc883c404 0 0x4c>; - interrupts = <0 208 IRQ_TYPE_EDGE_RISING>, - <0 209 IRQ_TYPE_EDGE_RISING>, - <0 210 IRQ_TYPE_EDGE_RISING>; - #mbox-cells = <1>; - }; diff --git a/Documentation/devicetree/bindings/mailbox/meson-mhu.yaml b/Documentation/devicetree/bindings/mailbox/meson-mhu.yaml new file mode 100644 index 000000000000..b84c4c05e176 --- /dev/null +++ b/Documentation/devicetree/bindings/mailbox/meson-mhu.yaml @@ -0,0 +1,53 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/mailbox/meson-mhu.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson Message-Handling-Unit Controller + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +description: | + The Amlogic's Meson SoCs Message-Handling-Unit (MHU) is a mailbox controller + that has 3 independent channels/links to communicate with remote processor(s). + MHU links are hardwired on a platform. A link raises interrupt for any + received data. However, there is no specified way of knowing if the sent + data has been read by the remote. This driver assumes the sender polls + STAT register and the remote clears it after having read the data. + +properties: + compatible: + enum: + - amlogic,meson-gxbb-mhu + + reg: + maxItems: 1 + + interrupts: + minItems: 3 + maxItems: 3 + description: + Contains the interrupt information corresponding to each of the 3 links + of MHU. + + "#mbox-cells": + const: 1 + +required: + - compatible + - reg + - interrupts + - "#mbox-cells" + +examples: + - | + mailbox@c883c404 { + compatible = "amlogic,meson-gxbb-mhu"; + reg = <0xc883c404 0x4c>; + interrupts = <208>, <209>, <210>; + #mbox-cells = <1>; + }; + -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/rng/amlogic,meson-rng.txt | 21 ----------- .../bindings/rng/amlogic,meson-rng.yaml | 37 +++++++++++++++++++ 2 files changed, 37 insertions(+), 21 deletions(-) delete mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt create mode 100644 Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml diff --git a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt deleted file mode 100644 index 4d403645ac9b..000000000000 --- a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.txt +++ /dev/null @@ -1,21 +0,0 @@ -Amlogic Meson Random number generator -===================================== - -Required properties: - -- compatible : should be "amlogic,meson-rng" -- reg : Specifies base physical address and size of the registers. - -Optional properties: - -- clocks : phandle to the following named clocks -- clock-names: Name of core clock, must be "core" - -Example: - -rng { - compatible = "amlogic,meson-rng"; - reg = <0x0 0xc8834000 0x0 0x4>; - clocks = <&clkc CLKID_RNG0>; - clock-names = "core"; -}; diff --git a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml new file mode 100644 index 000000000000..a9ff3cb35c5e --- /dev/null +++ b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/rng/amlogic,meson-rng.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson Random number generator + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +properties: + compatible: + enum: + - amlogic,meson-rng + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + items: + - const: core + +required: + - compatible + - reg + +examples: + - | + rng@c8834000 { + compatible = "amlogic,meson-rng"; + reg = <0xc8834000 0x4>; + }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/spi/amlogic,meson-gx-spicc.yaml | 74 +++++++++++++++++++ .../bindings/spi/amlogic,meson6-spifc.yaml | 57 ++++++++++++++ .../devicetree/bindings/spi/spi-meson.txt | 55 -------------- 3 files changed, 131 insertions(+), 55 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml delete mode 100644 Documentation/devicetree/bindings/spi/spi-meson.txt diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml new file mode 100644 index 000000000000..6e2c41c730b5 --- /dev/null +++ b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml @@ -0,0 +1,74 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/spi/amlogic,meson-gx-spicc.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson SPI Communication Controller + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +allOf: + - $ref: "spi-controller.yaml#" + +description: | + The Meson SPICC is a generic SPI controller for general purpose Full-Duplex + communications with dedicated 16 words RX/TX PIO FIFOs. + +properties: + compatible: + oneOf: + - description: SPICC controller on Amlogic GX and compatible SoCs + enum: + - amlogic,meson-gx-spicc + - description: SPICC controller on Amlogic AXG and compatible SoCs + enum: + - amlogic,meson-axg-spicc + + interrupts: + maxItems: 1 + + reg: + maxItems: 1 + + resets: + description: phandle of the internal reset line + maxItems: 1 + + clocks: + maxItems: 1 + + clock-names: + description: input clock for the baud rate generator + items: + - const: core + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + - "#address-cells" + - "#size-cells" + +examples: + - | + spi@c1108d80 { + compatible = "amlogic,meson-gx-spicc"; + reg = <0xc1108d80 0x80>; + interrupts = <112>; + clocks = <&clk81>; + clock-names = "core"; + #address-cells = <1>; + #size-cells = <0>; + }; + diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml new file mode 100644 index 000000000000..5f34aed1ad40 --- /dev/null +++ b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml @@ -0,0 +1,57 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/spi/amlogic,meson6-spifc.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson SPI Flash Controller + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +allOf: + - $ref: "spi-controller.yaml#" + +description: | + The Meson SPIFC is a controller optimized for communication with SPI + NOR memories, without DMA support and a 64-byte unified transmit / + receive buffer. + +properties: + compatible: + oneOf: + - enum: + - amlogic,meson6-spifc + - enum: + - amlogic,meson-gxbb-spifc + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + +required: + - compatible + - reg + - clocks + - "#address-cells" + - "#size-cells" + +examples: + - | + spi@c1108c80 { + compatible = "amlogic,meson6-spifc"; + reg = <0xc1108c80 0x80>; + clocks = <&clk81>; + #address-cells = <1>; + #size-cells = <0>; + }; + diff --git a/Documentation/devicetree/bindings/spi/spi-meson.txt b/Documentation/devicetree/bindings/spi/spi-meson.txt deleted file mode 100644 index b7f5e86fed22..000000000000 --- a/Documentation/devicetree/bindings/spi/spi-meson.txt +++ /dev/null @@ -1,55 +0,0 @@ -Amlogic Meson SPI controllers - -* SPIFC (SPI Flash Controller) - -The Meson SPIFC is a controller optimized for communication with SPI -NOR memories, without DMA support and a 64-byte unified transmit / -receive buffer. - -Required properties: - - compatible: should be "amlogic,meson6-spifc" or "amlogic,meson-gxbb-spifc" - - reg: physical base address and length of the controller registers - - clocks: phandle of the input clock for the baud rate generator - - #address-cells: should be 1 - - #size-cells: should be 0 - - spi@c1108c80 { - compatible = "amlogic,meson6-spifc"; - reg = <0xc1108c80 0x80>; - clocks = <&clk81>; - #address-cells = <1>; - #size-cells = <0>; - }; - -* SPICC (SPI Communication Controller) - -The Meson SPICC is generic SPI controller for general purpose Full-Duplex -communications with dedicated 16 words RX/TX PIO FIFOs. - -Required properties: - - compatible: should be: - "amlogic,meson-gx-spicc" on Amlogic GX and compatible SoCs. - "amlogic,meson-axg-spicc" on Amlogic AXG and compatible SoCs - - reg: physical base address and length of the controller registers - - interrupts: The interrupt specifier - - clock-names: Must contain "core" - - clocks: phandle of the input clock for the baud rate generator - - #address-cells: should be 1 - - #size-cells: should be 0 - -Optional properties: - - resets: phandle of the internal reset line - -See ../spi/spi-bus.txt for more details on SPI bus master and slave devices -required and optional properties. - -Example : - spi@c1108d80 { - compatible = "amlogic,meson-gx-spicc"; - reg = <0xc1108d80 0x80>; - interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>; - clock-names = "core"; - clocks = <&clk81>; - #address-cells = <1>; - #size-cells = <0>; - }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/reset/amlogic,meson-reset.txt | 19 --------- .../bindings/reset/amlogic,meson-reset.yaml | 40 +++++++++++++++++++ 2 files changed, 40 insertions(+), 19 deletions(-) delete mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt create mode 100644 Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt deleted file mode 100644 index 28ef6c295c76..000000000000 --- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.txt +++ /dev/null @@ -1,19 +0,0 @@ -Amlogic Meson SoC Reset Controller -======================================= - -Please also refer to reset.txt in this directory for common reset -controller binding usage. - -Required properties: -- compatible: Should be "amlogic,meson8b-reset", "amlogic,meson-gxbb-reset" or - "amlogic,meson-axg-reset". -- reg: should contain the register address base -- #reset-cells: 1, see below - -example: - -reset: reset-controller { - compatible = "amlogic,meson-gxbb-reset"; - reg = <0x0 0x04404 0x0 0x20>; - #reset-cells = <1>; -}; diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml new file mode 100644 index 000000000000..dd211bf84f25 --- /dev/null +++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml @@ -0,0 +1,40 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/reset/amlogic,meson-reset.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson SoC Reset Controller + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +properties: + compatible: + oneOf: + - enum: + - amlogic,meson8b-reset + - enum: + - amlogic,meson-gxbb-reset + - enum: + - amlogic,meson-axg-reset + + reg: + maxItems: 1 + + "#reset-cells": + const: 1 + +required: + - compatible + - reg + - "#reset-cells" + +examples: + - | + reset-controller@c884404 { + compatible = "amlogic,meson-gxbb-reset"; + reg = <0xc884404 0x20>; + #reset-cells = <1>; + }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../amlogic/amlogic,meson-gx-ao-secure.txt | 28 ------------- .../amlogic/amlogic,meson-gx-ao-secure.yaml | 42 +++++++++++++++++++ 2 files changed, 42 insertions(+), 28 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt deleted file mode 100644 index c67d9f48fb91..000000000000 --- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt +++ /dev/null @@ -1,28 +0,0 @@ -Amlogic Meson Firmware registers Interface ------------------------------------------- - -The Meson SoCs have a register bank with status and data shared with the -secure firmware. - -Required properties: - - compatible: For Meson GX SoCs, must be "amlogic,meson-gx-ao-secure", "syscon" - -Properties should indentify components of this register interface : - -Meson GX SoC Information ------------------------- -A firmware register encodes the SoC type, package and revision information on -the Meson GX SoCs. -If present, the following property should be added : - -Optional properties: - - amlogic,has-chip-id: If present, the interface gives the current SoC version. - -Example -------- - -ao-secure@140 { - compatible = "amlogic,meson-gx-ao-secure", "syscon"; - reg = <0x0 0x140 0x0 0x140>; - amlogic,has-chip-id; -}; diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml new file mode 100644 index 000000000000..cf79287498f5 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml @@ -0,0 +1,42 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson Firmware registers Interface + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +description: | + The Meson SoCs have a register bank with status and data shared with the + secure firmware. + +properties: + compatible: + enum: + - amlogic,meson-gx-ao-secure + + reg: + maxItems: 1 + + amlogic,has-chip-id: + description: | + A firmware register encodes the SoC type, package and revision + information on the Meson GX SoCs. If present, the interface gives + the current SoC version. + type: boolean + +required: + - compatible + - reg + +examples: + - | + ao-secure@140 { + compatible = "amlogic,meson-gx-ao-secure", "syscon"; + reg = <0x140 0x140>; + amlogic,has-chip-id; + }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/phy/meson-g12a-usb2-phy.txt | 22 ------ .../bindings/phy/meson-g12a-usb2-phy.yaml | 67 +++++++++++++++++++ 2 files changed, 67 insertions(+), 22 deletions(-) delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt b/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt deleted file mode 100644 index a6ebc3dea159..000000000000 --- a/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt +++ /dev/null @@ -1,22 +0,0 @@ -* Amlogic G12A USB2 PHY binding - -Required properties: -- compatible: Should be "amlogic,meson-g12a-usb2-phy" -- reg: The base address and length of the registers -- #phys-cells: must be 0 (see phy-bindings.txt in this directory) -- clocks: a phandle to the clock of this PHY -- clock-names: must be "xtal" -- resets: a phandle to the reset line of this PHY -- reset-names: must be "phy" -- phy-supply: see phy-bindings.txt in this directory - -Example: - usb2_phy0: phy@36000 { - compatible = "amlogic,g12a-usb2-phy"; - reg = <0x0 0x36000 0x0 0x2000>; - clocks = <&xtal>; - clock-names = "xtal"; - resets = <&reset RESET_USB_PHY21>; - reset-names = "phy"; - #phy-cells = <0>; - }; diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml new file mode 100644 index 000000000000..4cd5ba97d469 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml @@ -0,0 +1,67 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/phy/meson-g12a-usb2-phy.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic G12A USB2 PHY + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +properties: + compatible: + enum: + - amlogic,meson-g12a-usb2-phy + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: + A phandle to the clock of this PHY + + clock-names: + items: + - const: xtal + + resets: + maxItems: 1 + description: + A phandle to the reset line of this PHY + + reset-names: + items: + - const: phy + + "#phy-cells": + const: 0 + + phy-supply: + maxItems: 1 + description: + Phandle to a regulator that provides power to the PHY. This + regulator will be managed during the PHY power on/off sequence. + +required: + - compatible + - reg + - clocks + - clock-names + - resets + - reset-names + - "#phy-cells" + +examples: + - | + phy@36000 { + compatible = "amlogic,meson-g12a-usb2-phy"; + reg = <0x36000 0x2000>; + clocks = <&xtal>; + clock-names = "xtal"; + resets = <&phy_reset>; + reset-names = "phy"; + #phy-cells = <0>; + }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/phy/meson-g12a-usb3-pcie-phy.txt | 22 ------- .../phy/meson-g12a-usb3-pcie-phy.yaml | 61 +++++++++++++++++++ 2 files changed, 61 insertions(+), 22 deletions(-) delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt b/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt deleted file mode 100644 index 7cfc17e2df31..000000000000 --- a/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt +++ /dev/null @@ -1,22 +0,0 @@ -* Amlogic G12A USB3 + PCIE Combo PHY binding - -Required properties: -- compatible: Should be "amlogic,meson-g12a-usb3-pcie-phy" -- #phys-cells: must be 1. The cell number is used to select the phy mode - as defined in <dt-bindings/phy/phy.h> between PHY_TYPE_USB3 and PHY_TYPE_PCIE -- reg: The base address and length of the registers -- clocks: a phandle to the 100MHz reference clock of this PHY -- clock-names: must be "ref_clk" -- resets: phandle to the reset lines for the PHY control -- reset-names: must be "phy" - -Example: - usb3_pcie_phy: phy@46000 { - compatible = "amlogic,g12a-usb3-pcie-phy"; - reg = <0x0 0x46000 0x0 0x2000>; - clocks = <&clkc CLKID_PCIE_PLL>; - clock-names = "ref_clk"; - resets = <&reset RESET_PCIE_PHY>; - reset-names = "phy"; - #phy-cells = <1>; - }; diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml new file mode 100644 index 000000000000..fe4df6bd51b2 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml @@ -0,0 +1,61 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/phy/meson-g12a-usb3-pcie-phy.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic G12A USB3 + PCIE Combo PHY + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +properties: + compatible: + enum: + - amlogic,g12a-usb3-pcie-phy + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: + A phandle to the clock of this PHY + + clock-names: + items: + - const: ref_clk + + resets: + maxItems: 1 + description: + A phandle to the reset line of this PHY + + reset-names: + items: + - const: phy + + "#phy-cells": + const: 1 + +required: + - compatible + - reg + - clocks + - clock-names + - resets + - reset-names + - "#phy-cells" + +examples: + - | + phy@46000 { + compatible = "amlogic,meson-g12a-usb3-pcie-phy"; + reg = <0x46000 0x2000>; + clocks = <&ref_clk>; + clock-names = "ref_clk"; + resets = <&phy_reset>; + reset-names = "phy"; + #phy-cells = <1>; + }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/serial/amlogic,meson-uart.txt | 38 ---------- .../bindings/serial/amlogic,meson-uart.yaml | 75 +++++++++++++++++++ 2 files changed, 75 insertions(+), 38 deletions(-) delete mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt create mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt deleted file mode 100644 index c06c045126fc..000000000000 --- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt +++ /dev/null @@ -1,38 +0,0 @@ -Amlogic Meson SoC UART Serial Interface -======================================= - -The Amlogic Meson SoC UART Serial Interface is present on a large range -of SoCs, and can be present either in the "Always-On" power domain or the -"Everything-Else" power domain. - -The particularity of the "Always-On" Serial Interface is that the hardware -is active since power-on and does not need any clock gating and is usable -as very early serial console. - -Required properties: -- compatible : compatible: value should be different for each SoC family as : - - Meson6 : "amlogic,meson6-uart" - - Meson8 : "amlogic,meson8-uart" - - Meson8b : "amlogic,meson8b-uart" - - GX (GXBB, GXL, GXM) : "amlogic,meson-gx-uart" - eventually followed by : "amlogic,meson-ao-uart" if this UART interface - is in the "Always-On" power domain. -- reg : offset and length of the register set for the device. -- interrupts : identifier to the device interrupt -- clocks : a list of phandle + clock-specifier pairs, one for each - entry in clock names. -- clock-names : - * "xtal" for external xtal clock identifier - * "pclk" for the bus core clock, either the clk81 clock or the gate clock - * "baud" for the source of the baudrate generator, can be either the xtal - or the pclk. - -e.g. -uart_A: serial@84c0 { - compatible = "amlogic,meson-gx-uart"; - reg = <0x0 0x84c0 0x0 0x14>; - interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>; - /* Use xtal as baud rate clock source */ - clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; - clock-names = "xtal", "pclk", "baud"; -}; diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml new file mode 100644 index 000000000000..e150e3504fa0 --- /dev/null +++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml @@ -0,0 +1,75 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/serial/amlogic,meson-uart.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic Meson SoC UART Serial Interface + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +description: | + The Amlogic Meson SoC UART Serial Interface is present on a large range + of SoCs, and can be present either in the "Always-On" power domain or the + "Everything-Else" power domain. + + The particularity of the "Always-On" Serial Interface is that the hardware + is active since power-on and does not need any clock gating and is usable + as very early serial console. + +properties: + compatible: + oneOf: + - description: Allways-on power domain UART controller + items: + - enum: + - amlogic,meson6-uart + - amlogic,meson8-uart + - amlogic,meson8b-uart + - amlogic,meson-gx-uart + - const: amlogic,meson-ao-uart + - description: Everything-Else power domain UART controller + enum: + - amlogic,meson6-uart + - amlogic,meson8-uart + - amlogic,meson8b-uart + - amlogic,meson-gx-uart + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + clocks: + minItems: 3 + maxItems: 3 + + clock-names: + description: | + "xtal" for external xtal clock identifier + "pclk" for the bus core clock, either the clk81 clock or the gate clock + "baud" for the source of the baudrate generator, can be either the xtal + or the pclk. + items: + - const: xtal + - const: pclk + - const: baud + +required: + - compatible + - reg + - clocks + - clock-names + +examples: + - | + serial@84c0 { + compatible = "amlogic,meson-gx-uart"; + reg = <0x84c0 0x14>; + interrupts = <26>; + clocks = <&xtal>, <&pclk>, <&xtal>; + clock-names = "xtal", "pclk", "baud"; + }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- .../bindings/watchdog/meson-gxbb-wdt.txt | 16 -------- .../bindings/watchdog/meson-gxbb-wdt.yaml | 37 +++++++++++++++++++ 2 files changed, 37 insertions(+), 16 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.yaml diff --git a/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt b/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt deleted file mode 100644 index c7fe36fa739c..000000000000 --- a/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.txt +++ /dev/null @@ -1,16 +0,0 @@ -Meson GXBB SoCs Watchdog timer - -Required properties: - -- compatible : should be "amlogic,meson-gxbb-wdt" -- reg : Specifies base physical address and size of the registers. -- clocks : Should be a phandle to the Watchdog clock source, for GXBB the xtal - is the default clock source. - -Example: - -wdt: watchdog@98d0 { - compatible = "amlogic,meson-gxbb-wdt"; - reg = <0 0x98d0 0x0 0x10>; - clocks = <&xtal>; -}; diff --git a/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.yaml b/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.yaml new file mode 100644 index 000000000000..111377bb9860 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/meson-gxbb-wdt.yaml @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2019 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/watchdog/meson-gxbb-wdt.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Meson GXBB SoCs Watchdog timer + +maintainers: + - Neil Armstrong <narmstrong@baylibre.com> + +properties: + compatible: + enum: + - amlogic,meson-gxbb-wdt + + reg: + maxItems: 1 + + clocks: + maxItems: 1 + description: + A phandle to the clock of this PHY + +required: + - compatible + - reg + - clocks + +examples: + - | + watchdog@98d0 { + compatible = "amlogic,meson-gxbb-wdt"; + reg = <0x98d0 0x10>; + clocks = <&xtal>; + }; -- 2.22.0 _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
On Thu, Aug 01, 2019 at 03:56:43PM +0200, Neil Armstrong wrote: > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- I can't take patches without any changelog text, sorry. greg k-h _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
On Thu, Aug 1, 2019 at 7:56 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > .../bindings/spi/amlogic,meson-gx-spicc.yaml | 74 +++++++++++++++++++ > .../bindings/spi/amlogic,meson6-spifc.yaml | 57 ++++++++++++++ > .../devicetree/bindings/spi/spi-meson.txt | 55 -------------- > 3 files changed, 131 insertions(+), 55 deletions(-) > create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml > create mode 100644 Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml > delete mode 100644 Documentation/devicetree/bindings/spi/spi-meson.txt > > diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml > new file mode 100644 > index 000000000000..6e2c41c730b5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml > @@ -0,0 +1,74 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +# Copyright 2019 BayLibre, SAS > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/spi/amlogic,meson-gx-spicc.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Amlogic Meson SPI Communication Controller > + > +maintainers: > + - Neil Armstrong <narmstrong@baylibre.com> > + > +allOf: > + - $ref: "spi-controller.yaml#" > + > +description: | > + The Meson SPICC is a generic SPI controller for general purpose Full-Duplex > + communications with dedicated 16 words RX/TX PIO FIFOs. > + > +properties: > + compatible: > + oneOf: > + - description: SPICC controller on Amlogic GX and compatible SoCs > + enum: > + - amlogic,meson-gx-spicc > + - description: SPICC controller on Amlogic AXG and compatible SoCs > + enum: > + - amlogic,meson-axg-spicc 'oneOf' results in vague error messages and can be avoided here. Plus I don't think the descriptions add much as I could pretty much generate the desc "<block> controller on <vendor> <soc> and compatible SoCs" from <vendor>,<soc>-<block>. Though, if you want to keep the description, do it as a comment: enum: - amlogic,meson-gx-spicc # SPICC controller on Amlogic GX and compatible SoCs - amlogic,meson-axg-spicc # SPICC controller on Amlogic AXG and compatible SoCs > + > + interrupts: > + maxItems: 1 > + > + reg: > + maxItems: 1 > + > + resets: > + description: phandle of the internal reset line Standard property, don't need a description unless there's something special about this binding. > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + > + clock-names: > + description: input clock for the baud rate generator > + items: > + - const: core > + > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 0 These 2 can be dropped as they are covered by spi-controller.yaml. > + > +required: > + - compatible > + - reg > + - interrupts > + - clocks > + - clock-names > + - "#address-cells" > + - "#size-cells" > + > +examples: > + - | > + spi@c1108d80 { > + compatible = "amlogic,meson-gx-spicc"; > + reg = <0xc1108d80 0x80>; > + interrupts = <112>; > + clocks = <&clk81>; > + clock-names = "core"; > + #address-cells = <1>; > + #size-cells = <0>; Probably should add a slave node. Once I figure out how to always build the examples with W=12, the lack of a chlid node will throw a dtc warning. > + }; > + > diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml > new file mode 100644 > index 000000000000..5f34aed1ad40 > --- /dev/null > +++ b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml Some of the same comments apply to this one. > @@ -0,0 +1,57 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +# Copyright 2019 BayLibre, SAS > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/spi/amlogic,meson6-spifc.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Amlogic Meson SPI Flash Controller > + > +maintainers: > + - Neil Armstrong <narmstrong@baylibre.com> > + > +allOf: > + - $ref: "spi-controller.yaml#" > + > +description: | > + The Meson SPIFC is a controller optimized for communication with SPI > + NOR memories, without DMA support and a 64-byte unified transmit / > + receive buffer. > + > +properties: > + compatible: > + oneOf: > + - enum: > + - amlogic,meson6-spifc > + - enum: > + - amlogic,meson-gxbb-spifc Drop the oneOf. A single enum is sufficient. > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 0 > + > +required: > + - compatible > + - reg > + - clocks > + - "#address-cells" > + - "#size-cells" > + > +examples: > + - | > + spi@c1108c80 { > + compatible = "amlogic,meson6-spifc"; > + reg = <0xc1108c80 0x80>; > + clocks = <&clk81>; > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
On Thu, Aug 1, 2019 at 7:56 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > .../bindings/phy/meson-g12a-usb2-phy.txt | 22 ------ > .../bindings/phy/meson-g12a-usb2-phy.yaml | 67 +++++++++++++++++++ > 2 files changed, 67 insertions(+), 22 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt > create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml > > diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt b/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt > deleted file mode 100644 > index a6ebc3dea159..000000000000 > --- a/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt > +++ /dev/null > @@ -1,22 +0,0 @@ > -* Amlogic G12A USB2 PHY binding > - > -Required properties: > -- compatible: Should be "amlogic,meson-g12a-usb2-phy" > -- reg: The base address and length of the registers > -- #phys-cells: must be 0 (see phy-bindings.txt in this directory) > -- clocks: a phandle to the clock of this PHY > -- clock-names: must be "xtal" > -- resets: a phandle to the reset line of this PHY > -- reset-names: must be "phy" > -- phy-supply: see phy-bindings.txt in this directory > - > -Example: > - usb2_phy0: phy@36000 { > - compatible = "amlogic,g12a-usb2-phy"; > - reg = <0x0 0x36000 0x0 0x2000>; > - clocks = <&xtal>; > - clock-names = "xtal"; > - resets = <&reset RESET_USB_PHY21>; > - reset-names = "phy"; > - #phy-cells = <0>; > - }; > diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml > new file mode 100644 > index 000000000000..4cd5ba97d469 > --- /dev/null > +++ b/Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.yaml > @@ -0,0 +1,67 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +# Copyright 2019 BayLibre, SAS > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/phy/meson-g12a-usb2-phy.yaml#" For this and the filename, use the compatible string (i.e. add 'amlogic,'). > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Amlogic G12A USB2 PHY > + > +maintainers: > + - Neil Armstrong <narmstrong@baylibre.com> > + > +properties: > + compatible: > + enum: > + - amlogic,meson-g12a-usb2-phy > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + description: > + A phandle to the clock of this PHY As mentioned elsewhere, this description can be dropped. > + > + clock-names: > + items: > + - const: xtal > + > + resets: > + maxItems: 1 > + description: > + A phandle to the reset line of this PHY > + > + reset-names: > + items: > + - const: phy > + > + "#phy-cells": > + const: 0 > + > + phy-supply: > + maxItems: 1 > + description: > + Phandle to a regulator that provides power to the PHY. This > + regulator will be managed during the PHY power on/off sequence. > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + - resets > + - reset-names > + - "#phy-cells" phy-supply was required in the old doc though the example disagrees. If dropping required is desired, just mention so in the commit message. > + > +examples: > + - | > + phy@36000 { > + compatible = "amlogic,meson-g12a-usb2-phy"; > + reg = <0x36000 0x2000>; > + clocks = <&xtal>; > + clock-names = "xtal"; > + resets = <&phy_reset>; > + reset-names = "phy"; > + #phy-cells = <0>; > + }; > -- > 2.22.0 > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
On Thu, Aug 1, 2019 at 7:56 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > .../bindings/phy/meson-g12a-usb3-pcie-phy.txt | 22 ------- > .../phy/meson-g12a-usb3-pcie-phy.yaml | 61 +++++++++++++++++++ > 2 files changed, 61 insertions(+), 22 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt > create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml > > diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt b/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt > deleted file mode 100644 > index 7cfc17e2df31..000000000000 > --- a/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt > +++ /dev/null > @@ -1,22 +0,0 @@ > -* Amlogic G12A USB3 + PCIE Combo PHY binding > - > -Required properties: > -- compatible: Should be "amlogic,meson-g12a-usb3-pcie-phy" > -- #phys-cells: must be 1. The cell number is used to select the phy mode > - as defined in <dt-bindings/phy/phy.h> between PHY_TYPE_USB3 and PHY_TYPE_PCIE > -- reg: The base address and length of the registers > -- clocks: a phandle to the 100MHz reference clock of this PHY > -- clock-names: must be "ref_clk" > -- resets: phandle to the reset lines for the PHY control > -- reset-names: must be "phy" > - > -Example: > - usb3_pcie_phy: phy@46000 { > - compatible = "amlogic,g12a-usb3-pcie-phy"; > - reg = <0x0 0x46000 0x0 0x2000>; > - clocks = <&clkc CLKID_PCIE_PLL>; > - clock-names = "ref_clk"; > - resets = <&reset RESET_PCIE_PHY>; > - reset-names = "phy"; > - #phy-cells = <1>; > - }; > diff --git a/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml > new file mode 100644 > index 000000000000..fe4df6bd51b2 > --- /dev/null > +++ b/Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.yaml > @@ -0,0 +1,61 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +# Copyright 2019 BayLibre, SAS > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/phy/meson-g12a-usb3-pcie-phy.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Amlogic G12A USB3 + PCIE Combo PHY > + > +maintainers: > + - Neil Armstrong <narmstrong@baylibre.com> > + > +properties: > + compatible: > + enum: > + - amlogic,g12a-usb3-pcie-phy Wrong compatible string. > + > + reg: > + maxItems: 1 > + > + clocks: > + maxItems: 1 > + description: > + A phandle to the clock of this PHY > + > + clock-names: > + items: > + - const: ref_clk > + > + resets: > + maxItems: 1 > + description: > + A phandle to the reset line of this PHY > + > + reset-names: > + items: > + - const: phy > + > + "#phy-cells": > + const: 1 > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names > + - resets > + - reset-names > + - "#phy-cells" > + > +examples: > + - | > + phy@46000 { > + compatible = "amlogic,meson-g12a-usb3-pcie-phy"; > + reg = <0x46000 0x2000>; > + clocks = <&ref_clk>; > + clock-names = "ref_clk"; > + resets = <&phy_reset>; > + reset-names = "phy"; > + #phy-cells = <1>; > + }; > -- > 2.22.0 > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
On Thu, Aug 1, 2019 at 7:56 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > .../bindings/serial/amlogic,meson-uart.txt | 38 ---------- > .../bindings/serial/amlogic,meson-uart.yaml | 75 +++++++++++++++++++ > 2 files changed, 75 insertions(+), 38 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt > create mode 100644 Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml > > diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt > deleted file mode 100644 > index c06c045126fc..000000000000 > --- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.txt > +++ /dev/null > @@ -1,38 +0,0 @@ > -Amlogic Meson SoC UART Serial Interface > -======================================= > - > -The Amlogic Meson SoC UART Serial Interface is present on a large range > -of SoCs, and can be present either in the "Always-On" power domain or the > -"Everything-Else" power domain. > - > -The particularity of the "Always-On" Serial Interface is that the hardware > -is active since power-on and does not need any clock gating and is usable > -as very early serial console. > - > -Required properties: > -- compatible : compatible: value should be different for each SoC family as : > - - Meson6 : "amlogic,meson6-uart" > - - Meson8 : "amlogic,meson8-uart" > - - Meson8b : "amlogic,meson8b-uart" > - - GX (GXBB, GXL, GXM) : "amlogic,meson-gx-uart" > - eventually followed by : "amlogic,meson-ao-uart" if this UART interface > - is in the "Always-On" power domain. > -- reg : offset and length of the register set for the device. > -- interrupts : identifier to the device interrupt > -- clocks : a list of phandle + clock-specifier pairs, one for each > - entry in clock names. > -- clock-names : > - * "xtal" for external xtal clock identifier > - * "pclk" for the bus core clock, either the clk81 clock or the gate clock > - * "baud" for the source of the baudrate generator, can be either the xtal > - or the pclk. > - > -e.g. > -uart_A: serial@84c0 { > - compatible = "amlogic,meson-gx-uart"; > - reg = <0x0 0x84c0 0x0 0x14>; > - interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>; > - /* Use xtal as baud rate clock source */ > - clocks = <&xtal>, <&clkc CLKID_UART0>, <&xtal>; > - clock-names = "xtal", "pclk", "baud"; > -}; > diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml > new file mode 100644 > index 000000000000..e150e3504fa0 > --- /dev/null > +++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml > @@ -0,0 +1,75 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +# Copyright 2019 BayLibre, SAS > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/serial/amlogic,meson-uart.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Amlogic Meson SoC UART Serial Interface > + > +maintainers: > + - Neil Armstrong <narmstrong@baylibre.com> > + > +description: | > + The Amlogic Meson SoC UART Serial Interface is present on a large range > + of SoCs, and can be present either in the "Always-On" power domain or the > + "Everything-Else" power domain. > + > + The particularity of the "Always-On" Serial Interface is that the hardware > + is active since power-on and does not need any clock gating and is usable > + as very early serial console. > + > +properties: > + compatible: > + oneOf: > + - description: Allways-on power domain UART controller > + items: > + - enum: > + - amlogic,meson6-uart > + - amlogic,meson8-uart > + - amlogic,meson8b-uart > + - amlogic,meson-gx-uart > + - const: amlogic,meson-ao-uart > + - description: Everything-Else power domain UART controller > + enum: > + - amlogic,meson6-uart > + - amlogic,meson8-uart > + - amlogic,meson8b-uart > + - amlogic,meson-gx-uart > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + clocks: > + minItems: 3 > + maxItems: 3 Should list out what each clock is. items: - description: external xtal clock identifier - description: the bus core clock, either the clk81 clock or the gate clock - description: the source of the baudrate generator, can be either the xtal or the pclk This makes minItems/maxItems implicit. > + > + clock-names: > + description: | > + "xtal" for external xtal clock identifier > + "pclk" for the bus core clock, either the clk81 clock or the gate clock > + "baud" for the source of the baudrate generator, can be either the xtal > + or the pclk. Then this description can be dropped. > + items: > + - const: xtal > + - const: pclk > + - const: baud > + > +required: > + - compatible > + - reg > + - clocks > + - clock-names interrupts? If the old binding was wrong, it's fine to fix here. Just mention what you're fixing in the commit message. > + > +examples: > + - | > + serial@84c0 { > + compatible = "amlogic,meson-gx-uart"; > + reg = <0x84c0 0x14>; > + interrupts = <26>; > + clocks = <&xtal>, <&pclk>, <&xtal>; > + clock-names = "xtal", "pclk", "baud"; > + }; > -- > 2.22.0 > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
On Thu, Aug 1, 2019 at 7:56 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > This is a first tentative to convert some of the simplest Amlogic > dt-bindings to the yaml format. Great to see this. I've gone thru all of the patches. Some of the same minor comments I made also apply to the patches I didn't comment on. Rob _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
Hi Rob, Thanks for reviews. On 01/08/2019 15:56, Neil Armstrong wrote: > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > .../amlogic/amlogic,meson-gx-ao-secure.txt | 28 ------------- > .../amlogic/amlogic,meson-gx-ao-secure.yaml | 42 +++++++++++++++++++ > 2 files changed, 42 insertions(+), 28 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt > create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml > > diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt > deleted file mode 100644 > index c67d9f48fb91..000000000000 > --- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt > +++ /dev/null > @@ -1,28 +0,0 @@ > -Amlogic Meson Firmware registers Interface > ------------------------------------------- > - > -The Meson SoCs have a register bank with status and data shared with the > -secure firmware. > - > -Required properties: > - - compatible: For Meson GX SoCs, must be "amlogic,meson-gx-ao-secure", "syscon" I have a hard time find how to define "syscon" here, if I put syscon in the compatible it gets matched on other bindings and I get lot of warnings. How should I model it ? Thanks, Neil > - > -Properties should indentify components of this register interface : > - > -Meson GX SoC Information > ------------------------- > -A firmware register encodes the SoC type, package and revision information on > -the Meson GX SoCs. > -If present, the following property should be added : > - > -Optional properties: > - - amlogic,has-chip-id: If present, the interface gives the current SoC version. > - > -Example > -------- > - > -ao-secure@140 { > - compatible = "amlogic,meson-gx-ao-secure", "syscon"; > - reg = <0x0 0x140 0x0 0x140>; > - amlogic,has-chip-id; > -}; > diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml > new file mode 100644 > index 000000000000..cf79287498f5 > --- /dev/null > +++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml > @@ -0,0 +1,42 @@ > +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > +# Copyright 2019 BayLibre, SAS > +%YAML 1.2 > +--- > +$id: "http://devicetree.org/schemas/arm/amlogic/amlogic,meson-gx-ao-secure.yaml#" > +$schema: "http://devicetree.org/meta-schemas/core.yaml#" > + > +title: Amlogic Meson Firmware registers Interface > + > +maintainers: > + - Neil Armstrong <narmstrong@baylibre.com> > + > +description: | > + The Meson SoCs have a register bank with status and data shared with the > + secure firmware. > + > +properties: > + compatible: > + enum: > + - amlogic,meson-gx-ao-secure > + > + reg: > + maxItems: 1 > + > + amlogic,has-chip-id: > + description: | > + A firmware register encodes the SoC type, package and revision > + information on the Meson GX SoCs. If present, the interface gives > + the current SoC version. > + type: boolean > + > +required: > + - compatible > + - reg > + > +examples: > + - | > + ao-secure@140 { > + compatible = "amlogic,meson-gx-ao-secure", "syscon"; > + reg = <0x140 0x140>; > + amlogic,has-chip-id; > + }; > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic
On Fri, Aug 2, 2019 at 8:37 AM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Hi Rob, > > Thanks for reviews. > > On 01/08/2019 15:56, Neil Armstrong wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > > --- > > .../amlogic/amlogic,meson-gx-ao-secure.txt | 28 ------------- > > .../amlogic/amlogic,meson-gx-ao-secure.yaml | 42 +++++++++++++++++++ > > 2 files changed, 42 insertions(+), 28 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt > > create mode 100644 Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml > > > > diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt > > deleted file mode 100644 > > index c67d9f48fb91..000000000000 > > --- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.txt > > +++ /dev/null > > @@ -1,28 +0,0 @@ > > -Amlogic Meson Firmware registers Interface > > ------------------------------------------- > > - > > -The Meson SoCs have a register bank with status and data shared with the > > -secure firmware. > > - > > -Required properties: > > - - compatible: For Meson GX SoCs, must be "amlogic,meson-gx-ao-secure", "syscon" > > I have a hard time find how to define "syscon" here, if I put syscon in the compatible > it gets matched on other bindings and I get lot of warnings. > > How should I model it ? You have to add a custom 'select' key that doesn't include 'syscon'. There should be a few examples in the tree. Rob _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic