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 = "buffalo,whr-g300n", "ralink,rt3052-soc"; 9 compatible = "buffalo,whr-g300n", "ralink,rt3052-soc";
10 model = "Buffalo WHR-G300N"; 10 model = "Buffalo WHR-G300N";
11   -  
12 aliases { -  
13 led-boot = &led_diag; -  
14 led-failsafe = &led_diag; -  
15 led-upgrade = &led_diag; -  
16 }; -  
17   11  
18 cfi@1f000000 { 12 cfi@1f000000 {
19 compatible = "cfi-flash"; 13 compatible = "cfi-flash";
20 reg = <0x1f000000 0x800000>; 14 reg = <0x1f000000 0x800000>;
21 bank-width = <2>; 15 bank-width = <2>;
22 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 };
-   37  
-   38 partition@50000 {
-   39 label = "firmware";
-   40 reg = <0x50000 0x3a0000>;
-   41 };
23   -  
24 partitions { -  
25 compatible = "fixed-partitions"; -  
26 #address-cells = <1>; -  
27 #size-cells = <1>; -  
28   -  
29 partition@0 { -  
30 label = "u-boot"; -  
31 reg = <0x0 0x30000>; -  
32 read-only; -  
33 }; -  
34   -  
35 partition@30000 { -  
36 label = "u-boot-env"; -  
37 reg = <0x30000 0x10000>; -  
38 read-only; -  
39 }; -  
40   -  
41 factory: partition@40000 { -  
42 label = "factory"; -  
43 reg = <0x40000 0x10000>; -  
44 read-only; -  
45 }; -  
46   -  
47 partition@50000 { -  
48 compatible = "denx,uimage"; -  
49 label = "firmware"; -  
50 reg = <0x50000 0x3a0000>; -  
51 }; -  
52   42  
53 partition@3f0000 { 43 partition@3f0000 {
54 label = "user"; 44 label = "user";
55 reg = <0x3f0000 0x10000>; 45 reg = <0x3f0000 0x10000>;
56 read-only; -  
57 }; 46 read-only;
58 }; 47 };
59 }; 48 };
60   49  
61 leds { 50 gpio-leds {
62 compatible = "gpio-leds"; 51 compatible = "gpio-leds";
63   52  
64 led_diag: diag { 53 diag {
65 label = "whr-g300n:red:diag"; 54 label = "whr-g300n:red:diag";
66 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; 55 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
67 }; 56 };
68   57  
69 router { 58 router {
70 label = "whr-g300n:green:router"; 59 label = "whr-g300n:green:router";
71 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; 60 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
72 }; 61 };
73   62  
74 security { 63 security {
75 label = "whr-g300n:amber:security"; 64 label = "whr-g300n:amber:security";
76 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 65 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
77 }; 66 };
78 }; 67 };
79   68  
80 keys { 69 gpio-keys-polled {
-   70 compatible = "gpio-keys-polled";
-   71 #address-cells = <1>;
81 compatible = "gpio-keys-polled"; 72 #size-cells = <0>;
82 poll-interval = <20>; 73 poll-interval = <20>;
83   74  
84 reset { 75 reset {
85 label = "reset"; 76 label = "reset";
86 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; 77 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
87 linux,code = <KEY_RESTART>; 78 linux,code = <KEY_RESTART>;
88 }; 79 };
89   80  
90 aoss { 81 aoss {
91 label = "aoss"; 82 label = "aoss";
92 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 83 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
93 linux,code = <KEY_WPS_BUTTON>; 84 linux,code = <KEY_WPS_BUTTON>;
94 }; 85 };
95   86  
96 router-off { 87 router-off {
97 label = "router-off"; 88 label = "router-off";
98 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; 89 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
99 linux,code = <BTN_2>; 90 linux,code = <BTN_2>;
100 }; 91 };
101   92  
102 router-on { 93 router-on {
103 label = "router-on"; 94 label = "router-on";
104 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; 95 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
105 linux,code = <BTN_3>; 96 linux,code = <BTN_3>;
106 }; 97 };
107 }; 98 };
108 }; 99 };
109   100  
110 &pinctrl { 101 &pinctrl {
111 state_default: pinctrl0 { 102 state_default: pinctrl0 {
112 gpio { 103 gpio {
113 ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; 104 ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
114 ralink,function = "gpio"; 105 ralink,function = "gpio";
115 }; 106 };
116 }; 107 };
117 }; 108 };
118   109  
119 &ethernet { 110 &ethernet {
120 mtd-mac-address = <&factory 0x4>; 111 mtd-mac-address = <&factory 0x4>;
121 }; 112 };
122   113  
123 &esw { 114 &esw {
124 mediatek,portmap = <0x2f>; 115 mediatek,portmap = <0x2f>;
125 }; 116 };
126   117  
127 &wmac { 118 &wmac {
128 ralink,mtd-eeprom = <&factory 0>; 119 ralink,mtd-eeprom = <&factory 0>;
129 }; 120 };
130   121