diff options
author | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-10-23 17:57:42 +1000 |
---|---|---|
committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2013-10-23 17:58:40 +1000 |
commit | a15c25d433b42d04b2f2d2569e0e55953934b03d (patch) | |
tree | 3dc588e0929d6b31241dc10b07c10f12e97af175 | |
parent | fc8695c29ad33ec6b803679be51ac1130548a34a (diff) | |
download | meta-xilinx-a15c25d433b42d04b2f2d2569e0e55953934b03d.tar.gz |
boards/common/zynq-7-base.dtsi: Updated for 'xlnx_3.8' kernel
* Updated various nodes with newer properties and clock information
* Fixed up compatible properties for some nodes
* Refactored out some board specific properties
* Cleaned up some style inconsistency
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
-rw-r--r-- | conf/machine/boards/common/zynq-7-base.dtsi | 294 | ||||
-rw-r--r-- | conf/machine/boards/qemu/qemuzynq.dts | 4 |
2 files changed, 171 insertions, 127 deletions
diff --git a/conf/machine/boards/common/zynq-7-base.dtsi b/conf/machine/boards/common/zynq-7-base.dtsi index 9354ca68..c558d5a6 100644 --- a/conf/machine/boards/common/zynq-7-base.dtsi +++ b/conf/machine/boards/common/zynq-7-base.dtsi | |||
@@ -50,8 +50,7 @@ | |||
50 | / { | 50 | / { |
51 | #address-cells = <0x1>; | 51 | #address-cells = <0x1>; |
52 | #size-cells = <0x1>; | 52 | #size-cells = <0x1>; |
53 | compatible = "xlnx,zynq-7000", "xlnx,zynq-zc770"; | 53 | compatible = "xlnx,zynq-7000"; |
54 | interrupt-parent = <0x1>; | ||
55 | aliases { | 54 | aliases { |
56 | ethernet0 = &ps7_ethernet_0; | 55 | ethernet0 = &ps7_ethernet_0; |
57 | ethernet1 = &ps7_ethernet_1; | 56 | ethernet1 = &ps7_ethernet_1; |
@@ -60,34 +59,36 @@ | |||
60 | } ; | 59 | } ; |
61 | cpus { | 60 | cpus { |
62 | #address-cells = <1>; | 61 | #address-cells = <1>; |
63 | #cpus = <0x2>; | ||
64 | #size-cells = <0>; | 62 | #size-cells = <0>; |
65 | ps7_cortexa9_0: cpu@0 { | 63 | ps7_cortexa9_0: cpu@0 { |
66 | compatible = "xlnx,ps7-cortexa9-1.00.a"; | 64 | bus-handle = <&ps7_axi_interconnect_0>; |
65 | compatible = "arm,cortex-a9"; | ||
67 | d-cache-line-size = <0x20>; | 66 | d-cache-line-size = <0x20>; |
68 | d-cache-size = <0x8000>; | 67 | d-cache-size = <0x8000>; |
69 | device_type = "cpu"; | 68 | device_type = "cpu"; |
70 | i-cache-line-size = <0x20>; | 69 | i-cache-line-size = <0x20>; |
71 | i-cache-size = <0x8000>; | 70 | i-cache-size = <0x8000>; |
72 | model = "ps7_cortexa9,1.00.a"; | 71 | interrupt-handle = <&ps7_scugic_0>; |
73 | reg = <0>; | 72 | reg = <0x0>; |
74 | } ; | 73 | } ; |
75 | ps7_cortexa9_1: cpu@1 { | 74 | ps7_cortexa9_1: cpu@1 { |
76 | compatible = "xlnx,ps7-cortexa9-1.00.a"; | 75 | bus-handle = <&ps7_axi_interconnect_0>; |
76 | compatible = "arm,cortex-a9"; | ||
77 | d-cache-line-size = <0x20>; | 77 | d-cache-line-size = <0x20>; |
78 | d-cache-size = <0x8000>; | 78 | d-cache-size = <0x8000>; |
79 | device_type = "cpu"; | 79 | device_type = "cpu"; |
80 | i-cache-line-size = <0x20>; | 80 | i-cache-line-size = <0x20>; |
81 | i-cache-size = <0x8000>; | 81 | i-cache-size = <0x8000>; |
82 | model = "ps7_cortexa9,1.00.a"; | 82 | interrupt-handle = <&ps7_scugic_0>; |
83 | reg = <1>; | 83 | reg = <0x1>; |
84 | } ; | 84 | } ; |
85 | } ; | 85 | } ; |
86 | pmu { | 86 | pmu { |
87 | compatible = "arm,cortex-a9-pmu"; | 87 | compatible = "arm,cortex-a9-pmu"; |
88 | interrupt-parent = <&ps7_scugic_0>; | 88 | interrupt-parent = <&ps7_scugic_0>; |
89 | interrupts = < 0 5 4 0 6 4 >; | 89 | interrupts = <0 5 4>, <0 6 4>; |
90 | reg = < 0xf8891000 0x1000 0xf8893000 0x1000 >; | 90 | reg = <0xf8891000 0x1000>, <0xf8893000 0x1000>; |
91 | reg-names = "cpu0", "cpu1"; | ||
91 | } ; | 92 | } ; |
92 | ps7_axi_interconnect_0: amba@0 { | 93 | ps7_axi_interconnect_0: amba@0 { |
93 | #address-cells = <1>; | 94 | #address-cells = <1>; |
@@ -96,28 +97,32 @@ | |||
96 | ranges ; | 97 | ranges ; |
97 | ps7_afi_0: ps7-afi@f8008000 { | 98 | ps7_afi_0: ps7-afi@f8008000 { |
98 | compatible = "xlnx,ps7-afi-1.00.a"; | 99 | compatible = "xlnx,ps7-afi-1.00.a"; |
99 | reg = < 0xf8008000 0x1000 >; | 100 | reg = <0xf8008000 0x1000>; |
100 | } ; | 101 | } ; |
101 | ps7_afi_1: ps7-afi@f8009000 { | 102 | ps7_afi_1: ps7-afi@f8009000 { |
102 | compatible = "xlnx,ps7-afi-1.00.a"; | 103 | compatible = "xlnx,ps7-afi-1.00.a"; |
103 | reg = < 0xf8009000 0x1000 >; | 104 | reg = <0xf8009000 0x1000>; |
104 | } ; | 105 | } ; |
105 | ps7_afi_2: ps7-afi@f800a000 { | 106 | ps7_afi_2: ps7-afi@f800a000 { |
106 | compatible = "xlnx,ps7-afi-1.00.a"; | 107 | compatible = "xlnx,ps7-afi-1.00.a"; |
107 | reg = < 0xf800a000 0x1000 >; | 108 | reg = <0xf800a000 0x1000>; |
108 | } ; | 109 | } ; |
109 | ps7_afi_3: ps7-afi@f800b000 { | 110 | ps7_afi_3: ps7-afi@f800b000 { |
110 | compatible = "xlnx,ps7-afi-1.00.a"; | 111 | compatible = "xlnx,ps7-afi-1.00.a"; |
111 | reg = < 0xf800b000 0x1000 >; | 112 | reg = <0xf800b000 0x1000>; |
112 | } ; | 113 | } ; |
113 | ps7_scugic_0: ps7-scugic@f8f01000 { | 114 | ps7_scugic_0: ps7-scugic@f8f01000 { |
114 | #interrupt-cells = < 3 >; | 115 | #address-cells = <2>; |
116 | #interrupt-cells = <3>; | ||
117 | #size-cells = <1>; | ||
115 | compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic"; | 118 | compatible = "xlnx,ps7-scugic-1.00.a", "arm,cortex-a9-gic", "arm,gic"; |
116 | interrupt-controller ; | 119 | interrupt-controller ; |
117 | reg = < 0xf8f01000 0x1000 >, < 0xf8f00100 0x100 >; | 120 | num_cpus = <2>; |
121 | num_interrupts = <96>; | ||
122 | reg = <0xf8f01000 0x1000>, <0xf8f00100 0x100>; | ||
118 | } ; | 123 | } ; |
119 | ps7_pl310_0: ps7-pl310@f8f02000 { | 124 | ps7_pl310_0: ps7-pl310@f8f02000 { |
120 | compatible = "arm,pl310-cache"; | 125 | compatible = "xlnx,ps7-pl310-1.00.a", "arm,pl310-cache"; |
121 | cache-unified; | 126 | cache-unified; |
122 | cache-level = <2>; | 127 | cache-level = <2>; |
123 | reg = <0xf8f02000 0x1000>; | 128 | reg = <0xf8f02000 0x1000>; |
@@ -127,70 +132,71 @@ | |||
127 | } ; | 132 | } ; |
128 | ps7_ddrc_0: ps7-ddrc@f8006000 { | 133 | ps7_ddrc_0: ps7-ddrc@f8006000 { |
129 | compatible = "xlnx,ps7-ddrc-1.00.a", "xlnx,ps7-ddrc"; | 134 | compatible = "xlnx,ps7-ddrc-1.00.a", "xlnx,ps7-ddrc"; |
130 | reg = < 0xf8006000 0x1000 >; | 135 | reg = <0xf8006000 0x1000>; |
131 | xlnx,has-ecc = <0x0>; | 136 | xlnx,has-ecc = <0x0>; |
132 | } ; | 137 | } ; |
133 | ps7_ram_0: ps7-ram@fffc0000 { | 138 | ps7_ram_0: ps7-ram@fffc0000 { |
134 | compatible = "xlnx,ps7-ram-1.00.a", "xlnx,ps7-ocm"; | 139 | compatible = "xlnx,ps7-ram-1.00.a", "xlnx,ps7-ocm"; |
135 | reg = < 0xfffc0000 0x40000 >; | 140 | interrupt-parent = <&ps7_scugic_0>; |
141 | interrupts = <0 3 4>; | ||
142 | reg = <0xfffc0000 0x40000>; | ||
136 | } ; | 143 | } ; |
137 | ps7_slcr_0: ps7-slcr@f8000000 { | 144 | ps7_slcr_0: ps7-slcr@f8000000 { |
138 | compatible = "xlnx,ps7-slcr-1.00.a", "xlnx,zynq-slcr"; | 145 | compatible = "xlnx,ps7-slcr-1.00.a", "xlnx,zynq-slcr"; |
139 | reg = < 0xf8000000 0x1000 >; | 146 | reg = <0xf8000000 0x1000>; |
140 | clocks { | 147 | clocks { |
141 | #address-cells = <1>; | 148 | #address-cells = <1>; |
142 | #size-cells = <0>; | 149 | #size-cells = <0>; |
143 | armpll: armpll { | 150 | clkc: clkc { |
144 | #clock-cells = <0>; | 151 | #clock-cells = <1>; |
145 | clock-output-names = "armpll"; | 152 | clock-output-names = "armpll", "ddrpll", "iopll", |
146 | clocks = <&ps_clk>; | 153 | "cpu_6or4x", "cpu_3or2x", "cpu_2x", "cpu_1x", |
147 | compatible = "xlnx,zynq-pll"; | 154 | "ddr2x", "ddr3x", "dci", |
148 | lockbit = <0>; | 155 | "lqspi", "smc", "pcap", |
149 | reg = < 0x100 0x110 0x10c >; | 156 | "gem0", "gem1", |
150 | } ; | 157 | "fclk0", "fclk1", "fclk2", "fclk3", |
151 | ddrpll: ddrpll { | 158 | "can0", "can1", |
152 | #clock-cells = <0>; | 159 | "sdio0", "sdio1", |
153 | clock-output-names = "ddrpll"; | 160 | "uart0", "uart1", |
154 | clocks = <&ps_clk>; | 161 | "spi0", "spi1", |
155 | compatible = "xlnx,zynq-pll"; | 162 | "dma", |
156 | lockbit = <1>; | 163 | "usb0_aper", "usb1_aper", |
157 | reg = < 0x104 0x114 0x10c >; | 164 | "gem0_aper", "gem1_aper", |
158 | } ; | 165 | "sdio0_aper", "sdio1_aper", |
159 | iopll: iopll { | 166 | "spi0_aper", "spi1_aper", |
160 | #clock-cells = <0>; | 167 | "can0_aper", "can1_aper", |
161 | clock-output-names = "iopll"; | 168 | "i2c0_aper", "i2c1_aper", |
162 | clocks = <&ps_clk>; | 169 | "uart0_aper", "uart1_aper", |
163 | compatible = "xlnx,zynq-pll"; | 170 | "gpio_aper", "lqspi_aper", "smc_aper", "swdt", |
164 | lockbit = <2>; | 171 | "dbg_trc", "dbg_apb"; |
165 | reg = < 0x108 0x118 0x10c >; | 172 | compatible = "xlnx,ps7-clkc"; |
166 | } ; | 173 | fclk-enable = <0xf>; |
167 | ps_clk: ps_clk { | 174 | ps-clk-frequency = <33333333>; |
168 | #clock-cells = <0>; | ||
169 | clock-frequency = <33333333>; | ||
170 | clock-output-names = "ps_clk"; | ||
171 | compatible = "fixed-clock"; | ||
172 | } ; | 175 | } ; |
173 | } ; | 176 | } ; |
174 | } ; | 177 | } ; |
175 | ps7_scutimer_0: ps7-scutimer@f8f00600 { | 178 | ps7_scutimer_0: ps7-scutimer@f8f00600 { |
179 | clocks = <&clkc 4>; | ||
176 | compatible = "xlnx,ps7-scutimer-1.00.a", "arm,cortex-a9-twd-timer"; | 180 | compatible = "xlnx,ps7-scutimer-1.00.a", "arm,cortex-a9-twd-timer"; |
177 | interrupt-parent = <&ps7_scugic_0>; | 181 | interrupt-parent = <&ps7_scugic_0>; |
178 | interrupts = < 1 13 769 >; | 182 | interrupts = <1 13 0x301>; |
179 | reg = < 0xf8f00600 0x20 >; | 183 | reg = <0xf8f00600 0x20>; |
180 | } ; | 184 | } ; |
181 | ps7_scuwdt_0: ps7-scuwdt@f8f00620 { | 185 | ps7_scuwdt_0: ps7-scuwdt@f8f00620 { |
186 | clocks = <&clkc 4>; | ||
182 | compatible = "xlnx,ps7-scuwdt-1.00.a"; | 187 | compatible = "xlnx,ps7-scuwdt-1.00.a"; |
183 | device_type = "watchdog"; | 188 | device_type = "watchdog"; |
184 | interrupt-parent = <&ps7_scugic_0>; | 189 | interrupt-parent = <&ps7_scugic_0>; |
185 | interrupts = < 1 14 769 >; | 190 | interrupts = <1 14 0x301>; |
186 | reg = < 0xf8f00620 0xe0 >; | 191 | reg = <0xf8f00620 0xe0>; |
187 | } ; | 192 | } ; |
188 | ps7_wdt_0: ps7-wdt@f8005000 { | 193 | ps7_wdt_0: ps7-wdt@f8005000 { |
194 | clocks = <&clkc 45>; | ||
189 | compatible = "xlnx,ps7-wdt-1.00.a"; | 195 | compatible = "xlnx,ps7-wdt-1.00.a"; |
190 | reg = < 0xf8005000 0x1000 >; | ||
191 | interrupt-parent = <&ps7_scugic_0>; | ||
192 | interrupts = < 0 9 4 >; | ||
193 | device_type = "watchdog"; | 196 | device_type = "watchdog"; |
197 | interrupt-parent = <&ps7_scugic_0>; | ||
198 | interrupts = <0 9 4>; | ||
199 | reg = <0xf8005000 0x1000>; | ||
194 | reset = <0>; | 200 | reset = <0>; |
195 | timeout = <10>; | 201 | timeout = <10>; |
196 | } ; | 202 | } ; |
@@ -199,30 +205,38 @@ | |||
199 | #dma-channels = <8>; | 205 | #dma-channels = <8>; |
200 | #dma-requests = <4>; | 206 | #dma-requests = <4>; |
201 | arm,primecell-periphid = <0x41330>; | 207 | arm,primecell-periphid = <0x41330>; |
202 | compatible = "xlnx,ps7-dma-1.00.a", "arm,pl330"; | 208 | clock-names = "apb_pclk"; |
209 | clocks = <&clkc 27>; | ||
210 | compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330"; | ||
203 | interrupt-parent = <&ps7_scugic_0>; | 211 | interrupt-parent = <&ps7_scugic_0>; |
204 | interrupts = < 0 13 4 0 14 4 0 15 4 0 16 4 0 17 4 0 40 4 0 41 4 0 42 4 0 43 4 >; | 212 | interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7"; |
205 | reg = < 0xf8004000 0x1000 >; | 213 | interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>; |
214 | reg = <0xf8004000 0x1000>; | ||
206 | } ; | 215 | } ; |
207 | ps7_dma_s: ps7-dma@f8003000 { | 216 | ps7_dma_s: ps7-dma@f8003000 { |
208 | #dma-cells = <1>; | 217 | #dma-cells = <1>; |
209 | #dma-channels = <8>; | 218 | #dma-channels = <8>; |
210 | #dma-requests = <4>; | 219 | #dma-requests = <4>; |
211 | arm,primecell-periphid = <0x41330>; | 220 | arm,primecell-periphid = <0x41330>; |
221 | clock-names = "apb_pclk"; | ||
222 | clocks = <&clkc 27>; | ||
212 | compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330"; | 223 | compatible = "xlnx,ps7-dma-1.00.a", "arm,primecell", "arm,pl330"; |
213 | interrupt-parent = <&ps7_scugic_0>; | 224 | interrupt-parent = <&ps7_scugic_0>; |
214 | interrupts = < 0 13 4 0 14 4 0 15 4 0 16 4 0 17 4 0 40 4 0 41 4 0 42 4 0 43 4 >; | 225 | interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3", "dma4", "dma5", "dma6", "dma7"; |
215 | reg = < 0xf8003000 0x1000 >; | 226 | interrupts = <0 13 4>, <0 14 4>, <0 15 4>, <0 16 4>, <0 17 4>, <0 40 4>, <0 41 4>, <0 42 4>, <0 43 4>; |
227 | reg = <0xf8003000 0x1000>; | ||
216 | } ; | 228 | } ; |
217 | ps7_dev_cfg_0: ps7-dev-cfg@f8007000 { | 229 | ps7_dev_cfg_0: ps7-dev-cfg@f8007000 { |
230 | clock-names = "ref_clk", "fclk0", "fclk1", "fclk2", "fclk3"; | ||
231 | clocks = <&clkc 12>, <&clkc 15>, <&clkc 16>, <&clkc 17>, <&clkc 18>; | ||
218 | compatible = "xlnx,ps7-dev-cfg-1.00.a"; | 232 | compatible = "xlnx,ps7-dev-cfg-1.00.a"; |
219 | interrupt-parent = <&ps7_scugic_0>; | 233 | interrupt-parent = <&ps7_scugic_0>; |
220 | interrupts = < 0 8 4 >; | 234 | interrupts = <0 8 4>; |
221 | reg = < 0xf8007000 0x100 >; | 235 | reg = <0xf8007000 0x100>; |
222 | } ; | 236 | } ; |
223 | ps7_iop_bus_config_0: ps7-iop-bus-config@e0200000 { | 237 | ps7_iop_bus_config_0: ps7-iop-bus-config@e0200000 { |
224 | compatible = "xlnx,ps7-iop-bus-config-1.00.a"; | 238 | compatible = "xlnx,ps7-iop-bus-config-1.00.a"; |
225 | reg = < 0xe0200000 0x1000 >; | 239 | reg = <0xe0200000 0x1000>; |
226 | } ; | 240 | } ; |
227 | 241 | ||
228 | /* ========= Peripherals ========= */ | 242 | /* ========= Peripherals ========= */ |
@@ -230,11 +244,14 @@ | |||
230 | ps7_ethernet_0: ps7-ethernet@e000b000 { | 244 | ps7_ethernet_0: ps7-ethernet@e000b000 { |
231 | #address-cells = <1>; | 245 | #address-cells = <1>; |
232 | #size-cells = <0>; | 246 | #size-cells = <0>; |
247 | clock-names = "ref_clk", "aper_clk"; | ||
248 | clocks = <&clkc 13>, <&clkc 30>; | ||
233 | compatible = "xlnx,ps7-ethernet-1.00.a"; | 249 | compatible = "xlnx,ps7-ethernet-1.00.a"; |
234 | interrupt-parent = <&ps7_scugic_0>; | 250 | interrupt-parent = <&ps7_scugic_0>; |
235 | interrupts = < 0 22 1 >; | 251 | interrupts = <0 22 4>; |
236 | local-mac-address = [ 00 0a 35 00 00 00 ]; | 252 | local-mac-address = [ 00 0a 35 00 00 00 ]; |
237 | reg = < 0xe000b000 0x1000 >; | 253 | reg = <0xe000b000 0x1000>; |
254 | xlnx,enet-reset = <0xffffffff>; | ||
238 | xlnx,eth-mode = <0x1>; | 255 | xlnx,eth-mode = <0x1>; |
239 | xlnx,has-mdio = <0x1>; | 256 | xlnx,has-mdio = <0x1>; |
240 | xlnx,ptp-enet-clock = <111111115>; | 257 | xlnx,ptp-enet-clock = <111111115>; |
@@ -246,11 +263,14 @@ | |||
246 | ps7_ethernet_1: ps7-ethernet@e000c000 { | 263 | ps7_ethernet_1: ps7-ethernet@e000c000 { |
247 | #address-cells = <1>; | 264 | #address-cells = <1>; |
248 | #size-cells = <0>; | 265 | #size-cells = <0>; |
266 | clock-names = "ref_clk", "aper_clk"; | ||
267 | clocks = <&clkc 14>, <&clkc 31>; | ||
249 | compatible = "xlnx,ps7-ethernet-1.00.a"; | 268 | compatible = "xlnx,ps7-ethernet-1.00.a"; |
250 | interrupt-parent = <&ps7_scugic_0>; | 269 | interrupt-parent = <&ps7_scugic_0>; |
251 | interrupts = < 0 45 1 >; | 270 | interrupts = <0 45 1>; |
252 | local-mac-address = [ 00 0a 35 00 00 01 ]; | 271 | local-mac-address = [ 00 0a 35 00 00 01 ]; |
253 | reg = < 0xe000c000 0x1000 >; | 272 | reg = <0xe000c000 0x1000>; |
273 | xlnx,enet-reset = <0xffffffff>; | ||
254 | xlnx,eth-mode = <0x1>; | 274 | xlnx,eth-mode = <0x1>; |
255 | xlnx,has-mdio = <0x1>; | 275 | xlnx,has-mdio = <0x1>; |
256 | xlnx,ptp-enet-clock = <111111115>; | 276 | xlnx,ptp-enet-clock = <111111115>; |
@@ -262,175 +282,199 @@ | |||
262 | 282 | ||
263 | ps7_gpio_0: ps7-gpio@e000a000 { | 283 | ps7_gpio_0: ps7-gpio@e000a000 { |
264 | #gpio-cells = <2>; | 284 | #gpio-cells = <2>; |
285 | clocks = <&clkc 42>; | ||
265 | compatible = "xlnx,ps7-gpio-1.00.a"; | 286 | compatible = "xlnx,ps7-gpio-1.00.a"; |
266 | emio-gpio-width = <64>; | 287 | emio-gpio-width = <64>; |
267 | gpio-controller ; | 288 | gpio-controller ; |
268 | gpio-mask-high = <0xc0000>; | 289 | gpio-mask-high = <0x0>; |
269 | gpio-mask-low = <0xfe81>; | 290 | gpio-mask-low = <0x0>; |
270 | interrupt-parent = <&ps7_scugic_0>; | 291 | interrupt-parent = <&ps7_scugic_0>; |
271 | interrupts = < 0 20 4 >; | 292 | interrupts = <0 20 4>; |
272 | reg = < 0xe000a000 0x1000 >; | 293 | reg = <0xe000a000 0x1000>; |
273 | } ; | 294 | } ; |
274 | 295 | ||
275 | ps7_qspi_0: ps7-qspi@e000d000 { | 296 | ps7_qspi_0: ps7-qspi@e000d000 { |
297 | bus-num = <2>; | ||
298 | clock-names = "ref_clk", "aper_clk"; | ||
299 | clocks = <&clkc 10>, <&clkc 43>; | ||
276 | compatible = "xlnx,ps7-qspi-1.00.a"; | 300 | compatible = "xlnx,ps7-qspi-1.00.a"; |
277 | reg = < 0xe000d000 0x1000 >; | 301 | reg = <0xe000d000 0x1000>; |
278 | interrupt-parent = <&ps7_scugic_0>; | 302 | interrupt-parent = <&ps7_scugic_0>; |
279 | interrupts = < 0 19 4 >; | 303 | interrupts = <0 19 4>; |
280 | bus-num = <2>; | ||
281 | is-dual = <0>; | 304 | is-dual = <0>; |
282 | num-chip-select = <1>; | 305 | num-chip-select = <1>; |
283 | speed-hz = <200000000>; | 306 | speed-hz = <200000000>; |
307 | xlnx,fb-clk = <0x1>; | ||
308 | xlnx,qspi-mode = <0x0>; | ||
284 | #address-cells = <1>; | 309 | #address-cells = <1>; |
285 | #size-cells = <0>; | 310 | #size-cells = <0>; |
286 | } ; | 311 | } ; |
287 | ps7_qspi_linear_0: ps7-qspi-linear@fc000000 { | 312 | ps7_qspi_linear_0: ps7-qspi-linear@fc000000 { |
288 | compatible = "xlnx,ps7-qspi-linear-1.00.a"; | 313 | compatible = "xlnx,ps7-qspi-linear-1.00.a"; |
289 | reg = < 0xfc000000 0x1000000 >; | 314 | reg = <0xfc000000 0x1000000>; |
290 | } ; | 315 | } ; |
291 | 316 | ||
292 | ps7_spi_0: ps7-spi@e0006000 { | 317 | ps7_spi_0: ps7-spi@e0006000 { |
318 | bus-num = <0>; | ||
319 | clock-names = "ref_clk", "aper_clk"; | ||
320 | clocks = <&clkc 25>, <&clkc 34>; | ||
293 | compatible = "xlnx,ps7-spi-1.00.a"; | 321 | compatible = "xlnx,ps7-spi-1.00.a"; |
294 | interrupt-parent = <&ps7_scugic_0>; | 322 | interrupt-parent = <&ps7_scugic_0>; |
295 | interrupts = < 0 26 4 >; | 323 | interrupts = <0 26 4>; |
296 | bus-num = <0>; | ||
297 | num-chip-select = <4>; | 324 | num-chip-select = <4>; |
298 | reg = < 0xe0006000 0x1000 >; | 325 | reg = <0xe0006000 0x1000>; |
299 | speed-hz = <166666666>; | 326 | speed-hz = <166666666>; |
300 | #address-cells = <1>; | 327 | #address-cells = <1>; |
301 | #size-cells = <0>; | 328 | #size-cells = <0>; |
302 | } ; | 329 | } ; |
303 | ps7_spi_1: ps7-spi@e0007000 { | 330 | ps7_spi_1: ps7-spi@e0007000 { |
331 | bus-num = <1>; | ||
332 | clock-names = "ref_clk", "aper_clk"; | ||
333 | clocks = <&clkc 26>, <&clkc 35>; | ||
304 | compatible = "xlnx,ps7-spi-1.00.a"; | 334 | compatible = "xlnx,ps7-spi-1.00.a"; |
305 | interrupt-parent = <&ps7_scugic_0>; | 335 | interrupt-parent = <&ps7_scugic_0>; |
306 | interrupts = < 0 49 4 >; | 336 | interrupts = <0 49 4>; |
307 | bus-num = <1>; | ||
308 | num-chip-select = <4>; | 337 | num-chip-select = <4>; |
309 | reg = < 0xe0007000 0x1000 >; | 338 | reg = <0xe0007000 0x1000>; |
310 | speed-hz = <166666666>; | 339 | speed-hz = <166666666>; |
311 | #address-cells = <1>; | 340 | #address-cells = <1>; |
312 | #size-cells = <0>; | 341 | #size-cells = <0>; |
313 | } ; | 342 | } ; |
314 | 343 | ||
315 | ps7_sd_0: ps7-sdio@e0100000 { | 344 | ps7_sd_0: ps7-sdio@e0100000 { |
345 | clock-names = "ref_clk", "aper_clk"; | ||
346 | clocks = <&clkc 21>, <&clkc 32>; | ||
316 | clock-frequency = <50000000>; | 347 | clock-frequency = <50000000>; |
317 | compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci"; | 348 | compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci", "arasan,sdhci"; |
318 | interrupt-parent = <&ps7_scugic_0>; | 349 | interrupt-parent = <&ps7_scugic_0>; |
319 | interrupts = < 0 24 4 >; | 350 | interrupts = <0 24 4>; |
320 | reg = < 0xe0100000 0x1000 >; | 351 | reg = <0xe0100000 0x1000>; |
321 | xlnx,has-cd = <0x1>; | 352 | xlnx,has-cd = <0x1>; |
322 | xlnx,has-power = <0x0>; | 353 | xlnx,has-power = <0x0>; |
323 | xlnx,has-wp = <0x1>; | 354 | xlnx,has-wp = <0x1>; |
324 | xlnx,sdio-clk-freq-hz = <0x2faf080>; | ||
325 | } ; | 355 | } ; |
326 | ps7_sd_1: ps7-sdio@e0101000 { | 356 | ps7_sd_1: ps7-sdio@e0101000 { |
357 | clock-names = "ref_clk", "aper_clk"; | ||
358 | clocks = <&clkc 22>, <&clkc 33>; | ||
327 | clock-frequency = <50000000>; | 359 | clock-frequency = <50000000>; |
328 | compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci"; | 360 | compatible = "xlnx,ps7-sdio-1.00.a", "generic-sdhci", "arasan,sdhci"; |
329 | interrupt-parent = <&ps7_scugic_0>; | 361 | interrupt-parent = <&ps7_scugic_0>; |
330 | interrupts = < 0 47 4 >; | 362 | interrupts = <0 47 4>; |
331 | reg = < 0xe0101000 0x1000 >; | 363 | reg = <0xe0101000 0x1000>; |
332 | xlnx,has-cd = <0x1>; | 364 | xlnx,has-cd = <0x1>; |
333 | xlnx,has-power = <0x0>; | 365 | xlnx,has-power = <0x0>; |
334 | xlnx,has-wp = <0x1>; | 366 | xlnx,has-wp = <0x1>; |
335 | xlnx,sdio-clk-freq-hz = <0x2faf080>; | ||
336 | } ; | 367 | } ; |
337 | 368 | ||
338 | ps7_ttc_0: ps7-ttc@f8001000 { | 369 | ps7_ttc_0: ps7-ttc@f8001000 { |
339 | compatible = "xlnx,ps7-ttc-1.00.a"; | 370 | clocks = <&clkc 6>; |
371 | compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc"; | ||
372 | interrupt-names = "ttc0", "ttc1", "ttc2"; | ||
340 | interrupt-parent = <&ps7_scugic_0>; | 373 | interrupt-parent = <&ps7_scugic_0>; |
341 | interrupts = < 0 10 4 0 11 4 0 12 4 >; | 374 | interrupts = <0 10 4>, <0 11 4>, <0 12 4>; |
342 | reg = < 0xf8001000 0x1000 >; | 375 | reg = <0xf8001000 0x1000>; |
343 | } ; | 376 | } ; |
344 | ps7_ttc_1: ps7-ttc@f8002000 { | 377 | ps7_ttc_1: ps7-ttc@f8002000 { |
345 | compatible = "xlnx,ps7-ttc-1.00.a"; | 378 | clocks = <&clkc 6>; |
379 | compatible = "xlnx,ps7-ttc-1.00.a", "cdns,ttc"; | ||
380 | interrupt-names = "ttc0", "ttc1", "ttc2"; | ||
346 | interrupt-parent = <&ps7_scugic_0>; | 381 | interrupt-parent = <&ps7_scugic_0>; |
347 | interrupts = < 0 37 4 0 38 4 0 39 4 >; | 382 | interrupts = <0 37 4>, <0 38 4>, <0 39 4>; |
348 | reg = < 0xf8002000 0x1000 >; | 383 | reg = <0xf8002000 0x1000>; |
349 | } ; | 384 | } ; |
350 | 385 | ||
351 | ps7_uart_0: serial@e0000000 { | 386 | ps7_uart_0: serial@e0000000 { |
387 | clock-names = "ref_clk", "aper_clk"; | ||
388 | clocks = <&clkc 23>, <&clkc 40>; | ||
352 | compatible = "xlnx,ps7-uart-1.00.a", "xlnx,xuartps"; | 389 | compatible = "xlnx,ps7-uart-1.00.a", "xlnx,xuartps"; |
353 | reg = < 0xe0000000 0x1000 >; | ||
354 | interrupt-parent = <&ps7_scugic_0>; | ||
355 | interrupts = < 0 27 4 >; | ||
356 | device_type = "serial"; | 390 | device_type = "serial"; |
391 | interrupt-parent = <&ps7_scugic_0>; | ||
392 | interrupts = <0 27 4>; | ||
393 | reg = <0xe0000000 0x1000>; | ||
357 | port-number = <1>; | 394 | port-number = <1>; |
358 | current-speed = <115200>; | 395 | current-speed = <115200>; |
359 | xlnx,has-modem = <0x0>; | 396 | xlnx,has-modem = <0x0>; |
360 | xlnx,uart-clk-freq-hz = <0x2faf080>; | ||
361 | } ; | 397 | } ; |
362 | ps7_uart_1: serial@e0001000 { | 398 | ps7_uart_1: serial@e0001000 { |
399 | clock-names = "ref_clk", "aper_clk"; | ||
400 | clocks = <&clkc 24>, <&clkc 41>; | ||
363 | compatible = "xlnx,ps7-uart-1.00.a", "xlnx,xuartps"; | 401 | compatible = "xlnx,ps7-uart-1.00.a", "xlnx,xuartps"; |
364 | reg = < 0xe0001000 0x1000 >; | ||
365 | interrupt-parent = <&ps7_scugic_0>; | ||
366 | interrupts = < 0 50 4 >; | ||
367 | device_type = "serial"; | 402 | device_type = "serial"; |
403 | interrupt-parent = <&ps7_scugic_0>; | ||
404 | interrupts = <0 50 4>; | ||
405 | reg = <0xe0001000 0x1000>; | ||
368 | port-number = <0>; | 406 | port-number = <0>; |
369 | current-speed = <115200>; | 407 | current-speed = <115200>; |
370 | xlnx,has-modem = <0x0>; | 408 | xlnx,has-modem = <0x0>; |
371 | xlnx,uart-clk-freq-hz = <0x2faf080>; | ||
372 | } ; | 409 | } ; |
373 | 410 | ||
374 | ps7_i2c_0: ps7-i2c@e0004000 { | 411 | ps7_i2c_0: ps7-i2c@e0004000 { |
412 | bus-id = <0>; | ||
413 | clocks = <&clkc 38>; | ||
375 | compatible = "xlnx,ps7-i2c-1.00.a"; | 414 | compatible = "xlnx,ps7-i2c-1.00.a"; |
376 | reg = < 0xe0004000 0x1000 >; | ||
377 | interrupt-parent = <&ps7_scugic_0>; | 415 | interrupt-parent = <&ps7_scugic_0>; |
378 | interrupts = < 0 25 4 >; | 416 | interrupts = <0 25 4>; |
379 | bus-id = <0>; | 417 | reg = <0xe0004000 0x1000>; |
380 | i2c-clk = <400000>; | 418 | i2c-clk = <400000>; |
381 | input-clk = <111111114>; | ||
382 | #address-cells = <1>; | 419 | #address-cells = <1>; |
383 | #size-cells = <0>; | 420 | #size-cells = <0>; |
384 | } ; | 421 | } ; |
385 | ps7_i2c_1: ps7-i2c@e0005000 { | 422 | ps7_i2c_1: ps7-i2c@e0005000 { |
423 | bus-id = <1>; | ||
424 | clocks = <&clkc 39>; | ||
386 | compatible = "xlnx,ps7-i2c-1.00.a"; | 425 | compatible = "xlnx,ps7-i2c-1.00.a"; |
387 | reg = < 0xe0005000 0x1000 >; | ||
388 | interrupt-parent = <&ps7_scugic_0>; | 426 | interrupt-parent = <&ps7_scugic_0>; |
389 | interrupts = < 0 48 4 >; | 427 | interrupts = <0 48 4>; |
390 | bus-id = <1>; | 428 | reg = <0xe0005000 0x1000>; |
391 | i2c-clk = <400000>; | 429 | i2c-clk = <400000>; |
392 | input-clk = <111111114>; | ||
393 | #address-cells = <1>; | 430 | #address-cells = <1>; |
394 | #size-cells = <0>; | 431 | #size-cells = <0>; |
395 | } ; | 432 | } ; |
396 | 433 | ||
397 | ps7_can_0: ps7-can@e0008000 { | 434 | ps7_can_0: ps7-can@e0008000 { |
398 | compatible = "xlnx,ps7-can-1.00.a"; | 435 | clock-names = "ref_clk", "aper_clk"; |
399 | reg = < 0xe0008000 0x1000 >; | 436 | clocks = <&clkc 19>, <&clkc 36>; |
437 | compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can"; | ||
400 | interrupt-parent = <&ps7_scugic_0>; | 438 | interrupt-parent = <&ps7_scugic_0>; |
401 | interrupts = < 0 28 4 >; | 439 | interrupts = <0 28 4>; |
440 | reg = <0xe0008000 0x1000>; | ||
402 | } ; | 441 | } ; |
403 | ps7_can_1: ps7-can@e0009000 { | 442 | ps7_can_1: ps7-can@e0009000 { |
404 | compatible = "xlnx,ps7-can-1.00.a"; | 443 | clock-names = "ref_clk", "aper_clk"; |
405 | reg = < 0xe0009000 0x1000 >; | 444 | clocks = <&clkc 20>, <&clkc 37>; |
445 | compatible = "xlnx,ps7-can-1.00.a", "xlnx,ps7-can"; | ||
406 | interrupt-parent = <&ps7_scugic_0>; | 446 | interrupt-parent = <&ps7_scugic_0>; |
407 | interrupts = < 0 51 4 >; | 447 | interrupts = <0 51 4>; |
448 | reg = <0xe0009000 0x1000>; | ||
408 | } ; | 449 | } ; |
409 | 450 | ||
410 | ps7_usb_0: ps7-usb@e0002000 { | 451 | ps7_usb_0: ps7-usb@e0002000 { |
452 | clocks = <&clkc 28>; | ||
411 | compatible = "xlnx,ps7-usb-1.00.a"; | 453 | compatible = "xlnx,ps7-usb-1.00.a"; |
412 | reg = < 0xe0002000 0x1000 >; | 454 | reg = <0xe0002000 0x1000>; |
413 | interrupt-parent = <&ps7_scugic_0>; | 455 | interrupt-parent = <&ps7_scugic_0>; |
414 | interrupts = < 0 21 4 >; | 456 | interrupts = <0 21 4>; |
415 | dr_mode = "host"; | 457 | dr_mode = "host"; |
416 | phy_type = "ulpi"; | 458 | phy_type = "ulpi"; |
417 | xlnx,usb-reset = <0xffffffff>; | 459 | xlnx,usb-reset = <0xffffffff>; |
418 | } ; | 460 | } ; |
419 | ps7_usb_1: ps7-usb@e0003000 { | 461 | ps7_usb_1: ps7-usb@e0003000 { |
462 | clocks = <&clkc 29>; | ||
420 | compatible = "xlnx,ps7-usb-1.00.a"; | 463 | compatible = "xlnx,ps7-usb-1.00.a"; |
421 | reg = < 0xe0003000 0x1000 >; | 464 | reg = <0xe0003000 0x1000>; |
422 | interrupt-parent = <&ps7_scugic_0>; | 465 | interrupt-parent = <&ps7_scugic_0>; |
423 | interrupts = < 0 44 4 >; | 466 | interrupts = <0 44 4>; |
424 | dr_mode = "host"; | 467 | dr_mode = "host"; |
425 | phy_type = "ulpi"; | 468 | phy_type = "ulpi"; |
426 | xlnx,usb-reset = <0xffffffff>; | 469 | xlnx,usb-reset = <0xffffffff>; |
427 | } ; | 470 | } ; |
428 | 471 | ||
429 | ps7_xadc: ps7-xadc@f8007100 { | 472 | ps7_xadc: ps7-xadc@f8007100 { |
473 | clocks = <&clkc 12>; | ||
430 | compatible = "xlnx,ps7-xadc-1.00.a"; | 474 | compatible = "xlnx,ps7-xadc-1.00.a"; |
431 | reg = < 0xf8007100 0x20 >; | 475 | reg = <0xf8007100 0x20>; |
432 | interrupt-parent = <&ps7_scugic_0>; | 476 | interrupt-parent = <&ps7_scugic_0>; |
433 | interrupts = < 0 7 4 >; | 477 | interrupts = <0 7 4>; |
434 | } ; | 478 | } ; |
435 | } ; | 479 | } ; |
436 | } ; | 480 | } ; |
diff --git a/conf/machine/boards/qemu/qemuzynq.dts b/conf/machine/boards/qemu/qemuzynq.dts index 772144fa..a4161dac 100644 --- a/conf/machine/boards/qemu/qemuzynq.dts +++ b/conf/machine/boards/qemu/qemuzynq.dts | |||
@@ -8,7 +8,7 @@ | |||
8 | } ; | 8 | } ; |
9 | ps7_ddr_0: memory@0 { | 9 | ps7_ddr_0: memory@0 { |
10 | device_type = "memory"; | 10 | device_type = "memory"; |
11 | reg = < 0x0 0x40000000 >; | 11 | reg = <0x0 0x40000000>; |
12 | } ; | 12 | } ; |
13 | ps7_axi_interconnect_0: amba@0 { | 13 | ps7_axi_interconnect_0: amba@0 { |
14 | ps7_ethernet_0: ps7-ethernet@e000b000 { | 14 | ps7_ethernet_0: ps7-ethernet@e000b000 { |
@@ -27,7 +27,7 @@ | |||
27 | #address-cells = <1>; | 27 | #address-cells = <1>; |
28 | #size-cells = <1>; | 28 | #size-cells = <1>; |
29 | compatible = "st,m25p80"; | 29 | compatible = "st,m25p80"; |
30 | reg = < 0x0 >; | 30 | reg = <0x0>; |
31 | spi-max-frequency = <50000000>; | 31 | spi-max-frequency = <50000000>; |
32 | partition@0x00000000 { | 32 | partition@0x00000000 { |
33 | label = "boot"; | 33 | label = "boot"; |