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 = "tenda,3g300m", "ralink,rt3052-soc"; 9 compatible = "tenda,3g300m", "ralink,rt3052-soc";
10 model = "Tenda 3G300M"; 10 model = "Tenda 3G300M";
11   -  
12 aliases { -  
13 led-boot = &led_ap; -  
14 led-failsafe = &led_ap; -  
15 led-running = &led_ap; -  
16 led-upgrade = &led_ap; -  
17 }; -  
18   11  
19 leds { 12 gpio-leds {
20 compatible = "gpio-leds"; 13 compatible = "gpio-leds";
21   14  
22 3grouter { 15 3grouter {
23 label = "3g300m:blue:3grouter"; 16 label = "3g300m:blue:3grouter";
24 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; 17 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
25 }; 18 };
26   19  
27 led_ap: ap { 20 ap {
28 label = "3g300m:blue:ap"; 21 label = "3g300m:blue:ap";
29 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 22 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
30 }; 23 };
31   24  
32 wisprouter { 25 wisprouter {
33 label = "3g300m:blue:wisprouter"; 26 label = "3g300m:blue:wisprouter";
34 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; 27 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
35 }; 28 };
36   29  
37 wirelessrouter { 30 wirelessrouter {
38 label = "3g300m:blue:wirelessrouter"; 31 label = "3g300m:blue:wirelessrouter";
39 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; 32 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
40 }; 33 };
41   34  
42 3g { 35 3g {
43 label = "3g300m:blue:3g"; 36 label = "3g300m:blue:3g";
44 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; 37 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
45 trigger-sources = <&otg_port1>; -  
46 linux,default-trigger = "usbport"; -  
47 }; 38 };
48   39  
49 wpsreset { 40 wpsreset {
50 label = "3g300m:blue:wpsreset"; 41 label = "3g300m:blue:wpsreset";
51 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 42 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
52 }; 43 };
53 }; 44 };
54   45  
55 keys { 46 gpio-keys-polled {
-   47 compatible = "gpio-keys-polled";
-   48 #address-cells = <1>;
56 compatible = "gpio-keys-polled"; 49 #size-cells = <0>;
57 poll-interval = <20>; 50 poll-interval = <20>;
58   51  
59 reset { 52 reset {
60 label = "reset"; 53 label = "reset";
61 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 54 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
62 linux,code = <KEY_RESTART>; 55 linux,code = <KEY_RESTART>;
63 }; 56 };
64   57  
65 mode { 58 mode {
66 label = "mode"; 59 label = "mode";
67 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; 60 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
68 linux,code = <BTN_0>; 61 linux,code = <BTN_0>;
69 }; 62 };
70 }; 63 };
71 }; 64 };
72   65  
73 &spi0 { 66 &spi0 {
74 status = "okay"; 67 status = "okay";
75   68  
76 m25p80@0 { 69 m25p80@0 {
-   70 #address-cells = <1>;
-   71 #size-cells = <1>;
77 compatible = "jedec,spi-nor"; 72 compatible = "jedec,spi-nor";
78 reg = <0>; 73 reg = <0>;
79 spi-max-frequency = <10000000>; 74 spi-max-frequency = <10000000>;
80   -  
81 partitions { -  
82 compatible = "fixed-partitions"; -  
83 #address-cells = <1>; -  
84 #size-cells = <1>; -  
85   75  
86 partition@0 { 76 partition@0 {
87 label = "u-boot"; 77 label = "u-boot";
88 reg = <0x0 0x30000>; 78 reg = <0x0 0x30000>;
89 read-only; 79 read-only;
90 }; 80 };
91   81  
92 partition@30000 { 82 partition@30000 {
93 label = "u-boot-env"; 83 label = "u-boot-env";
94 reg = <0x30000 0x10000>; 84 reg = <0x30000 0x10000>;
95 read-only; 85 read-only;
96 }; 86 };
97   87  
98 factory: partition@40000 { 88 factory: partition@40000 {
99 label = "factory"; 89 label = "factory";
100 reg = <0x40000 0x10000>; 90 reg = <0x40000 0x10000>;
101 read-only; 91 read-only;
102 }; 92 };
103   93  
104 partition@50000 { -  
105 compatible = "denx,uimage"; 94 partition@50000 {
106 label = "firmware"; 95 label = "firmware";
107 reg = <0x50000 0x3b0000>; -  
108 }; 96 reg = <0x50000 0x3b0000>;
109 }; 97 };
110 }; 98 };
111 }; 99 };
112   100  
113 &pinctrl { 101 &pinctrl {
114 state_default: pinctrl0 { 102 state_default: pinctrl0 {
115 gpio { 103 gpio {
116 ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; 104 ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
117 ralink,function = "gpio"; 105 ralink,function = "gpio";
118 }; 106 };
119 }; 107 };
120 }; 108 };
121   109  
122 &ethernet { 110 &ethernet {
123 mtd-mac-address = <&factory 0x4>; 111 mtd-mac-address = <&factory 0x4>;
124 }; 112 };
125   113  
126 &esw { 114 &esw {
127 mediatek,portmap = <0x2f>; 115 mediatek,portmap = <0x2f>;
128 }; 116 };
129   117  
130 &wmac { 118 &wmac {
131 ralink,mtd-eeprom = <&factory 0>; 119 ralink,mtd-eeprom = <&factory 0>;
132 }; 120 };
133   121  
134 &otg { 122 &otg {
135 status = "okay"; 123 status = "okay";
136 }; 124 };
137   125