diff options
| author | Olof Johansson <olof@lixom.net> | 2016-10-02 22:20:39 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-10-02 22:20:39 -0700 |
| commit | adff807988f92d4646c50b601936e340a92d5455 (patch) | |
| tree | a3fa1aed5bebeae8b4e6006bb165d914c26d4a8b /arch/arm/boot/dts/berlin2q-marvell-dmp.dts | |
| parent | 7dd84f065c5fea2c3af945b1e94cd734b3416fa8 (diff) | |
| parent | 9a0af838c202572801dc344294eb0a2875f60ab7 (diff) | |
Merge tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt
Berlin DT changes for v4.9
- enable dw wdt nodes unconditionally,
driver supports multiple instances now
- fix some dtc compiler warnings
* tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin:
ARM: dts: sony-nsz-gs7: add missing unit name to /memory node
ARM: dts: chromecast: add missing unit name to /memory node
ARM: dts: berlin2q-marvell-dmp: add missing unit name to /memory node
ARM: dts: berlin2: Add missing unit name to /soc node
ARM: dts: berlin2cd: Add missing unit name to /soc node
ARM: dts: berlin2q: Add missing unit name to /soc node
ARM: dts: berlin2: Remove skeleton.dtsi inclusion
ARM: dts: berlin2cd: Remove skeleton.dtsi inclusion
ARM: dts: berlin2q: Remove skeleton.dtsi inclusion
arm: dts: berlin2q: enable all wdt nodes unconditionally
arm: dts: berlin2: enable all wdt nodes unconditionally
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/berlin2q-marvell-dmp.dts')
| -rw-r--r-- | arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts index 33b28757b8f6..f485308840ab 100644 --- a/arch/arm/boot/dts/berlin2q-marvell-dmp.dts +++ b/arch/arm/boot/dts/berlin2q-marvell-dmp.dts @@ -43,7 +43,7 @@ model = "Marvell BG2-Q DMP"; compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin"; - memory { + memory@0 { device_type = "memory"; reg = <0x00000000 0x80000000>; }; |