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 "mt7620n.dtsi" 3 #include "mt7620n.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 = "elecom,wrh-300cr", "ralink,mt7620n-soc"; 9 compatible = "elecom,wrh-300cr", "ralink,mt7620n-soc";
10 model = "ELECOM WRH-300CR"; 10 model = "ELECOM WRH-300CR";
11   -  
12 aliases { -  
13 led-boot = &led_wps; -  
14 led-failsafe = &led_wps; -  
15 led-running = &led_wps; -  
16 led-upgrade = &led_wps; -  
17 }; -  
18   11  
19 leds { 12 gpio-leds {
20 compatible = "gpio-leds"; 13 compatible = "gpio-leds";
21   14  
22 led_wps: wps { 15 wps {
23 label = "wrh-300cr:green:wps"; 16 label = "wrh-300cr:green:wps";
24 gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; 17 gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
25 }; 18 };
26   19  
27 ethernet { 20 ethernet {
28 label = "wrh-300cr:green:ethernet"; 21 label = "wrh-300cr:green:ethernet";
29 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>; 22 gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
30 }; 23 };
31   24  
32 wlan { 25 wlan {
33 label = "wrh-300cr:green:wlan"; 26 label = "wrh-300cr:green:wlan";
34 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 27 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
35 }; 28 };
36 }; 29 };
37   30  
38 keys { 31 gpio-keys-polled {
-   32 compatible = "gpio-keys-polled";
-   33 #address-cells = <1>;
39 compatible = "gpio-keys-polled"; 34 #size-cells = <0>;
40 poll-interval = <20>; 35 poll-interval = <20>;
41   36  
42 reset { 37 reset {
43 label = "reset"; 38 label = "reset";
44 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; 39 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
45 linux,code = <KEY_RESTART>; 40 linux,code = <KEY_RESTART>;
46 }; 41 };
47   42  
48 wps { 43 wps {
49 label = "wps"; 44 label = "wps";
50 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; 45 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
51 linux,code = <KEY_WPS_BUTTON>; 46 linux,code = <KEY_WPS_BUTTON>;
52 }; 47 };
53 }; 48 };
54 }; 49 };
55   50  
56 &gpio1 { 51 &gpio1 {
57 status = "okay"; 52 status = "okay";
58 }; 53 };
59   54  
60 &gpio2 { 55 &gpio2 {
61 status = "okay"; 56 status = "okay";
62 }; 57 };
63   58  
64 &gpio3 { 59 &gpio3 {
65 status = "okay"; 60 status = "okay";
66 }; 61 };
67   62  
68 &spi0 { 63 &spi0 {
69 status = "okay"; 64 status = "okay";
70   65  
71 m25p80@0 { 66 m25p80@0 {
-   67 #address-cells = <1>;
-   68 #size-cells = <1>;
72 compatible = "jedec,spi-nor"; 69 compatible = "jedec,spi-nor";
73 reg = <0>; 70 reg = <0>;
74 spi-max-frequency = <10000000>; 71 spi-max-frequency = <10000000>;
75   -  
76 partitions { -  
77 compatible = "fixed-partitions"; -  
78 #address-cells = <1>; -  
79 #size-cells = <1>; -  
80   72  
81 partition@0 { 73 partition@0 {
82 label = "u-boot"; 74 label = "u-boot";
83 reg = <0x0 0x30000>; 75 reg = <0x0 0x30000>;
84 read-only; 76 read-only;
85 }; 77 };
86   78  
87 partition@30000 { 79 partition@30000 {
88 label = "u-boot-env"; 80 label = "u-boot-env";
89 reg = <0x30000 0x10000>; 81 reg = <0x30000 0x10000>;
90 }; 82 };
91   83  
92 factory: partition@40000 { 84 factory: partition@40000 {
93 label = "factory"; 85 label = "factory";
94 reg = <0x40000 0x10000>; 86 reg = <0x40000 0x10000>;
95 read-only; 87 read-only;
96 }; 88 };
97   89  
98 partition@50000 { 90 partition@50000 {
99 label = "recover"; 91 label = "recover";
100 reg = <0x50000 0x1c0000>; 92 reg = <0x50000 0x1c0000>;
101 read-only; 93 read-only;
102 }; 94 };
103   95  
104 partition@210000 { -  
105 compatible = "denx,uimage"; 96 partition@210000 {
106 label = "firmware"; 97 label = "firmware";
107 reg = <0x210000 0xdf0000>; -  
108 }; 98 reg = <0x210000 0xdf0000>;
109 }; 99 };
110 }; 100 };
111 }; 101 };
112   102  
113 &ehci { 103 &ehci {
114 status = "okay"; 104 status = "okay";
115 }; 105 };
116   106  
117 &ohci { 107 &ohci {
118 status = "okay"; 108 status = "okay";
119 }; 109 };
120   110  
121 &ethernet { 111 &ethernet {
122 mtd-mac-address = <&factory 0x2e>; 112 mtd-mac-address = <&factory 0x2e>;
123 mediatek,portmap = "llllw"; 113 mediatek,portmap = "llllw";
124 }; 114 };
125   115  
126 &wmac { 116 &wmac {
127 ralink,mtd-eeprom = <&factory 0>; 117 ralink,mtd-eeprom = <&factory 0>;
128 }; 118 };
129   119  
130 &pinctrl { 120 &pinctrl {
131 state_default: pinctrl0 { 121 state_default: pinctrl0 {
132 default { 122 default {
133 ralink,group = "i2c", "ephy", "wled"; 123 ralink,group = "i2c", "ephy", "wled";
134 ralink,function = "gpio"; 124 ralink,function = "gpio";
135 }; 125 };
136 }; 126 };
137 }; 127 };
138   128