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 "rt3050.dtsi" 3 #include "rt3050.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 = "ralink,v22rw-2x2", "ralink,rt3052-soc"; 9 compatible = "ralink,v22rw-2x2", "ralink,rt3052-soc";
10 model = "Ralink AP-RT3052-V22RW-2X2"; 10 model = "Ralink AP-RT3052-V22RW-2X2";
11   -  
12 aliases { -  
13 led-boot = &led_security; -  
14 led-failsafe = &led_security; -  
15 led-running = &led_security; -  
16 led-upgrade = &led_security; -  
17 }; -  
18   11  
19 cfi@1f000000 { 12 cfi@1f000000 {
20 compatible = "cfi-flash"; 13 compatible = "cfi-flash";
21 reg = <0x1f000000 0x800000>; 14 reg = <0x1f000000 0x800000>;
22 bank-width = <2>; 15 bank-width = <2>;
23 device-width = <2>; 16 device-width = <2>;
-   17 #address-cells = <1>;
-   18 #size-cells = <1>;
-   19  
-   20 partition@0 {
-   21 label = "u-boot";
-   22 reg = <0x0 0x30000>;
-   23 read-only;
-   24 };
-   25  
-   26 partition@30000 {
-   27 label = "u-boot-env";
-   28 reg = <0x30000 0x10000>;
-   29 read-only;
-   30 };
-   31  
-   32 factory: partition@40000 {
-   33 label = "factory";
-   34 reg = <0x40000 0x10000>;
-   35 read-only;
-   36 };
24   -  
25 partitions { -  
26 compatible = "fixed-partitions"; -  
27 #address-cells = <1>; -  
28 #size-cells = <1>; -  
29   -  
30 partition@0 { -  
31 label = "u-boot"; -  
32 reg = <0x0 0x30000>; -  
33 read-only; -  
34 }; -  
35   -  
36 partition@30000 { -  
37 label = "u-boot-env"; -  
38 reg = <0x30000 0x10000>; -  
39 read-only; -  
40 }; -  
41   -  
42 factory: partition@40000 { -  
43 label = "factory"; -  
44 reg = <0x40000 0x10000>; -  
45 read-only; -  
46 }; -  
47   37  
48 partition@50000 { -  
49 compatible = "denx,uimage"; 38 partition@50000 {
50 label = "firmware"; 39 label = "firmware";
51 reg = <0x50000 0x3b0000>; -  
52 }; 40 reg = <0x50000 0x3b0000>;
53 }; 41 };
54 }; 42 };
55   43  
56 leds { 44 gpio-leds {
57 compatible = "gpio-leds"; 45 compatible = "gpio-leds";
58   46  
59 led_security: security { 47 security {
60 label = "v22rw-2x2:green:security"; 48 label = "v22rw-2x2:green:security";
61 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; 49 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
62 }; 50 };
63   51  
64 wps { 52 wps {
65 label = "v22rw-2x2:red:wps"; 53 label = "v22rw-2x2:red:wps";
66 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 54 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
67 }; 55 };
68 }; 56 };
69   57  
70 keys { 58 gpio-keys-polled {
-   59 compatible = "gpio-keys-polled";
-   60 #address-cells = <1>;
71 compatible = "gpio-keys-polled"; 61 #size-cells = <0>;
72 poll-interval = <20>; 62 poll-interval = <20>;
73   63  
74 reset { 64 reset {
75 label = "reset"; 65 label = "reset";
76 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; 66 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
77 linux,code = <KEY_RESTART>; 67 linux,code = <KEY_RESTART>;
78 }; 68 };
79   69  
80 wps { 70 wps {
81 label = "wps"; 71 label = "wps";
82 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 72 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
83 linux,code = <KEY_WPS_BUTTON>; 73 linux,code = <KEY_WPS_BUTTON>;
84 }; 74 };
85 }; 75 };
86 }; 76 };
87   77  
88 &pinctrl { 78 &pinctrl {
89 state_default: pinctrl0 { 79 state_default: pinctrl0 {
90 gpio { 80 gpio {
91 ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; 81 ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
92 ralink,function = "gpio"; 82 ralink,function = "gpio";
93 }; 83 };
94 }; 84 };
95 }; 85 };
96   86  
97 &esw { 87 &esw {
98 mediatek,portmap = <0x2f>; 88 mediatek,portmap = <0x2f>;
99 }; 89 };
100   90  
101 &wmac { 91 &wmac {
102 ralink,mtd-eeprom = <&factory 0>; 92 ralink,mtd-eeprom = <&factory 0>;
103 }; 93 };
104   94  
105 &otg { 95 &otg {
106 status = "okay"; 96 status = "okay";
107 }; 97 };
108   98