diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-24 20:27:16 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-06-24 20:27:16 +0200 |
| commit | 3d2c3442e7f019d93606ffa0a15933f0f9e7742a (patch) | |
| tree | 23166f0296205bc294be6840672a7a9fcfe43a30 /dts/src | |
| parent | 9313920df6d3d55fbd03ce8ec1c0da9a10c29824 (diff) | |
| download | barebox-3d2c3442e7f019d93606ffa0a15933f0f9e7742a.tar.gz barebox-3d2c3442e7f019d93606ffa0a15933f0f9e7742a.tar.xz | |
dts: update to v3.16-rc2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src')
| -rw-r--r-- | dts/src/arm/armada-375-db.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm/armada-385-db.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm/armada-xp-openblocks-ax3-4.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm64/apm-mustang.dts | 4 | ||||
| -rw-r--r-- | dts/src/arm64/apm-storm.dtsi | 36 |
5 files changed, 44 insertions, 2 deletions
diff --git a/dts/src/arm/armada-375-db.dts b/dts/src/arm/armada-375-db.dts index 772fec2d26..1e2919d43d 100644 --- a/dts/src/arm/armada-375-db.dts +++ b/dts/src/arm/armada-375-db.dts @@ -91,6 +91,8 @@ marvell,nand-keep-config; marvell,nand-enable-arbiter; nand-on-flash-bbt; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; partition@0 { label = "U-Boot"; diff --git a/dts/src/arm/armada-385-db.dts b/dts/src/arm/armada-385-db.dts index ff9637dd8d..5bae473182 100644 --- a/dts/src/arm/armada-385-db.dts +++ b/dts/src/arm/armada-385-db.dts @@ -98,6 +98,8 @@ marvell,nand-keep-config; marvell,nand-enable-arbiter; nand-on-flash-bbt; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; partition@0 { label = "U-Boot"; diff --git a/dts/src/arm/armada-xp-openblocks-ax3-4.dts b/dts/src/arm/armada-xp-openblocks-ax3-4.dts index e5c6a0492c..4e5a59ee15 100644 --- a/dts/src/arm/armada-xp-openblocks-ax3-4.dts +++ b/dts/src/arm/armada-xp-openblocks-ax3-4.dts @@ -25,7 +25,7 @@ memory { device_type = "memory"; - reg = <0 0x00000000 0 0xC0000000>; /* 3 GB */ + reg = <0 0x00000000 0 0x40000000>; /* 1 GB soldered on */ }; soc { diff --git a/dts/src/arm64/apm-mustang.dts b/dts/src/arm64/apm-mustang.dts index 1247ca1200..6541962f5d 100644 --- a/dts/src/arm64/apm-mustang.dts +++ b/dts/src/arm64/apm-mustang.dts @@ -24,3 +24,7 @@ reg = < 0x1 0x00000000 0x0 0x80000000 >; /* Updated by bootloader */ }; }; + +&serial0 { + status = "ok"; +}; diff --git a/dts/src/arm64/apm-storm.dtsi b/dts/src/arm64/apm-storm.dtsi index c5f0a47a13..40aa96ce13 100644 --- a/dts/src/arm64/apm-storm.dtsi +++ b/dts/src/arm64/apm-storm.dtsi @@ -273,8 +273,9 @@ }; serial0: serial@1c020000 { + status = "disabled"; device_type = "serial"; - compatible = "ns16550"; + compatible = "ns16550a"; reg = <0 0x1c020000 0x0 0x1000>; reg-shift = <2>; clock-frequency = <10000000>; /* Updated by bootloader */ @@ -282,6 +283,39 @@ interrupts = <0x0 0x4c 0x4>; }; + serial1: serial@1c021000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c021000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4d 0x4>; + }; + + serial2: serial@1c022000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c022000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4e 0x4>; + }; + + serial3: serial@1c023000 { + status = "disabled"; + device_type = "serial"; + compatible = "ns16550a"; + reg = <0 0x1c023000 0x0 0x1000>; + reg-shift = <2>; + clock-frequency = <10000000>; /* Updated by bootloader */ + interrupt-parent = <&gic>; + interrupts = <0x0 0x4f 0x4>; + }; + phy1: phy@1f21a000 { compatible = "apm,xgene-phy"; reg = <0x0 0x1f21a000 0x0 0x100>; |