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 "mt7621.dtsi" 3 #include "mt7621.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 = "dlink,dir-860l-b1", "mediatek,mt7621-soc"; 9 compatible = "dlink,dir-860l-b1", "mediatek,mt7621-soc";
10 model = "D-Link DIR-860L B1"; 10 model = "D-Link DIR-860L B1";
11   -  
12 aliases { -  
13 led-boot = &led_power_green; -  
14 led-failsafe = &led_power_green; -  
15 led-running = &led_power_green; -  
16 led-upgrade = &led_power_green; -  
17 }; -  
18   11  
19 memory@0 { 12 memory@0 {
20 device_type = "memory"; 13 device_type = "memory";
21 reg = <0x0 0x8000000>; 14 reg = <0x0 0x8000000>;
22 }; 15 };
23   16  
24 chosen { 17 chosen {
25 bootargs = "console=ttyS0,57600"; 18 bootargs = "console=ttyS0,57600";
26 }; 19 };
27   20  
28 leds { 21 gpio-leds {
29 compatible = "gpio-leds"; 22 compatible = "gpio-leds";
30   23  
31 power { 24 power {
32 label = "dir-860l-b1:orange:power"; 25 label = "dir-860l-b1:orange:power";
33 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; 26 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
34 }; 27 };
35   28  
36 led_power_green: power2 { 29 power2 {
37 label = "dir-860l-b1:green:power"; 30 label = "dir-860l-b1:green:power";
38 gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; 31 gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
39 }; 32 };
40   33  
41 net { 34 net {
42 label = "dir-860l-b1:orange:net"; 35 label = "dir-860l-b1:orange:net";
43 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 36 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
44 }; 37 };
45   38  
46 net2 { 39 net2 {
47 label = "dir-860l-b1:green:net"; 40 label = "dir-860l-b1:green:net";
48 gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; 41 gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
49 }; 42 };
50 }; 43 };
51   44  
52 keys { 45 gpio-keys-polled {
-   46 compatible = "gpio-keys-polled";
-   47 #address-cells = <1>;
53 compatible = "gpio-keys-polled"; 48 #size-cells = <0>;
54 poll-interval = <20>; 49 poll-interval = <20>;
55   50  
56 reset { 51 reset {
57 label = "reset"; 52 label = "reset";
58 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; 53 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
59 linux,code = <KEY_RESTART>; 54 linux,code = <KEY_RESTART>;
60 }; 55 };
61   56  
62 wps { 57 wps {
63 label = "wps"; 58 label = "wps";
64 gpios = <&gpio0 18 GPIO_ACTIVE_LOW>; 59 gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
65 linux,code = <KEY_WPS_BUTTON>; 60 linux,code = <KEY_WPS_BUTTON>;
66 }; 61 };
67 }; 62 };
68 }; 63 };
69   64  
70 &spi0 { 65 &spi0 {
71 status = "okay"; 66 status = "okay";
72   67  
73 m25p80@0 { 68 m25p80@0 {
-   69 #address-cells = <1>;
-   70 #size-cells = <1>;
74 compatible = "jedec,spi-nor"; 71 compatible = "jedec,spi-nor";
75 reg = <0>; 72 reg = <0>;
76 spi-max-frequency = <10000000>; 73 spi-max-frequency = <10000000>;
-   74 m25p,chunked-io = <32>;
-   75  
-   76 partition@0 {
-   77 label = "u-boot";
-   78 reg = <0x0 0x30000>;
-   79 read-only;
-   80 };
-   81  
-   82 partition@30000 {
-   83 label = "u-boot-env";
-   84 reg = <0x30000 0x4000>;
-   85 read-only;
-   86 };
-   87  
-   88 radio: partition@34000 {
-   89 label = "radio";
-   90 reg = <0x34000 0x4000>;
-   91 read-only;
-   92 };
77   -  
78 partitions { -  
79 compatible = "fixed-partitions"; -  
80 #address-cells = <1>; -  
81 #size-cells = <1>; -  
82   -  
83 partition@0 { -  
84 label = "u-boot"; -  
85 reg = <0x0 0x30000>; -  
86 read-only; -  
87 }; -  
88   -  
89 partition@30000 { -  
90 label = "u-boot-env"; -  
91 reg = <0x30000 0x4000>; -  
92 read-only; -  
93 }; -  
94   -  
95 radio: partition@34000 { -  
96 label = "radio"; -  
97 reg = <0x34000 0x4000>; -  
98 read-only; -  
99 }; -  
100   93  
101 factory: partition@38000 { 94 factory: partition@38000 {
102 label = "factory"; 95 label = "factory";
103 reg = <0x38000 0x8000>; 96 reg = <0x38000 0x8000>;
104 read-only; 97 read-only;
105 }; 98 };
106   99  
107 partition@40000 { 100 partition@40000 {
108 label = "defaults"; 101 label = "defaults";
109 reg = <0x40000 0x10000>; 102 reg = <0x40000 0x10000>;
110 read-only; 103 read-only;
111 }; 104 };
112   105  
113 partition@50000 { -  
114 compatible = "seama"; 106 partition@50000 {
115 label = "firmware"; 107 label = "firmware";
116 reg = <0x50000 0xfb0000>; -  
117 }; 108 reg = <0x50000 0xfb0000>;
118 }; 109 };
119 }; 110 };
120 }; 111 };
121   112  
122 &pcie { 113 &pcie {
123 status = "okay"; 114 status = "okay";
124 }; -  
125   115  
126 &pcie0 { 116 pcie0 {
127 mt76@0,0 { 117 mt76@0,0 {
-   118 reg = <0x0000 0 0 0 0>;
128 reg = <0x0000 0 0 0 0>; 119 device_type = "pci";
129 mediatek,mtd-eeprom = <&radio 0x2000>; 120 mediatek,mtd-eeprom = <&radio 0x2000>;
-   121 ieee80211-freq-limit = <5000000 6000000>;
130 ieee80211-freq-limit = <5000000 6000000>; 122 };
131 }; -  
132 }; 123 };
133   124  
134 &pcie1 { 125 pcie1 {
-   126 mt76@1,0 {
135 mt76@0,0 { 127 reg = <0x0000 0 0 0 0>;
136 reg = <0x0000 0 0 0 0>; 128 device_type = "pci";
-   129 mediatek,mtd-eeprom = <&radio 0>;
137 mediatek,mtd-eeprom = <&radio 0>; 130 ieee80211-freq-limit = <2400000 2500000>;
138 ieee80211-freq-limit = <2400000 2500000>; 131 };
139 }; 132 };
140 }; 133 };
141   134  
142 &pinctrl { 135 &pinctrl {
143 state_default: pinctrl0 { 136 state_default: pinctrl0 {
144 gpio { 137 gpio {
145 ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; 138 ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
146 ralink,function = "gpio"; 139 ralink,function = "gpio";
147 }; 140 };
148 }; 141 };
149 }; 142 };
150   143