diff options
| author | Jon Medhurst <tixy@linaro.org> | 2016-06-02 12:26:32 +0100 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2016-06-02 12:26:32 +0100 |
| commit | 0b0d4b9e5d2b526b9807a6defdef3662bbdd990f (patch) | |
| tree | 035e1f00d24a05603a7abd03cc8d58f3b099b124 /Documentation | |
| parent | f70501ccaccb993e034b9d4ae35d9621756677ff (diff) | |
| parent | 5482ded872294018c9b02eb448c1ff83de3b6819 (diff) | |
Merge branch 'lsk-3.18-armlt-base' into lsk-3.18-armlt
Conflicts:
Documentation/devicetree/bindings/arm/arm-boards
arch/arm64/boot/dts/arm/Makefile
arch/arm64/boot/dts/arm/juno-base.dtsi
arch/arm64/boot/dts/arm/juno-r1.dts
arch/arm64/boot/dts/arm/juno.dts
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/arm-boards | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/arm-boards b/Documentation/devicetree/bindings/arm/arm-boards index 10615f5053b0..a076fce019ff 100644 --- a/Documentation/devicetree/bindings/arm/arm-boards +++ b/Documentation/devicetree/bindings/arm/arm-boards @@ -180,6 +180,7 @@ described under the RS1 memory mapping. Required properties (in root node): compatible = "arm,juno"; /* For Juno r0 board */ compatible = "arm,juno-r1"; /* For Juno r1 board */ + compatible = "arm,juno-r2"; /* For Juno r2 board */ Required nodes: The description for the board must include: |