Deleted Added
sdiff udiff text old ( 279385 ) new ( 295436 )
full compact
armada-xp-matrix.dts (279385) armada-xp-matrix.dts (295436)
1/*
2 * Device Tree file for Marvell Armada XP Matrix board
3 *
4 * Copyright (C) 2013 Marvell
5 *
6 * Lior Amsalem <alior@marvell.com>
7 *
8 * This file is dual-licensed: you can use it either under the terms

--- 38 unchanged lines hidden (view full) ---

47/dts-v1/;
48#include "armada-xp-mv78460.dtsi"
49
50/ {
51 model = "Marvell Armada XP Matrix Board";
52 compatible = "marvell,axp-matrix", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
53
54 chosen {
1/*
2 * Device Tree file for Marvell Armada XP Matrix board
3 *
4 * Copyright (C) 2013 Marvell
5 *
6 * Lior Amsalem <alior@marvell.com>
7 *
8 * This file is dual-licensed: you can use it either under the terms

--- 38 unchanged lines hidden (view full) ---

47/dts-v1/;
48#include "armada-xp-mv78460.dtsi"
49
50/ {
51 model = "Marvell Armada XP Matrix Board";
52 compatible = "marvell,axp-matrix", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";
53
54 chosen {
55 bootargs = "console=ttyS0,115200 earlyprintk";
55 stdout-path = "serial0:115200n8";
56 };
57
58 memory {
59 device_type = "memory";
60 /*
61 * This board has 4 GB of RAM, but the last 256 MB of
62 * RAM are not usable due to the overlap with the MBus
63 * Window address range
64 */
65 reg = <0 0x00000000 0 0xf0000000>;
66 };
67
68 soc {
69 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
56 };
57
58 memory {
59 device_type = "memory";
60 /*
61 * This board has 4 GB of RAM, but the last 256 MB of
62 * RAM are not usable due to the overlap with the MBus
63 * Window address range
64 */
65 reg = <0 0x00000000 0 0xf0000000>;
66 };
67
68 soc {
69 ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
70 MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
70 MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
71 MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
72 MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
71
72 internal-regs {
73 serial@12000 {
74 status = "okay";
75 };
76 serial@12100 {
77 status = "okay";
78 };

--- 36 unchanged lines hidden --- 		73
74 internal-regs {
75 serial@12000 {
76 status = "okay";
77 };
78 serial@12100 {
79 status = "okay";
80 };

--- 36 unchanged lines hidden ---