diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/boot/dts/zynq-7000.dtsi (renamed from arch/arm/boot/dts/zynq-ep107.dts) | 19 | ||||
-rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 30 | ||||
-rw-r--r-- | arch/arm/mach-zynq/common.c | 3 |
4 files changed, 36 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index f37cf9fa5fa0..76ed11e68f72 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile | |||
@@ -103,5 +103,6 @@ dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \ | |||
103 | dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ | 103 | dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \ |
104 | wm8505-ref.dtb \ | 104 | wm8505-ref.dtb \ |
105 | wm8650-mid.dtb | 105 | wm8650-mid.dtb |
106 | dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb | ||
106 | 107 | ||
107 | endif | 108 | endif |
diff --git a/arch/arm/boot/dts/zynq-ep107.dts b/arch/arm/boot/dts/zynq-7000.dtsi index 5caf10011f59..8b30e596deab 100644 --- a/arch/arm/boot/dts/zynq-ep107.dts +++ b/arch/arm/boot/dts/zynq-7000.dtsi | |||
@@ -10,29 +10,16 @@ | |||
10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
11 | * GNU General Public License for more details. | 11 | * GNU General Public License for more details. |
12 | */ | 12 | */ |
13 | /include/ "skeleton.dtsi" | ||
13 | 14 | ||
14 | /dts-v1/; | ||
15 | / { | 15 | / { |
16 | model = "Xilinx Zynq EP107"; | 16 | compatible = "xlnx,zynq-7000"; |
17 | compatible = "xlnx,zynq-ep107"; | ||
18 | #address-cells = <1>; | ||
19 | #size-cells = <1>; | ||
20 | interrupt-parent = <&intc>; | ||
21 | |||
22 | memory { | ||
23 | device_type = "memory"; | ||
24 | reg = <0x0 0x10000000>; | ||
25 | }; | ||
26 | |||
27 | chosen { | ||
28 | bootargs = "console=ttyPS0,9600 root=/dev/ram rw initrd=0x800000,8M earlyprintk"; | ||
29 | linux,stdout-path = &uart0; | ||
30 | }; | ||
31 | 17 | ||
32 | amba { | 18 | amba { |
33 | compatible = "simple-bus"; | 19 | compatible = "simple-bus"; |
34 | #address-cells = <1>; | 20 | #address-cells = <1>; |
35 | #size-cells = <1>; | 21 | #size-cells = <1>; |
22 | interrupt-parent = <&intc>; | ||
36 | ranges; | 23 | ranges; |
37 | 24 | ||
38 | intc: interrupt-controller@f8f01000 { | 25 | intc: interrupt-controller@f8f01000 { |
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts new file mode 100644 index 000000000000..e25a307438ad --- /dev/null +++ b/arch/arm/boot/dts/zynq-zc702.dts | |||
@@ -0,0 +1,30 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011 Xilinx | ||
3 | * Copyright (C) 2012 National Instruments Corp. | ||
4 | * | ||
5 | * This software is licensed under the terms of the GNU General Public | ||
6 | * License version 2, as published by the Free Software Foundation, and | ||
7 | * may be copied, distributed, and modified under those terms. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | */ | ||
14 | /dts-v1/; | ||
15 | /include/ "zynq-7000.dtsi" | ||
16 | |||
17 | / { | ||
18 | model = "Zynq ZC702 Development Board"; | ||
19 | compatible = "xlnx,zynq-zc702", "xlnx,zynq-7000"; | ||
20 | |||
21 | memory { | ||
22 | device_type = "memory"; | ||
23 | reg = <0x0 0x40000000>; | ||
24 | }; | ||
25 | |||
26 | chosen { | ||
27 | bootargs = "console=ttyPS1,115200 earlyprintk"; | ||
28 | }; | ||
29 | |||
30 | }; | ||
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index f0eef848c0d0..5441323e2a68 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c | |||
@@ -115,7 +115,8 @@ static void __init xilinx_map_io(void) | |||
115 | } | 115 | } |
116 | 116 | ||
117 | static const char *xilinx_dt_match[] = { | 117 | static const char *xilinx_dt_match[] = { |
118 | "xlnx,zynq-ep107", | 118 | "xlnx,zynq-zc702", |
119 | "xlnx,zynq-7000", | ||
119 | NULL | 120 | NULL |
120 | }; | 121 | }; |
121 | 122 | ||