diff options
author | Olof Johansson <olof@lixom.net> | 2018-09-23 16:33:56 +0300 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-09-23 16:33:56 +0300 |
commit | 0ecee767ce76c90985dfcd162845ff5d1a2778d4 (patch) | |
tree | 04a70efe2c591ed2248e3d1a2a9564413e805447 /Documentation | |
parent | da4cf9cdec9bdc68aaac0f1f0d171d32b05fa342 (diff) | |
parent | 3be9349f38c7dd7f108a71f640908a727101d2db (diff) | |
download | linux-0ecee767ce76c90985dfcd162845ff5d1a2778d4.tar.xz |
Merge tag 'ux500-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
Ux500 DTS changes for the v4.20 kernel cycle.
Assorted housekeeping DTS patches.
* tag 'ux500-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: dts: ux500: Mark PRCMU as syscon compatible
arm: dts: ste: Update coresight bindings for hardware port
ARM: dts: ste: Fix SPI controller node names
ARM: dts: ux500: Get rid of DTC warnings
ARM: dts: ux500: Fix LCDA clock line muxing
dt-bindings: arm: scu: Correct example SCU unit addresses
ARM: dts: ux500: Correct SCU unit address
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/devicetree/bindings/arm/scu.txt | 2 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/arm/ux500/boards.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/scu.txt b/Documentation/devicetree/bindings/arm/scu.txt index 08a587875996..74d0a780ce51 100644 --- a/Documentation/devicetree/bindings/arm/scu.txt +++ b/Documentation/devicetree/bindings/arm/scu.txt @@ -22,7 +22,7 @@ References: Example: -scu@a04100000 { +scu@a0410000 { compatible = "arm,cortex-a9-scu"; reg = <0xa0410000 0x100>; }; diff --git a/Documentation/devicetree/bindings/arm/ux500/boards.txt b/Documentation/devicetree/bindings/arm/ux500/boards.txt index 0fa429534f49..89408de55bfd 100644 --- a/Documentation/devicetree/bindings/arm/ux500/boards.txt +++ b/Documentation/devicetree/bindings/arm/ux500/boards.txt @@ -60,7 +60,7 @@ Example: <0xa0410100 0x100>; }; - scu@a04100000 { + scu@a0410000 { compatible = "arm,cortex-a9-scu"; reg = <0xa0410000 0x100>; }; |