From: "J. Neuschäfer" <j.ne@xxxxxxxxxx> Convert the Freescale localbus controller bindings from text form to YAML. The updated list of compatible strings reflects current usage in arch/powerpc/boot/dts/, except that many existing device trees erroneously specify "simple-bus" in addition to fsl,*elbc. Changes compared to the txt version: - removed the board-control (fsl,mpc8272ads-bcsr) node because it only appears in this example and nowhere else - added a new example with NAND flash - updated list of compatible strings Signed-off-by: J. Neuschäfer <j.ne@xxxxxxxxxx> --- V2: - fix order of properties in examples, according to dts coding style - move to Documentation/devicetree/bindings/memory-controllers - clarify the commit message a tiny bit - remove unnecessary multiline markers (|) - define address format in patternProperties - trim subject line (remove "binding") - remove use of "simple-bus", because it's technically incorrect --- .../bindings/memory-controllers/fsl,elbc.yaml | 146 +++++++++++++++++++++ .../devicetree/bindings/powerpc/fsl/lbc.txt | 43 ------ 2 files changed, 146 insertions(+), 43 deletions(-) diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl,elbc.yaml b/Documentation/devicetree/bindings/memory-controllers/fsl,elbc.yaml new file mode 100644 index 0000000000000000000000000000000000000000..7bc05e3b9ac74125e5786748df57f6cc1255a62d --- /dev/null +++ b/Documentation/devicetree/bindings/memory-controllers/fsl,elbc.yaml @@ -0,0 +1,146 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/memory-controllers/fsl,elbc.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Freescale Enhanced Local Bus Controller + +maintainers: + - J. Neuschäfer <j.ne@xxxxxxxxxx> + +properties: + $nodename: + pattern: "^localbus@[0-9a-f]+$" + + compatible: + oneOf: + - items: + - enum: + - fsl,mpc8313-elbc + - fsl,mpc8315-elbc + - fsl,mpc8377-elbc + - fsl,mpc8378-elbc + - fsl,mpc8379-elbc + - fsl,mpc8536-elbc + - fsl,mpc8569-elbc + - fsl,mpc8572-elbc + - fsl,p1020-elbc + - fsl,p1021-elbc + - fsl,p1023-elbc + - fsl,p2020-elbc + - fsl,p2041-elbc + - fsl,p3041-elbc + - fsl,p4080-elbc + - fsl,p5020-elbc + - fsl,p5040-elbc + - const: fsl,elbc + + - items: + - const: fsl,mpc8272-localbus + - const: fsl,pq2-localbus + + - items: + - enum: + - fsl,mpc8247-localbus + - fsl,mpc8248-localbus + - fsl,mpc8360-localbus + - const: fsl,pq2pro-localbus + + - items: + - enum: + - fsl,mpc8540-localbus + - fsl,mpc8544-lbc + - fsl,mpc8544-localbus + - fsl,mpc8548-lbc + - fsl,mpc8548-localbus + - fsl,mpc8560-localbus + - fsl,mpc8568-localbus + - const: fsl,pq3-localbus + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + "#address-cells": + enum: [2, 3] + description: + The first cell is the chipselect number, and the remaining cells are the + offset into the chipselect. + + "#size-cells": + enum: [1, 2] + description: + Either one or two, depending on how large each chipselect can be. + + ranges: + description: + Each range corresponds to a single chipselect, and covers the entire + access window as configured. + +patternProperties: + # format: name@chipselect,address + "^.*@[0-9a-f]+,[0-9a-f]+$": + type: object + +additionalProperties: false + +examples: + - | + localbus@f0010100 { + compatible = "fsl,mpc8272-localbus", + "fsl,pq2-localbus"; + reg = <0xf0010100 0x40>; + ranges = <0x0 0x0 0xfe000000 0x02000000 + 0x1 0x0 0xf4500000 0x00008000 + 0x2 0x0 0xfd810000 0x00010000>; + #address-cells = <2>; + #size-cells = <1>; + + flash@0,0 { + compatible = "jedec-flash"; + reg = <0x0 0x0 0x2000000>; + bank-width = <4>; + device-width = <1>; + }; + + simple-periph@2,0 { + compatible = "fsl,elbc-gpcm-uio"; + reg = <0x2 0x0 0x10000>; + elbc-gpcm-br = <0xfd810800>; + elbc-gpcm-or = <0xffff09f7>; + }; + }; + + - | + localbus@e0005000 { + compatible = "fsl,mpc8315-elbc", "fsl,elbc"; + reg = <0xe0005000 0x1000>; + ranges = <0x0 0x0 0xfe000000 0x00800000 + 0x1 0x0 0xe0600000 0x00002000 + 0x2 0x0 0xf0000000 0x00020000 + 0x3 0x0 0xfa000000 0x00008000>; + #address-cells = <2>; + #size-cells = <1>; + interrupts = <77 0x8>; + interrupt-parent = <&ipic>; + + flash@0,0 { + compatible = "cfi-flash"; + reg = <0x0 0x0 0x800000>; + #address-cells = <1>; + #size-cells = <1>; + bank-width = <2>; + device-width = <1>; + }; + + nand@1,0 { + compatible = "fsl,mpc8315-fcm-nand", + "fsl,elbc-fcm-nand"; + reg = <0x1 0x0 0x2000>; + #address-cells = <1>; + #size-cells = <1>; + }; + }; diff --git a/Documentation/devicetree/bindings/powerpc/fsl/lbc.txt b/Documentation/devicetree/bindings/powerpc/fsl/lbc.txt deleted file mode 100644 index 1c80fcedebb52049721fbd61c4dd4c57133bd47c..0000000000000000000000000000000000000000 --- a/Documentation/devicetree/bindings/powerpc/fsl/lbc.txt +++ /dev/null @@ -1,43 +0,0 @@ -* Chipselect/Local Bus - -Properties: -- name : Should be localbus -- #address-cells : Should be either two or three. The first cell is the - chipselect number, and the remaining cells are the - offset into the chipselect. -- #size-cells : Either one or two, depending on how large each chipselect - can be. -- ranges : Each range corresponds to a single chipselect, and cover - the entire access window as configured. - -Example: - localbus@f0010100 { - compatible = "fsl,mpc8272-localbus", - "fsl,pq2-localbus"; - #address-cells = <2>; - #size-cells = <1>; - reg = <0xf0010100 0x40>; - - ranges = <0x0 0x0 0xfe000000 0x02000000 - 0x1 0x0 0xf4500000 0x00008000 - 0x2 0x0 0xfd810000 0x00010000>; - - flash@0,0 { - compatible = "jedec-flash"; - reg = <0x0 0x0 0x2000000>; - bank-width = <4>; - device-width = <1>; - }; - - board-control@1,0 { - reg = <0x1 0x0 0x20>; - compatible = "fsl,mpc8272ads-bcsr"; - }; - - simple-periph@2,0 { - compatible = "fsl,elbc-gpcm-uio"; - reg = <0x2 0x0 0x10000>; - elbc-gpcm-br = <0xfd810800>; - elbc-gpcm-or = <0xffff09f7>; - }; - }; -- 2.48.0.rc1.219.gb6b6757d772
