diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 16:25:44 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-15 22:03:14 +0100 |
| commit | 614bae98cb18674644817bedc1a767ce2a286196 (patch) | |
| tree | 665927ccce3b6ed1a93161fad0a25cfcd338ea80 /Documentation/devicetree/bindings/memory-controllers | |
| parent | 7a76aad0262e7eed6d7aca3b4c95e4621601d779 (diff) | |
| parent | 4e017f1419397473cf3db6e9fa020013998b1aa4 (diff) | |
| download | linux-614bae98cb18674644817bedc1a767ce2a286196.tar.bz2 | |
Merge tag 'imx-dt64-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "Freescale arm64 device tree updates for 4.17" from Shawn Guo:
- Move cpu_thermal device out of bus node to fix DTC simple_bus_reg
warning seen with W=1 switch.
- Fix IFC child nodes' unit-address to eliminate DTC simple_bus_reg
warnings.
- Add a dummy size memory 'reg' property for LS1046A device tree to
avoid unit_address_vs_reg DTC warning, and the real size will be
filled by bootloader.
- Update ls208xa-qds board device tree to fix unit_address_vs_reg
warnings with DSPI device.
- Add idle-states for LS1012A and LS1043A, and correct
arm,psci-suspend-param setting for already added idle-states.
- DPAA QBMan portal and watchdog device addition.
* tag 'imx-dt64-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
dt-bindings: ifc: Fix the unit address format in the examples
arm64: dts: ls1046a: add a dummy memory 'reg' property
arm64: dts: fsl: fix ifc simple-bus unit address format warnings
arm64: dts: fsl: update the cpu idle node
arm64: dts: ls1043a: add cpu idle support
arm64: dts: ls1012a: add cpu idle support
arm64: dts: ls208xa-qds: Fix the 'reg' property
arm64: dts: ls208xa-qds: Pass unit name to dspi child nodes
arm64: dts: ls208xa: Move cpu_thermal out of bus node
arm64: dts: ls1088a: Move cpu_thermal out of bus node
arm64: dts: ls1046a: Move cpu_thermal out of bus node
arm64: dts: ls1043a: Move cpu_thermal out of bus node
arm64: dts: ls1012a: Move cpu_thermal out of bus node
arm64: dts: Add DPAA QBMan portal 9
arm64: dts: ls1088a: add DT node of watchdog
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 89427b018ba7..a4d4b6a2ff0d 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,0 { + flash@0 { #address-cells = <1>; #size-cells = <1>; compatible = "cfi-flash"; @@ -58,7 +58,7 @@ Example: }; }; - flash@1,0 { + flash@100000000 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,ifc-nand"; @@ -73,7 +73,7 @@ Example: }; }; - cpld@3,0 { + cpld@@300000000 { #address-cells = <1>; #size-cells = <1>; compatible = "fsl,p1010rdb-cpld"; |