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 = "zbtlink,zbt-ape522ii", "ralink,mt7620a-soc"; 9 compatible = "zbtlink,zbt-ape522ii", "ralink,mt7620a-soc";
10 model = "ZBT-APE522II"; 10 model = "ZBT-APE522II";
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 sys1 { 19 sys1 {
20 label = "zbt-ape522ii:green:sys1"; 20 label = "zbt-ape522ii:green:sys1";
21 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; 21 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
22 }; 22 };
23   23  
24 sys2 { 24 sys2 {
25 label = "zbt-ape522ii:green:sys2"; 25 label = "zbt-ape522ii:green:sys2";
26 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 26 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
27 }; 27 };
28   28  
29 sys3 { 29 sys3 {
30 label = "zbt-ape522ii:green:sys3"; 30 label = "zbt-ape522ii:green:sys3";
31 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; 31 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
32 }; 32 };
33   33  
34 sys4 { 34 sys4 {
35 label = "zbt-ape522ii:green:sys4"; 35 label = "zbt-ape522ii:green:sys4";
36 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 36 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
37 }; 37 };
38   38  
39 wlan2g4 { 39 wlan2g4 {
40 label = "zbt-ape522ii:green:wlan2g4"; 40 label = "zbt-ape522ii:green:wlan2g4";
41 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 41 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
42 }; 42 };
43 }; 43 };
44   44  
45 keys { 45 gpio-keys-polled {
-   46 compatible = "gpio-keys-polled";
-   47 #address-cells = <1>;
46 compatible = "gpio-keys-polled"; 48 #size-cells = <0>;
47 poll-interval = <20>; 49 poll-interval = <20>;
48   50  
49 reset { 51 reset {
50 label = "reset"; 52 label = "reset";
51 gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; 53 gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
52 linux,code = <KEY_RESTART>; 54 linux,code = <KEY_RESTART>;
53 }; 55 };
54 }; 56 };
55 }; 57 };
56   58  
57 &gpio0 { 59 &gpio0 {
58 status = "okay"; 60 status = "okay";
59 }; 61 };
60   62  
61 &gpio1 { 63 &gpio1 {
62 status = "okay"; 64 status = "okay";
63 }; 65 };
64   66  
65 &gpio2 { 67 &gpio2 {
66 status = "okay"; 68 status = "okay";
67 }; 69 };
68   70  
69 &gpio3 { 71 &gpio3 {
70 status = "okay"; 72 status = "okay";
71 }; 73 };
72   74  
73 &spi0 { 75 &spi0 {
74 status = "okay"; 76 status = "okay";
75   77  
76 m25p80@0 { 78 m25p80@0 {
-   79 #address-cells = <1>;
-   80 #size-cells = <1>;
77 compatible = "jedec,spi-nor"; 81 compatible = "jedec,spi-nor";
78 reg = <0>; 82 reg = <0>;
79 spi-max-frequency = <10000000>; 83 spi-max-frequency = <10000000>;
80   -  
81 partitions { -  
82 compatible = "fixed-partitions"; -  
83 #address-cells = <1>; -  
84 #size-cells = <1>; -  
85   84  
86 partition@0 { 85 partition@0 {
87 label = "u-boot"; 86 label = "u-boot";
88 reg = <0x0 0x30000>; 87 reg = <0x0 0x30000>;
89 }; 88 };
90   89  
91 partition@30000 { 90 partition@30000 {
92 label = "u-boot-env"; 91 label = "u-boot-env";
93 reg = <0x30000 0x10000>; 92 reg = <0x30000 0x10000>;
94 read-only; 93 read-only;
95 }; 94 };
96   95  
97 factory: partition@40000 { 96 factory: partition@40000 {
98 label = "factory"; 97 label = "factory";
99 reg = <0x40000 0x10000>; 98 reg = <0x40000 0x10000>;
100 read-only; 99 read-only;
101 }; 100 };
102   101  
103 partition@50000 { -  
104 compatible = "denx,uimage"; 102 partition@50000 {
105 label = "firmware"; 103 label = "firmware";
106 reg = <0x50000 0xf80000>; -  
107 }; 104 reg = <0x50000 0xf80000>;
108 }; 105 };
109 }; 106 };
110 }; 107 };
111   108  
112 &ethernet { 109 &ethernet {
113 pinctrl-names = "default"; 110 pinctrl-names = "default";
114 pinctrl-0 = <&ephy_pins>; 111 pinctrl-0 = <&ephy_pins>;
115 mtd-mac-address = <&factory 0x4>; 112 mtd-mac-address = <&factory 0x4>;
116 mediatek,portmap = "wllll"; 113 mediatek,portmap = "wllll";
117 }; 114 };
118   115  
119 &wmac { 116 &wmac {
120 ralink,mtd-eeprom = <&factory 0>; 117 ralink,mtd-eeprom = <&factory 0>;
121 pinctrl-names = "default"; 118 pinctrl-names = "default";
122 pinctrl-0 = <&pa_pins>; 119 pinctrl-0 = <&pa_pins>;
123 }; 120 };
124   121  
125 &pcie { 122 &pcie {
126 status = "okay"; 123 status = "okay";
127 }; -  
128   124  
129 &pcie0 { 125 pcie-bridge {
130 mt76@0,0 { 126 mt76@0,0 {
-   127 reg = <0x0000 0 0 0 0>;
131 reg = <0x0000 0 0 0 0>; 128 device_type = "pci";
132 mediatek,mtd-eeprom = <&factory 0x8000>; 129 mediatek,mtd-eeprom = <&factory 0x8000>;
-   130 ieee80211-freq-limit = <5000000 6000000>;
133 ieee80211-freq-limit = <5000000 6000000>; 131 };
134 }; 132 };
135 }; 133 };
136   134  
137 &pinctrl { 135 &pinctrl {
138 state_default: pinctrl0 { 136 state_default: pinctrl0 {
139 gpio { 137 gpio {
140 ralink,group = "wled", "i2c", "uartf", "wdt"; 138 ralink,group = "wled", "i2c", "uartf", "wdt";
141 ralink,function = "gpio"; 139 ralink,function = "gpio";
142 }; 140 };
143 }; 141 };
144 }; 142 };
145   143