~hc/RK356X_SDK_RELEASE.git

..	..	@@ -28,7 +28,7 @@
28	28	compatible = "gpio-keys";
29	29
30	30	button-setup {
31		- debounce-interval = <50>;
	31	+ debounce-interval = <100>;
32	32	wakeup-source;
33	33	linux,code = <KEY_SETUP>;
34	34	label = "factory reset";
..	..	@@ -41,14 +41,12 @@
41	41	compatible = "gpio-leds";
42	42	led-green-info {
43	43	label = "sq201:green:info";
44		- /* Conflict with parallel flash */
45	44	gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
46	45	default-state = "on";
47	46	linux,default-trigger = "heartbeat";
48	47	};
49	48	led-green-usb {
50	49	label = "sq201:green:usb";
51		- /* Conflict with parallel and NAND flash */
52	50	gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
53	51	default-state = "off";
54	52	linux,default-trigger = "usb-host";
..	..	@@ -126,15 +124,10 @@
126	124
127	125	soc {
128	126	flash@30000000 {
129		- /*
130		- * Flash access can be enabled, with the side effect
131		- * of disabling access to GPIO LED on GPIO0[20] which
132		- * reuse one of the parallel flash chip select lines.
133		- * Also the default firmware on the machine has the
134		- * problem that since it uses the flash, the two LEDS
135		- * on the right become numb.
136		- */
137		- /* status = "okay"; */
	127	+ status = "okay";
	128	+ pinctrl-names = "enabled", "disabled";
	129	+ pinctrl-0 = <&pflash_default_pins>;
	130	+ pinctrl-1 = <&pflash_disabled_pins>;
138	131	/* 16MB of flash */
139	132	reg = <0x30000000 0x01000000>;
140	133
..	..	@@ -157,9 +150,7 @@
157	150	mux {
158	151	function = "gpio0";
159	152	groups = "gpio0fgrp",
160		- "gpio0ggrp",
161		- "gpio0hgrp",
162		- "gpio0kgrp";
	153	+ "gpio0hgrp";
163	154	};
164	155	};
165	156	/*
..	..	@@ -170,6 +161,18 @@
170	161	mux {
171	162	function = "gpio1";
172	163	groups = "gpio1dgrp";
	164	+ };
	165	+ };
	166	+ /*
	167	+ * These GPIO groups will be mapped in over some
	168	+ * of the flash pins when the flash is not in
	169	+ * active use.
	170	+ */
	171	+ pflash_disabled_pins: pinctrl-pflash-disabled {
	172	+ mux {
	173	+ function = "gpio0";
	174	+ groups = "gpio0ggrp", "gpio0igrp", "gpio0jgrp",
	175	+ "gpio0kgrp";
173	176	};
174	177	};
175	178	pinctrl-gmii {
..	..	@@ -286,7 +289,15 @@
286	289	};
287	290	};
288	291
289		- ata@63000000 {
	292	+ ide@63000000 {
	293	+ status = "okay";
	294	+ };
	295	+
	296	+ usb@68000000 {
	297	+ status = "okay";
	298	+ };
	299	+
	300	+ usb@69000000 {
290	301	status = "okay";
291	302	};
292	303	};