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 "rt2880.dtsi" 3 #include "rt2880.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 = "airlink101,ar670w", "ralink,rt2880-soc"; 9 compatible = "airlink101,ar670w", "ralink,rt2880-soc";
10 model = "Airlink101 AR670W"; 10 model = "Airlink101 AR670W";
11   -  
12 aliases { -  
13 led-boot = &led_power; -  
14 led-failsafe = &led_power; -  
15 led-running = &led_power; -  
16 led-upgrade = &led_power; -  
17 }; -  
18   11  
19 cfi@bdc00000 { 12 cfi@bdc00000 {
20 compatible = "cfi-flash"; 13 compatible = "cfi-flash";
21 reg = <0xbc400000 0x800000>; 14 reg = <0xbc400000 0x800000>;
22 bank-width = <2>; 15 bank-width = <2>;
-   16 #address-cells = <1>;
-   17 #size-cells = <1>;
-   18  
-   19 u-boot@0 {
-   20 reg = <0x0 0x30000>;
-   21 label = "u-boot";
-   22 read-only;
-   23 };
-   24  
-   25 factory: factory@30000 {
-   26 reg = <0x30000 0x10000>;
-   27 label = "factory";
-   28 read-only;
-   29 };
23   -  
24 partitions { -  
25 compatible = "fixed-partitions"; -  
26 #address-cells = <1>; -  
27 #size-cells = <1>; -  
28   -  
29 partition@0 { -  
30 reg = <0x0 0x30000>; -  
31 label = "u-boot"; -  
32 read-only; -  
33 }; -  
34   -  
35 factory: partition@30000 { -  
36 reg = <0x30000 0x10000>; -  
37 label = "factory"; -  
38 read-only; -  
39 }; -  
40   30  
41 partition@40000 { -  
42 compatible = "lzma"; 31 firmware@40000 {
43 reg = <0x40000 0x3c0000>; 32 reg = <0x40000 0x3c0000>;
44 label = "firmware"; -  
45 }; 33 label = "firmware";
46 }; 34 };
47 }; 35 };
48   36  
49 leds { 37 gpio-leds {
50 compatible = "gpio-leds"; 38 compatible = "gpio-leds";
51   39  
52 led_power: power { 40 status {
53 label = "ar670w:green:power"; 41 label = "ar670w:green:power";
54 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; 42 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
55 }; 43 };
56   44  
57 wpsblue { 45 wpsblue {
58 label = "ar670w:blue:wps"; 46 label = "ar670w:blue:wps";
59 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; 47 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
60 }; 48 };
61 }; 49 };
62   50  
63 keys { 51 gpio-keys-polled {
-   52 compatible = "gpio-keys-polled";
-   53 #address-cells = <1>;
64 compatible = "gpio-keys-polled"; 54 #size-cells = <0>;
65 poll-interval = <100>; 55 poll-interval = <100>;
66   56  
67 wps { 57 wps {
68 label = "wps"; 58 label = "wps";
69 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 59 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
70 linux,code = <KEY_WPS_BUTTON>; 60 linux,code = <KEY_WPS_BUTTON>;
71 }; 61 };
72   62  
73 reset { 63 reset {
74 label = "reset"; 64 label = "reset";
75 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; 65 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
76 linux,code = <KEY_RESTART>; 66 linux,code = <KEY_RESTART>;
77 }; 67 };
78 }; 68 };
79 }; 69 };
80   70  
81 &gpio0 { 71 &gpio0 {
82 status = "okay"; 72 status = "okay";
83 }; 73 };
84   74  
85 &pinctrl { 75 &pinctrl {
86 state_default: pinctrl0 { 76 state_default: pinctrl0 {
87 gpio { 77 gpio {
88 ralink,group = "i2c", "spi", "uartlite"; 78 ralink,group = "i2c", "spi", "uartlite";
89 ralink,function = "gpio"; 79 ralink,function = "gpio";
90 }; 80 };
91 }; 81 };
92 }; 82 };
93   83  
94 &ethernet { 84 &ethernet {
95 status = "okay"; 85 status = "okay";
96 mtd-mac-address = <&factory 0x2004>; 86 mtd-mac-address = <&factory 0x2004>;
97   87  
98 port@0 { 88 port@0 {
99 phy-handle = <&phy0>; 89 phy-handle = <&phy0>;
100 phy-mode = "mii"; 90 phy-mode = "mii";
101 }; 91 };
102   92  
103 mdio-bus { 93 mdio-bus {
104 status = "okay"; 94 status = "okay";
105   95  
106 phy0: ethernet-phy@0 { 96 phy0: ethernet-phy@0 {
107 phy-mode = "mii"; 97 phy-mode = "mii";
108 reg = <0>; 98 reg = <0>;
109 }; 99 };
110 }; 100 };
111 }; 101 };
112   102  
113 &wmac { 103 &wmac {
114 status = "okay"; 104 status = "okay";
115 ralink,mtd-eeprom = <&factory 0x2000>; 105 ralink,mtd-eeprom = <&factory 0x2000>;
116 }; 106 };
117   107