.. | .. |
---|
24 | 24 | }; |
---|
25 | 25 | |
---|
26 | 26 | chosen { |
---|
27 | | - bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait"; |
---|
| 27 | + bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait"; |
---|
28 | 28 | stdout-path = &uart0; |
---|
29 | 29 | }; |
---|
30 | 30 | |
---|
.. | .. |
---|
36 | 36 | wakeup-source; |
---|
37 | 37 | linux,code = <KEY_WPS_BUTTON>; |
---|
38 | 38 | label = "WPS"; |
---|
39 | | - /* Conflict with NAND flash */ |
---|
40 | | - gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; |
---|
| 39 | + /* Conflicts with TVC and extended flash */ |
---|
| 40 | + gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; |
---|
41 | 41 | }; |
---|
42 | 42 | |
---|
43 | 43 | button-setup { |
---|
.. | .. |
---|
143 | 143 | /* 16MB of flash */ |
---|
144 | 144 | reg = <0x30000000 0x01000000>; |
---|
145 | 145 | |
---|
146 | | - partition@0 { |
---|
147 | | - label = "BOOT"; |
---|
148 | | - reg = <0x00000000 0x00020000>; |
---|
149 | | - read-only; |
---|
150 | | - }; |
---|
151 | | - partition@120000 { |
---|
152 | | - label = "Kern"; |
---|
153 | | - reg = <0x00020000 0x00300000>; |
---|
154 | | - }; |
---|
155 | | - partition@320000 { |
---|
156 | | - label = "Ramdisk"; |
---|
157 | | - reg = <0x00320000 0x00600000>; |
---|
158 | | - }; |
---|
159 | | - partition@920000 { |
---|
160 | | - label = "Application"; |
---|
161 | | - reg = <0x00920000 0x00600000>; |
---|
162 | | - }; |
---|
163 | | - partition@f20000 { |
---|
164 | | - label = "VCTL"; |
---|
165 | | - reg = <0x00f20000 0x00020000>; |
---|
166 | | - read-only; |
---|
167 | | - }; |
---|
168 | | - partition@f40000 { |
---|
169 | | - label = "CurConf"; |
---|
170 | | - reg = <0x00f40000 0x000a0000>; |
---|
171 | | - read-only; |
---|
172 | | - }; |
---|
173 | | - partition@fe0000 { |
---|
174 | | - label = "FIS directory"; |
---|
175 | | - reg = <0x00fe0000 0x00020000>; |
---|
176 | | - read-only; |
---|
| 146 | + partitions { |
---|
| 147 | + compatible = "redboot-fis"; |
---|
| 148 | + /* Eraseblock at 0xfe0000 */ |
---|
| 149 | + fis-index-block = <0x1fc>; |
---|
177 | 150 | }; |
---|
178 | 151 | }; |
---|
179 | 152 | |
---|
180 | 153 | syscon: syscon@40000000 { |
---|
181 | 154 | pinctrl { |
---|
182 | 155 | /* |
---|
183 | | - * gpio0egrp cover line 16 used by HD LED |
---|
184 | | - * gpio0fgrp cover line 17, 18 used by wireless LED and reset button |
---|
185 | | - * gpio0hgrp cover line 21, 22 used by MDIO for Marvell PHY |
---|
186 | | - * gpio0kgrp cover line 31 used by USB LED |
---|
| 156 | + * gpio0agrp cover line 0, used by WPS button |
---|
| 157 | + * gpio0fgrp cover line 16 used by HD LED |
---|
| 158 | + * gpio0ggrp cover line 17, 18 used by wireless LAN LED and |
---|
| 159 | + * reset button OR USB ID select on 17 and USB VBUS select |
---|
| 160 | + * on 18. (Confusing.) |
---|
| 161 | + * gpio0igrp cover line 21, 22 used by MDIO for Marvell PHY |
---|
187 | 162 | */ |
---|
188 | 163 | gpio0_default_pins: pinctrl-gpio0 { |
---|
189 | 164 | mux { |
---|
190 | 165 | function = "gpio0"; |
---|
191 | | - groups = "gpio0egrp", |
---|
| 166 | + groups = "gpio0agrp", |
---|
192 | 167 | "gpio0fgrp", |
---|
193 | | - "gpio0hgrp"; |
---|
| 168 | + "gpio0ggrp", |
---|
| 169 | + "gpio0igrp"; |
---|
194 | 170 | }; |
---|
195 | 171 | }; |
---|
196 | 172 | /* |
---|
.. | .. |
---|
317 | 293 | }; |
---|
318 | 294 | }; |
---|
319 | 295 | |
---|
320 | | - ata@63000000 { |
---|
| 296 | + ide@63000000 { |
---|
321 | 297 | status = "okay"; |
---|
322 | 298 | }; |
---|
323 | 299 | |
---|
324 | | - ata@63400000 { |
---|
| 300 | + ide@63400000 { |
---|
| 301 | + status = "okay"; |
---|
| 302 | + }; |
---|
| 303 | + |
---|
| 304 | + usb@68000000 { |
---|
| 305 | + status = "okay"; |
---|
| 306 | + }; |
---|
| 307 | + |
---|
| 308 | + usb@69000000 { |
---|
325 | 309 | status = "okay"; |
---|
326 | 310 | }; |
---|
327 | 311 | }; |
---|