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 = "glinet,gl-mt300n", "ralink,mt7620a-soc"; 9 compatible = "glinet,gl-mt300n", "ralink,mt7620a-soc";
10 model = "GL-MT300N"; 10 model = "GL-MT300N";
11   11  
12 chosen { 12 chosen {
13 bootargs = "console=ttyS0,115200"; 13 bootargs = "console=ttyS0,115200";
14 }; 14 };
15   15  
16 leds { 16 gpio-leds {
17 compatible = "gpio-leds"; 17 compatible = "gpio-leds";
18   18  
19 wan { 19 wan {
20 label = "gl-mt300n:wan"; 20 label = "gl-mt300n:wan";
21 gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; 21 gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
22 }; 22 };
23   23  
24 lan { 24 lan {
25 label = "gl-mt300n:lan"; 25 label = "gl-mt300n:lan";
26 gpios = <&gpio2 1 GPIO_ACTIVE_LOW>; 26 gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
27 }; 27 };
28   28  
29 wlan { 29 wlan {
30 label = "gl-mt300n:wlan"; 30 label = "gl-mt300n:wlan";
31 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 31 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
32 }; 32 };
-   33  
33 }; 34 };
34   35  
35 keys { 36 gpio-keys-polled {
-   37 compatible = "gpio-keys-polled";
-   38 #address-cells = <1>;
36 compatible = "gpio-keys-polled"; 39 #size-cells = <0>;
37 poll-interval = <20>; 40 poll-interval = <20>;
38 reset { 41 reset {
39 label = "reset"; 42 label = "reset";
40 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; 43 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
41 linux,code = <KEY_RESTART>; 44 linux,code = <KEY_RESTART>;
42 }; 45 };
43   46  
44 BTN_0 { 47 BTN_0 {
45 label = "BTN_0"; 48 label = "BTN_0";
46 gpios = <&gpio2 2 GPIO_ACTIVE_LOW>; 49 gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
47 linux,code = <BTN_0>; 50 linux,code = <BTN_0>;
48 }; 51 };
49   52  
50 BTN_1 { 53 BTN_1 {
51 label = "BTN_1"; 54 label = "BTN_1";
52 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; 55 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
53 linux,code = <BTN_1>; 56 linux,code = <BTN_1>;
54 }; 57 };
55 }; 58 };
56 }; 59 };
57   60  
58 &gpio0 { 61 &gpio0 {
59 status = "okay"; 62 status = "okay";
60 }; 63 };
61   64  
62 &gpio1 { 65 &gpio1 {
63 status = "okay"; 66 status = "okay";
64 }; 67 };
65   68  
66 &gpio2 { 69 &gpio2 {
67 status = "okay"; 70 status = "okay";
68 }; 71 };
69   72
70 &gpio3 { 73 &gpio3 {
71 status = "okay"; 74 status = "okay";
72 }; 75 };
73   76  
74 &spi0 { 77 &spi0 {
75 status = "okay"; 78 status = "okay";
76   79  
77 m25p80@0 { 80 m25p80@0 {
-   81 #address-cells = <1>;
-   82 #size-cells = <1>;
78 compatible = "jedec,spi-nor"; 83 compatible = "jedec,spi-nor";
79 reg = <0>; 84 reg = <0>;
80 spi-max-frequency = <10000000>; 85 spi-max-frequency = <10000000>;
81   -  
82 partitions { -  
83 compatible = "fixed-partitions"; -  
84 #address-cells = <1>; -  
85 #size-cells = <1>; -  
86   86  
87 partition@0 { 87 partition@0 {
88 label = "u-boot"; 88 label = "u-boot";
89 reg = <0x0 0x30000>; 89 reg = <0x0 0x30000>;
90 }; 90 };
91   91  
92 partition@30000 { 92 partition@30000 {
93 label = "u-boot-env"; 93 label = "u-boot-env";
94 reg = <0x30000 0x10000>; 94 reg = <0x30000 0x10000>;
95 read-only; 95 read-only;
96 }; 96 };
97   97  
98 factory: partition@40000 { 98 factory: partition@40000 {
99 label = "factory"; 99 label = "factory";
100 reg = <0x40000 0x10000>; 100 reg = <0x40000 0x10000>;
101 read-only; 101 read-only;
102 }; 102 };
103   103  
104 partition@50000 { -  
105 compatible = "denx,uimage"; 104 partition@50000 {
106 label = "firmware"; 105 label = "firmware";
107 reg = <0x50000 0xf80000>; 106 reg = <0x50000 0xf80000>;
108 }; 107 };
109   108  
110 partition@ff0000 { 109 partition@ff0000 {
111 label = "art"; 110 label = "art";
112 reg = <0xff0000 0x10000>; -  
113 }; 111 reg = <0xff0000 0x10000>;
114 }; 112 };
115 }; 113 };
116 }; 114 };
117   115  
118 &ehci { 116 &ehci {
119 status = "okay"; 117 status = "okay";
120 }; 118 };
121   119  
122 &ohci { 120 &ohci {
123 status = "okay"; 121 status = "okay";
124 }; 122 };
125   123  
126 &ethernet { 124 &ethernet {
127 mtd-mac-address = <&factory 0x4000>; 125 mtd-mac-address = <&factory 0x4000>;
128 mediatek,portmap = "wllll"; 126 mediatek,portmap = "wllll";
129 }; 127 };
130   128  
131 &wmac { 129 &wmac {
132 ralink,mtd-eeprom = <&factory 0>; 130 ralink,mtd-eeprom = <&factory 0>;
133 }; 131 };
134   132  
135 &pinctrl { 133 &pinctrl {
136 state_default: pinctrl0 { 134 state_default: pinctrl0 {
137 gpio { 135 gpio {
138 ralink,group = "wled","ephy","i2c"; 136 ralink,group = "wled","ephy","i2c";
139 ralink,function = "gpio"; 137 ralink,function = "gpio";
140 }; 138 };
141 }; 139 };
142 }; 140 };
143   141