OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 40... Line 40...
40   40  
41 / { 41 / {
42 compatible = "sanlinking,d240", "ralink,mt7620a-soc"; 42 compatible = "sanlinking,d240", "ralink,mt7620a-soc";
Line 43... Line -...
43 model = "Sanlinking Technologies D240"; -  
44   -  
45 aliases { -  
46 led-boot = &led_power; -  
47 led-failsafe = &led_power; -  
48 led-running = &led_power; -  
49 led-upgrade = &led_power; -  
50 }; 43 model = "Sanlinking Technologies D240";
51   44  
52 chosen { 45 chosen {
Line 53... Line 46...
53 bootargs = "console=ttyS0,115200"; 46 bootargs = "console=ttyS0,115200";
Line 66... Line 59...
66 power_mpcie1 { 59 power_mpcie1 {
67 gpio-export,name = "power_mpcie1"; 60 gpio-export,name = "power_mpcie1";
68 gpio-export,output = <1>; 61 gpio-export,output = <1>;
69 gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>; 62 gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
70 }; 63 };
-   64  
71 }; 65 };
Line 72... Line 66...
72   66  
73 leds { 67 gpio-leds {
Line 74... Line 68...
74 compatible = "gpio-leds"; 68 compatible = "gpio-leds";
75   69  
76 led_power: power { 70 power {
77 label = "d240:blue:power"; 71 label = "d240:blue:power";
Line 78... Line 72...
78 gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; 72 gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
79 }; 73 };
80   74  
81 usb { -  
82 label = "d240:blue:usb"; -  
83 gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>; 75 usb {
Line 84... Line 76...
84 trigger-sources = <&ohci_port1>, <&ehci_port1>; 76 label = "d240:blue:usb";
85 linux,default-trigger = "usbport"; 77 gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
86 }; 78 };
87   79  
88 air { 80 air {
Line 89... Line 81...
89 label = "d240:blue:wifi"; 81 label = "d240:blue:wifi";
90 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 82 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
-   83 };
-   84 };
91 }; 85  
Line 92... Line 86...
92 }; 86 gpio-keys-polled {
93   87 compatible = "gpio-keys-polled";
94 keys { 88 #address-cells = <1>;
Line 117... Line 111...
117   111  
118 &spi0 { 112 &spi0 {
Line 119... Line 113...
119 status = "okay"; 113 status = "okay";
-   114  
-   115 en25q128@0 {
120   116 #address-cells = <1>;
121 en25q128@0 { 117 #size-cells = <1>;
122 compatible = "jedec,spi-nor"; 118 compatible = "jedec,spi-nor";
Line 123... Line -...
123 reg = <0>; -  
124 spi-max-frequency = <10000000>; -  
125   -  
126 partitions { -  
127 compatible = "fixed-partitions"; -  
128 #address-cells = <1>; 119 reg = <0>;
129 #size-cells = <1>; 120 spi-max-frequency = <10000000>;
130   121  
131 partition@0 { 122 partition@0 {
132 label = "u-boot"; 123 label = "u-boot";
133 reg = <0x0 0x30000>; 124 reg = <0x0 0x30000>;
134 read-only; 125 read-only;
135 }; 126 };
136   127  
137 partition@30000 { 128 partition@30000 {
138 label = "u-boot-env"; 129 label = "u-boot-env";
139 reg = <0x30000 0x10000>; 130 reg = <0x30000 0x10000>;
140 read-only; 131 read-only;
141 }; 132 };
142   133  
143 factory: partition@40000 { 134 factory: partition@40000 {
144 label = "factory"; 135 label = "factory";
145 reg = <0x40000 0x10000>; 136 reg = <0x40000 0x10000>;
146 read-only; 137 read-only;
147 }; -  
148   138 };
149 partition@50000 { 139  
150 compatible = "denx,uimage"; -  
151 label = "firmware"; 140 partition@50000 {
152 reg = <0x50000 0xfb0000>; 141 label = "firmware";
153 }; 142 reg = <0x50000 0xfb0000>;
Line 154... Line 143...
154 }; 143 };
155 }; 144 };
156 }; -  
157   -  
158 &sdhci { 145 };
Line 159... Line 146...
159 status = "okay"; 146  
160 /* the pins function is already set during pinmux driver load */ 147 &sdhci {
161 /delete-property/ pinctrl-0; 148 status = "okay";
Line 179... Line 166...
179 }; 166 };
Line 180... Line 167...
180   167  
181 &pinctrl { 168 &pinctrl {
182 state_default: pinctrl0 { 169 state_default: pinctrl0 {
183 default { 170 default {
184 ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa"; 171 ralink,group = "i2c", "uartf", "wled", "spi refclk", "pa", "nd_sd";
185 ralink,function = "gpio"; 172 ralink,function = "gpio";
186 }; -  
187   -  
188 /* -  
189 * The sd function of the nd_sd group configures two of the -  
190 * groups pins as gpios. The pins are used as PCIe reset/power. -  
191 * Due to the driver load order, the pins are configured way to -  
192 * late if triggered by the sd-card driver. -  
193 * To not introduce another kind of driver load order -  
194 * dependency and configure the pins as early as possible, -  
195 * means during pinmux driver load. -  
196 */ -  
197 gpio_sd { -  
198 ralink,group = "nd_sd"; -  
199 ralink,function = "sd"; -  
200 }; 173 };
201 }; 174 };
Line 202... Line 175...
202 }; 175 };
203   176