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 = "dlink,dir-620-a1", "ralink,rt3050-soc"; 9 compatible = "dlink,dir-620-a1", "ralink,rt3050-soc";
10 model = "D-Link DIR-620 A1"; 10 model = "D-Link DIR-620 A1";
11   -  
12 aliases { -  
13 led-boot = &led_status_green; -  
14 led-failsafe = &led_status_green; -  
15 led-running = &led_status_green; -  
16 led-upgrade = &led_status_green; -  
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 0x7b0000>; -  
52 }; 40 reg = <0x50000 0x7b0000>;
53 }; 41 };
54 }; 42 };
55   43  
56 keys { 44 gpio-keys-polled {
-   45 compatible = "gpio-keys-polled";
-   46 #address-cells = <1>;
57 compatible = "gpio-keys-polled"; 47 #size-cells = <0>;
58 poll-interval = <20>; 48 poll-interval = <20>;
59   49  
60 reset { 50 reset {
61 label = "reset"; 51 label = "reset";
62 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; 52 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
63 linux,code = <KEY_RESTART>; 53 linux,code = <KEY_RESTART>;
64 }; 54 };
65   55  
66 wps { 56 wps {
67 label = "wps"; 57 label = "wps";
68 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 58 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
69 linux,code = <KEY_WPS_BUTTON>; 59 linux,code = <KEY_WPS_BUTTON>;
70 }; 60 };
71 }; 61 };
72   62  
73 leds { 63 gpio-leds {
74 compatible = "gpio-leds"; 64 compatible = "gpio-leds";
75   65  
76 status { 66 status {
77 label = "dir-620-a1:amber:status"; 67 label = "dir-620-a1:amber:status";
78 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; 68 gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
79 }; 69 };
80   70  
81 led_status_green: status2 { 71 status2 {
82 label = "dir-620-a1:green:status"; 72 label = "dir-620-a1:green:status";
83 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; 73 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
84 }; 74 };
85   75  
86 wan { 76 wan {
87 label = "dir-620-a1:amber:wan"; 77 label = "dir-620-a1:amber:wan";
88 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 78 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
89 }; 79 };
90   80  
91 wan2 { 81 wan2 {
92 label = "dir-620-a1:green:wan"; 82 label = "dir-620-a1:green:wan";
93 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 83 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
94 }; 84 };
95   85  
96 wps { 86 wps {
97 label = "dir-620-a1:blue:wps"; 87 label = "dir-620-a1:blue:wps";
98 gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>; 88 gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
99 }; 89 };
100   90  
101 wps2 { 91 wps2 {
102 label = "dir-620-a1:amber:wps"; 92 label = "dir-620-a1:amber:wps";
103 gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; 93 gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
104 }; 94 };
105 }; 95 };
106 }; 96 };
107   97  
108 &pinctrl { 98 &pinctrl {
109 state_default: pinctrl0 { 99 state_default: pinctrl0 {
110 gpio { 100 gpio {
111 ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf"; 101 ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
112 ralink,function = "gpio"; 102 ralink,function = "gpio";
113 }; 103 };
114 }; 104 };
115 }; 105 };
116   106  
117 &ethernet { 107 &ethernet {
118 mtd-mac-address = <&factory 0x4>; 108 mtd-mac-address = <&factory 0x4>;
119 }; 109 };
120   110  
121 &esw { 111 &esw {
122 mediatek,portmap = <0x2f>; 112 mediatek,portmap = <0x2f>;
123 }; 113 };
124   114  
125 &wmac { 115 &wmac {
126 ralink,mtd-eeprom = <&factory 0>; 116 ralink,mtd-eeprom = <&factory 0>;
127 }; 117 };
128   118  
129 &otg { 119 &otg {
130 status = "okay"; 120 status = "okay";
131 }; 121 };
132   122