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 "mt7620n.dtsi" 3 #include "mt7620n.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 = "kingston,mlw221", "ralink,mt7620n-soc"; 9 compatible = "kingston,mlw221", "ralink,mt7620n-soc";
10 model = "Kingston MLW221"; 10 model = "Kingston MLW221";
11   -  
12 aliases { -  
13 led-boot = &led_system; -  
14 led-failsafe = &led_system; -  
15 led-running = &led_system; -  
16 led-upgrade = &led_system; -  
17 }; -  
18   11  
19 leds { 12 gpio-leds {
20 compatible = "gpio-leds"; 13 compatible = "gpio-leds";
21   14  
22 led_system: system { 15 system {
23 label = "mlw221:blue:system"; 16 label = "mlw221:blue:system";
24 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; 17 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
25 }; 18 };
26   19  
27 wifi { 20 wifi {
28 label = "mlw221:blue:wifi"; 21 label = "mlw221:blue:wifi";
29 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 22 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
30 }; 23 };
31 }; 24 };
32   25  
33 keys { 26 gpio-keys-polled {
-   27 compatible = "gpio-keys-polled";
-   28 #address-cells = <1>;
34 compatible = "gpio-keys-polled"; 29 #size-cells = <0>;
35 poll-interval = <20>; 30 poll-interval = <20>;
36   31  
37 reset { 32 reset {
38 label = "reset"; 33 label = "reset";
39 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; 34 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
40 linux,code = <KEY_RESTART>; 35 linux,code = <KEY_RESTART>;
41 }; 36 };
42   37  
43 system { 38 system {
44 label = "system"; 39 label = "system";
45 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; 40 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
46 linux,code = <KEY_RFKILL>; 41 linux,code = <KEY_RFKILL>;
47 }; 42 };
48 }; 43 };
49 }; 44 };
50   45  
51 &gpio0 { 46 &gpio0 {
52 status = "okay"; 47 status = "okay";
53 }; 48 };
54   49  
55 &gpio2 { 50 &gpio2 {
56 status = "okay"; 51 status = "okay";
57 }; 52 };
58   53  
59 &gpio3 { 54 &gpio3 {
60 status = "okay"; 55 status = "okay";
61 }; 56 };
62   57  
63 &spi0 { 58 &spi0 {
64 status = "okay"; 59 status = "okay";
65   60  
66 m25p80@0 { 61 m25p80@0 {
-   62 #address-cells = <1>;
-   63 #size-cells = <1>;
67 compatible = "jedec,spi-nor"; 64 compatible = "jedec,spi-nor";
68 reg = <0>; 65 reg = <0>;
69 spi-max-frequency = <10000000>; 66 spi-max-frequency = <10000000>;
70   -  
71 partitions { -  
72 compatible = "fixed-partitions"; -  
73 #address-cells = <1>; -  
74 #size-cells = <1>; -  
75   67  
76 partition@0 { 68 partition@0 {
77 label = "u-boot"; 69 label = "u-boot";
78 reg = <0x0 0x30000>; 70 reg = <0x0 0x30000>;
79 read-only; 71 read-only;
80 }; 72 };
81   73  
82 partition@30000 { 74 partition@30000 {
83 label = "u-boot-env"; 75 label = "u-boot-env";
84 reg = <0x30000 0x10000>; 76 reg = <0x30000 0x10000>;
85 read-only; 77 read-only;
86 }; 78 };
87   79  
88 factory: partition@40000 { 80 factory: partition@40000 {
89 label = "factory"; 81 label = "factory";
90 reg = <0x40000 0x10000>; 82 reg = <0x40000 0x10000>;
91 read-only; 83 read-only;
92 }; 84 };
93   85  
94 partition@50000 { -  
95 compatible = "denx,uimage"; 86 partition@50000 {
96 label = "firmware"; 87 label = "firmware";
97 reg = <0x50000 0xf60000>; 88 reg = <0x50000 0xf60000>;
98 }; 89 };
99   90  
100 partition@fb0000 { 91 partition@fb0000 {
101 label = "user-config"; 92 label = "user-config";
102 reg = <0xfb0000 0x50000>; -  
103 }; 93 reg = <0xfb0000 0x50000>;
104 }; 94 };
105 }; 95 };
106 }; 96 };
107   97  
108 &ehci { 98 &ehci {
109 status = "okay"; 99 status = "okay";
110 }; 100 };
111   101  
112 &ohci { 102 &ohci {
113 status = "okay"; 103 status = "okay";
114 }; 104 };
115   105  
116 &ethernet { 106 &ethernet {
117 mtd-mac-address = <&factory 0x4>; 107 mtd-mac-address = <&factory 0x4>;
118 mediatek,portmap = "wllll"; 108 mediatek,portmap = "wllll";
119 }; 109 };
120   110  
121 &wmac { 111 &wmac {
122 ralink,mtd-eeprom = <&factory 0>; 112 ralink,mtd-eeprom = <&factory 0>;
123 }; 113 };
124   114  
125 &pinctrl { 115 &pinctrl {
126 state_default: pinctrl0 { 116 state_default: pinctrl0 {
127 default { 117 default {
128 ralink,group = "i2c", "ephy", "wled"; 118 ralink,group = "i2c", "ephy", "wled";
129 ralink,function = "gpio"; 119 ralink,function = "gpio";
130 }; 120 };
131 }; 121 };
132 }; 122 };
133   123