hc
2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d
kernel/arch/arm/boot/dts/gemini-sl93512r.dts
....@@ -24,7 +24,7 @@
2424 };
2525
2626 chosen {
27
- bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";
27
+ bootargs = "console=ttyS0,19200n8 root=/dev/mtdblock3 rw rootfstype=squashfs,jffs2 rootwait";
2828 stdout-path = &uart0;
2929 };
3030
....@@ -36,8 +36,8 @@
3636 wakeup-source;
3737 linux,code = <KEY_WPS_BUTTON>;
3838 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>;
4141 };
4242
4343 button-setup {
....@@ -143,54 +143,30 @@
143143 /* 16MB of flash */
144144 reg = <0x30000000 0x01000000>;
145145
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>;
177150 };
178151 };
179152
180153 syscon: syscon@40000000 {
181154 pinctrl {
182155 /*
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
187162 */
188163 gpio0_default_pins: pinctrl-gpio0 {
189164 mux {
190165 function = "gpio0";
191
- groups = "gpio0egrp",
166
+ groups = "gpio0agrp",
192167 "gpio0fgrp",
193
- "gpio0hgrp";
168
+ "gpio0ggrp",
169
+ "gpio0igrp";
194170 };
195171 };
196172 /*
....@@ -317,11 +293,19 @@
317293 };
318294 };
319295
320
- ata@63000000 {
296
+ ide@63000000 {
321297 status = "okay";
322298 };
323299
324
- ata@63400000 {
300
+ ide@63400000 {
301
+ status = "okay";
302
+ };
303
+
304
+ usb@68000000 {
305
+ status = "okay";
306
+ };
307
+
308
+ usb@69000000 {
325309 status = "okay";
326310 };
327311 };