diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-25 18:49:49 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-25 18:49:49 -0500 |
| commit | ba13357e689f8bcb389211312a15bccec267a127 (patch) | |
| tree | 6ca1517662980294a59245832fc532659a48ab4b | |
| parent | afafe375df51043bf236c996a7d4a1b9c3fc70ef (diff) | |
| parent | 3684534548d4cbba7d3724b3d79152eff38dc82f (diff) | |
Merge tag 'mvebu-dt64-4.10-2' of git://git.infradead.org/linux-mvebu into next/dt64
Pull "mvebu dt64 for 4.10 (part 2)" from Gregory CLEMENT:
Fix DTC warning on Armada 37xx and 7K/8K
* tag 'mvebu-dt64-4.10-2' of git://git.infradead.org/linux-mvebu:
ARM64: dts: marvell: Fixup memory DT warning for Armada 37xx
arm64: dts: marvell: Fixup config-space DT warning For Armada 7K/8K
arm64: dts: marvell: Fixup internal-regs DT warning for Armada 37xx
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts index 1372e9a6aaa4..a260ae25b658 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts | |||
| @@ -56,7 +56,7 @@ | |||
| 56 | stdout-path = "serial0:115200n8"; | 56 | stdout-path = "serial0:115200n8"; |
| 57 | }; | 57 | }; |
| 58 | 58 | ||
| 59 | memory { | 59 | memory@0 { |
| 60 | device_type = "memory"; | 60 | device_type = "memory"; |
| 61 | reg = <0x00000000 0x00000000 0x00000000 0x20000000>; | 61 | reg = <0x00000000 0x00000000 0x00000000 0x20000000>; |
| 62 | }; | 62 | }; |
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts index eadd5993c7bd..83178d909fc2 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts | |||
| @@ -55,7 +55,7 @@ | |||
| 55 | stdout-path = "serial0:115200n8"; | 55 | stdout-path = "serial0:115200n8"; |
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | memory { | 58 | memory@0 { |
| 59 | device_type = "memory"; | 59 | device_type = "memory"; |
| 60 | reg = <0x00000000 0x00000000 0x00000000 0x20000000>; | 60 | reg = <0x00000000 0x00000000 0x00000000 0x20000000>; |
| 61 | }; | 61 | }; |
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi index c4762538ec01..f1596daa2bc7 100644 --- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi | |||
| @@ -91,7 +91,7 @@ | |||
| 91 | #size-cells = <2>; | 91 | #size-cells = <2>; |
| 92 | ranges; | 92 | ranges; |
| 93 | 93 | ||
| 94 | internal-regs { | 94 | internal-regs@d0000000 { |
| 95 | #address-cells = <1>; | 95 | #address-cells = <1>; |
| 96 | #size-cells = <1>; | 96 | #size-cells = <1>; |
| 97 | compatible = "simple-bus"; | 97 | compatible = "simple-bus"; |
diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi index 7b6136182ad0..a749ba2edec4 100644 --- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi | |||
| @@ -71,7 +71,7 @@ | |||
| 71 | interrupt-parent = <&gic>; | 71 | interrupt-parent = <&gic>; |
| 72 | ranges; | 72 | ranges; |
| 73 | 73 | ||
| 74 | config-space { | 74 | config-space@f0000000 { |
| 75 | #address-cells = <1>; | 75 | #address-cells = <1>; |
| 76 | #size-cells = <1>; | 76 | #size-cells = <1>; |
| 77 | compatible = "simple-bus"; | 77 | compatible = "simple-bus"; |
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index 602e2c2e9a4d..9d7f0cd94f9d 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | interrupt-parent = <&gic>; | 52 | interrupt-parent = <&gic>; |
| 53 | ranges; | 53 | ranges; |
| 54 | 54 | ||
| 55 | config-space { | 55 | config-space@f2000000 { |
| 56 | #address-cells = <1>; | 56 | #address-cells = <1>; |
| 57 | #size-cells = <1>; | 57 | #size-cells = <1>; |
| 58 | compatible = "simple-bus"; | 58 | compatible = "simple-bus"; |
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi index 842fb333285c..88e74069c666 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | |||
| @@ -52,7 +52,7 @@ | |||
| 52 | interrupt-parent = <&gic>; | 52 | interrupt-parent = <&gic>; |
| 53 | ranges; | 53 | ranges; |
| 54 | 54 | ||
| 55 | config-space { | 55 | config-space@f4000000 { |
| 56 | #address-cells = <1>; | 56 | #address-cells = <1>; |
| 57 | #size-cells = <1>; | 57 | #size-cells = <1>; |
| 58 | compatible = "simple-bus"; | 58 | compatible = "simple-bus"; |