diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-12-01 01:10:24 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-12-01 01:10:24 +0300 |
| commit | da8cb3047ea0f68e88cbb228e741ce21123dd4fc (patch) | |
| tree | 6da35a1a834acbba0ebb400193ed8a4eba87316c /arch/arm64/boot | |
| parent | 18e31f0b24e0076fb7ed7d1f8f0477d7b4f276dd (diff) | |
| parent | 40fdc6b0d2b96cac46be51eb41042a715047b791 (diff) | |
| download | linux-da8cb3047ea0f68e88cbb228e741ce21123dd4fc.tar.xz | |
Merge tag 'berlin64-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/dt64
Pull "Berlin64 DT changes for v4.10" from Jisheng Zhang:
- fix some dtc compiler warnings
* tag 'berlin64-dt-for-v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
arm64: dts: berlin4ct-dmp: add missing unit name to /memory node
arm64: dts: berlin4ct-stb: add missing unit name to /memory node
arm64: dts: berlin4ct: add missing unit name to /soc node
Diffstat (limited to 'arch/arm64/boot')
| -rw-r--r-- | arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/berlin4ct-stb.dts | 2 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts b/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts index 0d70d39fa8d2..fae6c6924705 100644 --- a/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts +++ b/arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts @@ -54,7 +54,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@1000000 { device_type = "memory"; /* the first 16MB is for firmwares' usage */ reg = <0 0x01000000 0 0x7f000000>; diff --git a/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts b/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts index 348c37ecf069..d47edad13e68 100644 --- a/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts +++ b/arch/arm64/boot/dts/marvell/berlin4ct-stb.dts @@ -54,7 +54,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@1000000 { device_type = "memory"; /* the first 16MB is for firmwares' usage */ reg = <0 0x01000000 0 0x7f000000>; diff --git a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi index 85c23facb9fe..d6b800fd26d0 100644 --- a/arch/arm64/boot/dts/marvell/berlin4ct.dtsi +++ b/arch/arm64/boot/dts/marvell/berlin4ct.dtsi @@ -142,7 +142,7 @@ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; }; - soc { + soc@f7000000 { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; |