diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:03:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-27 15:03:02 +0200 |
| commit | 610bf412e44fd4cff2b9959714437ca92dc0c697 (patch) | |
| tree | 635455806fd6cdc716a0560e7da7b6601d037ec9 /Documentation/devicetree/bindings/memory-controllers | |
| parent | 38d03be7cb343364a05cf9523c7e261a15495682 (diff) | |
| parent | ee9c64307b6203151a20ec33e6f51ae1cac1bb6e (diff) | |
Merge tag 'imx-dt64-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "Freescale arm64 device tree fixups for 4.17" from Shawn Guo:
- It reverts a couple of patches that "fix" DTC warnings on IFC memory
controller in a wrong way. We will start over agagin to address the
DTC warnings later.
* tag 'imx-dt64-4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
Revert "dt-bindings: ifc: Fix the unit address format in the examples"
Revert "arm64: dts: fsl: fix ifc simple-bus unit address format warnings"
Diffstat (limited to 'Documentation/devicetree/bindings/memory-controllers')
| -rw-r--r-- | Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt index a4d4b6a2ff0d..89427b018ba7 100644 --- a/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt +++ b/Documentation/devicetree/bindings/memory-controllers/fsl/ifc.txt @@ -43,7 +43,7 @@ Example: 0x1 0x0 0x0 0xffa00000 0x00010000 0x3 0x0 0x0 0xffb00000 0x00020000>; - flash@0 { + flash@0,0 { #address-cells = <1>; #size-cells = <1>; compatible = "cfi-flash"; @@ -58,7 +58,7 @@ Example: }; }; - flash@100000000 { + flash@1,0 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,ifc-nand"; @@ -73,7 +73,7 @@ Example: }; }; - cpld@@300000000 { + cpld@3,0 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,p1010rdb-cpld"; |