OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 /dts-v1/; 1 /dts-v1/;
2   2  
3 #include "ox820.dtsi" 3 #include "ox820.dtsi"
4   4  
5 #include <dt-bindings/input/input.h> 5 #include <dt-bindings/input/input.h>
6   6  
7 / { 7 / {
8 model = "Shuttle KD20"; 8 model = "Shuttle KD20";
9   9  
10 compatible = "shuttle,kd20", "oxsemi,ox820"; 10 compatible = "shuttle,kd20", "oxsemi,ox820";
11   11  
12 chosen { 12 chosen {
13 bootargs = "earlyprintk console=ttyS0,115200"; 13 bootargs = "earlyprintk";
14 stdout-path = "serial0:115200n8"; 14 stdout-path = "serial0:115200n8";
15 }; 15 };
16   16  
17 memory { 17 memory {
18 /* 256Mbytes DDR */ 18 /* 128Mbytes DDR */
19 reg = <0x60000000 0x10000000>; 19 reg = <0x60000000 0x8000000>;
20 }; 20 };
21   21  
22 aliases { 22 aliases {
23 serial0 = &uart0; 23 serial0 = &uart0;
24 gpio0 = &gpio0; 24 gpio0 = &gpio0;
25 gpio1 = &gpio1; 25 gpio1 = &gpio1;
26 }; 26 };
27   27  
28 i2c-gpio { 28 i2c-gpio {
29 compatible = "i2c-gpio"; 29 compatible = "i2c-gpio";
30 gpios = <&gpio1 9 0 &gpio1 10 0>; 30 gpios = <&gpio1 9 0 &gpio1 10 0>;
31 i2c-gpio,delay-us = <10>; 31 i2c-gpio,delay-us = <10>;
32 #address-cells = <1>; 32 #address-cells = <1>;
33 #size-cells = <0>; 33 #size-cells = <0>;
34 rtc0: rtc@51 { 34 rtc0: rtc@51 {
35 compatible = "nxp,pcf8563"; 35 compatible = "nxp,pcf8563";
36 reg = <0x51>; 36 reg = <0x51>;
37 }; 37 };
38 }; 38 };
39   39  
40 keys { 40 gpio-keys-polled {
41 compatible = "gpio-keys-polled"; 41 compatible = "gpio-keys-polled";
42 #address-cells = <1>; 42 #address-cells = <1>;
43 #size-cells = <0>; 43 #size-cells = <0>;
44 poll-interval = <100>; 44 poll-interval = <100>;
45   45  
46 power { 46 power {
47 label = "power"; 47 label = "power";
48 gpios = <&gpio0 10 1>; 48 gpios = <&gpio0 10 1>;
49 linux,code = <KEY_POWER>; 49 linux,code = <KEY_POWER>;
50 }; 50 };
51 reset { 51 reset {
52 label = "reset"; 52 label = "reset";
53 gpios = <&gpio0 11 1>; 53 gpios = <&gpio0 11 1>;
54 linux,code = <KEY_RESTART>; 54 linux,code = <KEY_RESTART>;
55 }; 55 };
56 eject1 { 56 eject1 {
57 label = "eject1"; 57 label = "eject1";
58 gpios = <&gpio0 5 1>; 58 gpios = <&gpio0 5 1>;
59 linux,code = <KEY_EJECTCD>; 59 linux,code = <KEY_EJECTCD>;
60 }; 60 };
61 eject2 { 61 eject2 {
62 label = "eject2"; 62 label = "eject2";
63 gpios = <&gpio0 6 1>; 63 gpios = <&gpio0 6 1>;
64 linux,code = <162>; 64 linux,code = <162>;
65 }; 65 };
66 }; 66 };
67   67  
68 leds { 68 gpio-leds {
69 compatible = "gpio-leds"; 69 compatible = "gpio-leds";
70 status { 70 status {
71 label = "kd20:blue:status"; 71 label = "kd20:blue:status";
72 gpios = <&gpio1 16 0>; 72 gpios = <&gpio1 16 0>;
73 }; 73 };
74 status2 { 74 status2 {
75 label = "kd20:red:status"; 75 label = "kd20:red:status";
76 gpios = <&gpio1 17 0>; 76 gpios = <&gpio1 17 0>;
77 }; 77 };
78 hdd1blue { 78 hdd1blue {
79 label = "kd20:blue:hdd1"; 79 label = "kd20:blue:hdd1";
80 gpios = <&gpio0 27 0>; 80 gpios = <&gpio0 27 0>;
81 linux,default-trigger = "ata1"; 81 linux,default-trigger = "ata1";
82 }; 82 };
83 hdd1red { 83 hdd1red {
84 label = "kd20:red:hdd1"; 84 label = "kd20:red:hdd1";
85 gpios = <&gpio1 4 0>; 85 gpios = <&gpio1 4 0>;
86 }; 86 };
87 hdd2blue { 87 hdd2blue {
88 label = "kd20:blue:hdd2"; 88 label = "kd20:blue:hdd2";
89 gpios = <&gpio1 6 0>; 89 gpios = <&gpio1 6 0>;
90 linux,default-trigger = "ata2"; 90 linux,default-trigger = "ata2";
91 }; 91 };
92 hdd2red { 92 hdd2red {
93 label = "kd20:red:hdd2"; 93 label = "kd20:red:hdd2";
94 gpios = <&gpio1 7 0>; 94 gpios = <&gpio1 7 0>;
95 }; 95 };
96 usb { 96 usb {
97 label = "kd20:blue:usb"; 97 label = "kd20:blue:usb";
98 gpios = <&gpio1 8 0>; 98 gpios = <&gpio1 8 0>;
99 trigger-sources = <&ehci_port1>, <&ehci_port2>; -  
100 linux,default-trigger = "usbport"; -  
101 }; 99 };
102 }; 100 };
103   101  
104 beeper: beeper { 102 beeper: beeper {
105 compatible = "gpio-beeper"; 103 compatible = "gpio-beeper";
106 gpios = <&gpio1 11 0>; 104 gpios = <&gpio1 11 0>;
107 }; 105 };
108   106  
109 gpio-fan { 107 gpio-fan {
110 compatible = "gpio-fan"; 108 compatible = "gpio-fan";
111 gpios = <&gpio0 2 1>; 109 gpios = <&gpio0 2 1>;
112 gpio-fan,speed-map = <0 0 110 gpio-fan,speed-map = <0 0
113 3000 1>; 111 3000 1>;
114 }; 112 };
115   113  
116 gpio-poweroff { 114 gpio-poweroff {
117 compatible = "gpio-poweroff"; 115 compatible = "gpio-poweroff";
118 gpios = <&gpio0 9 0>; 116 gpios = <&gpio0 9 0>;
119 }; 117 };
120 }; 118 };
121   119  
122 &uart0 { 120 &uart0 {
123 status = "okay"; 121 status = "okay";
124   122  
125 pinctrl-names = "default"; 123 pinctrl-names = "default";
126 pinctrl-0 = <&pinctrl_uart0>; 124 pinctrl-0 = <&pinctrl_uart0>;
127 }; 125 };
128   126  
129 &nandc { 127 &nandc {
130 status = "okay"; 128 status = "okay";
131   129  
132 pinctrl-names = "default"; 130 pinctrl-names = "default";
133 pinctrl-0 = <&pinctrl_nand>; 131 pinctrl-0 = <&pinctrl_nand>;
134   132  
135 nand@0 { 133 nand@0 {
136 reg = <0>; 134 reg = <0>;
137 #address-cells = <1>; 135 #address-cells = <1>;
138 #size-cells = <1>; 136 #size-cells = <1>;
139 nand-ecc-mode = "soft"; 137 nand-ecc-mode = "soft";
140 nand-ecc-algo = "hamming"; 138 nand-ecc-algo = "hamming";
141   139  
142 partition@0 { 140 partition@0 {
143 label = "stage1"; 141 label = "stage1";
144 reg = <0x00000000 0x00040000>; 142 reg = <0x00000000 0x00040000>;
145 read-only; 143 read-only;
146 }; 144 };
147   145  
148 partition@40000 { 146 partition@40000 {
149 label = "uboot"; 147 label = "u-boot";
150 reg = <0x00040000 0x001e0000>; 148 reg = <0x00040000 0x00200000>;
151 read-only; 149 read-only;
152 }; 150 };
153   -  
154 partition@220000 { -  
155 label = "uboot_env"; -  
156 reg = <0x00220000 0x00020000>; -  
157 }; -  
158   151  
159 partition@240000 { 152 partition@240000 {
160 label = "initrd"; 153 label = "initrd";
161 reg = <0x00240000 0x00600000>; 154 reg = <0x00240000 0x00600000>;
162 }; 155 };
163   156  
164 partition@840000 { 157 partition@840000 {
165 label = "kernel"; 158 label = "kernel";
166 reg = <0x00840000 0x007C0000>; 159 reg = <0x00840000 0x007C0000>;
167 }; 160 };
168   161  
169 partition@e00000 { 162 partition@e00000 {
170 label = "ubi"; 163 label = "ubi";
171 reg = <0x01000000 0x07000000>; 164 reg = <0x01000000 0x07000000>;
172 }; 165 };
173 }; 166 };
174 }; 167 };
175   168  
176 &etha { 169 &etha {
177 status = "okay"; 170 status = "okay";
178   171  
179 pinctrl-names = "default"; 172 pinctrl-names = "default";
180 pinctrl-0 = <&pinctrl_etha_mdio>; 173 pinctrl-0 = <&pinctrl_etha_mdio>;
181 }; 174 };
182   175  
183 &ehci { 176 &ehci {
184 status = "okay"; 177 status = "okay";
185 }; 178 };
186   179  
187 &sata { 180 &sata {
188 status = "okay"; 181 status = "okay";
189 nr-ports = <2>; 182 nr-ports = <2>;
190 }; 183 };
191   184  
192 &pcie0 { 185 &pcie0 {
193 status = "okay"; 186 status = "okay";
194 }; 187 };
195   188