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 = "edimax,3g-6200n", "ralink,rt3050-soc"; 9 compatible = "edimax,3g-6200n", "ralink,rt3050-soc";
10 model = "Edimax 3g-6200n"; 10 model = "Edimax 3g-6200n";
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@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 };
-   37  
-   38 partition@3e0000 {
-   39 label = "cimage";
-   40 reg = <0x3e0000 0x20000>;
-   41 read-only;
-   42 };
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   -  
48 partition@3e0000 { -  
49 label = "cimage"; -  
50 reg = <0x3e0000 0x20000>; -  
51 read-only; -  
52 }; -  
53   43  
54 partition@50000 { -  
55 compatible = "edimax,uimage"; 44 partition@50000 {
56 label = "firmware"; 45 label = "firmware";
57 reg = <0x50000 0x390000>; -  
58 }; 46 reg = <0x50000 0x390000>;
59 }; 47 };
60 }; 48 };
61   49  
62 leds { 50 gpio-leds {
63 compatible = "gpio-leds"; 51 compatible = "gpio-leds";
64   52  
65 led_power: power { 53 power {
66 label = "3g-6200n:green:power"; 54 label = "3g-6200n:green:power";
67 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; 55 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
68 }; 56 };
69   57  
70 wlan { 58 wlan {
71 label = "3g-6200n:amber:wlan"; 59 label = "3g-6200n:amber:wlan";
72 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 60 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
73 }; 61 };
74   62  
75 3g { 63 3g {
76 label = "3g-6200n:blue:3g"; 64 label = "3g-6200n:blue:3g";
77 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; 65 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
78 trigger-sources = <&otg_port1>; -  
79 linux,default-trigger = "usbport"; -  
80 }; 66 };
81 }; 67 };
82   68  
83 keys { 69 gpio-keys-polled {
-   70 compatible = "gpio-keys-polled";
-   71 #address-cells = <1>;
84 compatible = "gpio-keys-polled"; 72 #size-cells = <0>;
85 poll-interval = <20>; 73 poll-interval = <20>;
86   74  
87 reset { 75 reset {
88 label = "reset"; 76 label = "reset";
89 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 77 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
90 linux,code = <KEY_RESTART>; 78 linux,code = <KEY_RESTART>;
91 }; 79 };
92   80  
93 rfkill { 81 rfkill {
94 label = "wlanswitch"; 82 label = "wlanswitch";
95 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; 83 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
96 linux,code = <KEY_RFKILL>; 84 linux,code = <KEY_RFKILL>;
97 }; 85 };
98 }; 86 };
99 }; 87 };
100   88  
101 &pinctrl { 89 &pinctrl {
102 state_default: pinctrl0 { 90 state_default: pinctrl0 {
103 gpio { 91 gpio {
104 ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf"; 92 ralink,group = "spi", "i2c", "jtag", "rgmii", "mdio", "uartf";
105 ralink,function = "gpio"; 93 ralink,function = "gpio";
106 }; 94 };
107 }; 95 };
108 }; 96 };
109   97  
110 &ethernet { 98 &ethernet {
111 mtd-mac-address = <&factory 0x4>; 99 mtd-mac-address = <&factory 0x4>;
112 }; 100 };
113   101  
114 &esw { 102 &esw {
115 mediatek,portmap = <0x2f>; 103 mediatek,portmap = <0x2f>;
116 }; 104 };
117   105  
118 &wmac { 106 &wmac {
119 ralink,mtd-eeprom = <&factory 0>; 107 ralink,mtd-eeprom = <&factory 0>;
120 }; 108 };
121   109  
122 &otg { 110 &otg {
123 status = "okay"; 111 status = "okay";
124 }; 112 };
125   113