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 "mt7620a.dtsi" 3 #include "mt7620a.dtsi"
4   4  
5 #include <dt-bindings/gpio/gpio.h> 5 #include <dt-bindings/gpio/gpio.h>
6 #include <dt-bindings/input/input.h> 6 #include <dt-bindings/input/input.h>
7   7  
8 /{ 8 /{
9 compatible = "kimax,u25awf-h1","ralink,mt7620a-soc"; 9 compatible = "kimax,u25awf-h1","ralink,mt7620a-soc";
10 model = "Kimax U25AWF-H1"; 10 model = "Kimax U25AWF-H1";
11   -  
12 aliases { 11  
13 led-boot = &led_wifi; -  
14 led-failsafe = &led_wifi; -  
15 led-running = &led_wifi; -  
16 led-upgrade = &led_wifi; -  
17 }; -  
18   -  
19 keys { 12 gpio-keys-polled {
-   13 compatible = "gpio-keys-polled";
-   14 #address-cells = <1>;
20 compatible = "gpio-keys-polled"; 15 #size-cells = <0>;
21 poll-interval = <20>; 16 poll-interval = <20>;
22   17  
23 reset { 18 reset {
24 label = "reset"; 19 label = "reset";
25 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; 20 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
26 linux,code = <KEY_RESTART>; 21 linux,code = <KEY_RESTART>;
27 }; 22 };
28 }; 23 };
29   24  
30 leds { 25 gpio-leds {
31 compatible = "gpio-leds"; 26 compatible = "gpio-leds";
32   27  
33 led_wifi: wifi { 28 wifi {
34 label = "u25awf:red:wifi"; 29 label = "u25awf:red:wifi";
35 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 30 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
36 }; 31 };
37   32  
38 lan { 33 lan {
39 label = "u25awf:green:lan"; 34 label = "u25awf:green:lan";
40 gpios = <&gpio2 4 GPIO_ACTIVE_LOW>; 35 gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
41 }; 36 };
42 }; 37 };
43 }; 38 };
44   39  
45 &gpio2 { 40 &gpio2 {
46 status = "okay"; 41 status = "okay";
47 }; 42 };
48   43  
49 &gpio3 { 44 &gpio3 {
50 status = "okay"; 45 status = "okay";
51 }; 46 };
52   47  
53 &spi0 { 48 &spi0 {
54 status = "okay"; 49 status = "okay";
55   50  
56 m25p80@0 { 51 m25p80@0 {
-   52 #address-cells = <1>;
-   53 #size-cells = <1>;
57 compatible = "jedec,spi-nor"; 54 compatible = "jedec,spi-nor";
58 reg = <0>; 55 reg = <0>;
59 spi-max-frequency = <10000000>; 56 spi-max-frequency = <10000000>;
60   -  
61 partitions { -  
62 compatible = "fixed-partitions"; -  
63 #address-cells = <1>; -  
64 #size-cells = <1>; -  
65   57  
66 partition@0 { 58 partition@0 {
67 label = "u-boot"; 59 label = "u-boot";
68 reg = <0x0 0x30000>; 60 reg = <0x0 0x30000>;
69 read-only; 61 read-only;
70 }; 62 };
71   63  
72 partition@30000 { 64 partition@30000 {
73 label = "u-boot-env"; 65 label = "u-boot-env";
74 reg = <0x30000 0x10000>; 66 reg = <0x30000 0x10000>;
75 read-only; 67 read-only;
76 }; 68 };
77   69  
78 factory: partition@40000 { 70 factory: partition@40000 {
79 label = "factory"; 71 label = "factory";
80 reg = <0x40000 0x10000>; 72 reg = <0x40000 0x10000>;
81 read-only; 73 read-only;
82 }; 74 };
83   75  
84 partition@50000 { -  
85 compatible = "denx,uimage"; 76 partition@50000 {
86 label = "firmware"; 77 label = "firmware";
87 reg = <0x50000 0xfb0000>; -  
88 }; 78 reg = <0x50000 0xfb0000>;
89 }; 79 };
90 }; 80 };
91 }; 81 };
92   82  
93 &ehci { 83 &ehci {
94 status = "okay"; 84 status = "okay";
95 }; 85 };
96   86  
97 &ohci { 87 &ohci {
98 status = "okay"; 88 status = "okay";
99 }; 89 };
100   90  
101 &ethernet { 91 &ethernet {
102 mtd-mac-address = <&factory 0x4>; 92 mtd-mac-address = <&factory 0x4>;
103 }; 93 };
104   94  
105 &wmac { 95 &wmac {
106 ralink,mtd-eeprom = <&factory 0>; 96 ralink,mtd-eeprom = <&factory 0>;
107 }; 97 };
108   98  
109 &pinctrl { 99 &pinctrl {
110 state_default: pinctrl0 { 100 state_default: pinctrl0 {
111 default { 101 default {
112 ralink,group = "uartf", "ephy", "wled"; 102 ralink,group = "uartf", "ephy", "wled";
113 ralink,function = "gpio"; 103 ralink,function = "gpio";
114 }; 104 };
115 }; 105 };
116 }; 106 };
117   107