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 = "zyxel,keenetic-omni-ii", "ralink,mt7620n-soc"; 9 compatible = "zyxel,keenetic-omni-ii", "ralink,mt7620n-soc";
10 model = "ZyXEL Keenetic Omni II"; 10 model = "ZyXEL Keenetic Omni II";
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 leds { 12 gpio-leds {
20 compatible = "gpio-leds"; 13 compatible = "gpio-leds";
21   14  
22 wan { 15 wan {
23 label = "kn_rc:green:wan"; 16 label = "kn_rc:green:wan";
24 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 17 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
25 }; 18 };
26   19  
27 usb { 20 usb {
28 label = "kn_rc:green:usb"; 21 label = "kn_rc:green:usb";
29 gpios = <&gpio0 20 GPIO_ACTIVE_LOW>; 22 gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
30 trigger-sources = <&ohci_port1>, <&ehci_port1>; -  
31 linux,default-trigger = "usbport"; -  
32 }; 23 };
33   24  
34 wifi { 25 wifi {
35 label = "kn_rc:green:wifi"; 26 label = "kn_rc:green:wifi";
36 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; 27 gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
37 }; 28 };
38   29  
39 led_power: power { 30 power {
40 label = "kn_rc:green:power"; 31 label = "kn_rc:green:power";
41 gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 32 gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
42 }; 33 };
43 }; 34 };
44   35  
45 keys { 36 gpio-keys-polled {
-   37 compatible = "gpio-keys";
-   38 #address-cells = <1>;
46 compatible = "gpio-keys"; 39 #size-cells = <0>;
47 poll-interval = <20>; 40 poll-interval = <20>;
48   41  
49 reset { 42 reset {
50 label = "reset"; 43 label = "reset";
51 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; 44 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
52 linux,code = <KEY_RESTART>; 45 linux,code = <KEY_RESTART>;
53 }; 46 };
54   47  
55 wps { 48 wps {
56 label = "wps"; 49 label = "wps";
57 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; 50 gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
58 linux,code = <KEY_WPS_BUTTON>; 51 linux,code = <KEY_WPS_BUTTON>;
59 }; 52 };
60   53  
61 fn { 54 fn {
62 label = "fn"; 55 label = "fn";
63 gpios = <&gpio0 17 GPIO_ACTIVE_LOW>; 56 gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
64 linux,code = <BTN_0>; 57 linux,code = <BTN_0>;
65 }; 58 };
66 }; 59 };
67   60  
68 gpio_export { 61 gpio_export {
69 compatible = "gpio-export"; 62 compatible = "gpio-export";
70 #size-cells = <0>; 63 #size-cells = <0>;
71   64  
72 usb_power { 65 usb_power {
73 gpio-export,name = "usb"; 66 gpio-export,name = "usb";
74 gpio-export,output = <1>; 67 gpio-export,output = <1>;
75 gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; 68 gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
76 }; 69 };
77 }; 70 };
78 }; 71 };
79   72  
80 &gpio1 { 73 &gpio1 {
81 status = "okay"; 74 status = "okay";
82 }; 75 };
83   76  
84 &gpio3 { 77 &gpio3 {
85 status = "okay"; 78 status = "okay";
86 }; 79 };
87   80  
88 &spi0 { 81 &spi0 {
89 status = "okay"; 82 status = "okay";
90   83  
91 m25p80@0 { 84 m25p80@0 {
-   85 #address-cells = <1>;
-   86 #size-cells = <1>;
92 compatible = "jedec,spi-nor"; 87 compatible = "jedec,spi-nor";
93 reg = <0>; 88 reg = <0>;
94 spi-max-frequency = <10000000>; 89 spi-max-frequency = <10000000>;
95   -  
96 partitions { -  
97 compatible = "fixed-partitions"; -  
98 #address-cells = <1>; -  
99 #size-cells = <1>; -  
100   90  
101 partition@0 { 91 partition@0 {
102 label = "u-boot"; 92 label = "u-boot";
103 reg = <0x0 0x30000>; 93 reg = <0x0 0x30000>;
104 read-only; 94 read-only;
105 }; 95 };
106   96  
107 partition@30000 { 97 partition@30000 {
108 label = "u-boot-env"; 98 label = "u-boot-env";
109 reg = <0x30000 0x10000>; 99 reg = <0x30000 0x10000>;
110 read-only; 100 read-only;
111 }; 101 };
112   102  
113 factory: partition@40000 { 103 factory: partition@40000 {
114 label = "factory"; 104 label = "factory";
115 reg = <0x40000 0x10000>; 105 reg = <0x40000 0x10000>;
116 read-only; 106 read-only;
117 }; 107 };
118   108  
119 partition@50000 { -  
120 compatible = "denx,uimage"; 109 partition@50000 {
121 label = "firmware"; 110 label = "firmware";
122 reg = <0x50000 0x7b0000>; -  
123 }; 111 reg = <0x50000 0x7b0000>;
124 }; 112 };
125 }; 113 };
126 }; 114 };
127   115  
128 &pinctrl { 116 &pinctrl {
129 state_default: pinctrl0 { 117 state_default: pinctrl0 {
130 gpio { 118 gpio {
131 ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled"; 119 ralink,group = "i2c", "wdt", "pa", "spi refclk", "wled";
132 ralink,function = "gpio"; 120 ralink,function = "gpio";
133 }; 121 };
134 }; 122 };
135 }; 123 };
136   124  
137 &ethernet { 125 &ethernet {
138 mtd-mac-address = <&factory 0x4>; 126 mtd-mac-address = <&factory 0x4>;
139 mediatek,portmap = "wllll"; 127 mediatek,portmap = "wllll";
140 }; 128 };
141   129  
142 &wmac { 130 &wmac {
143 ralink,mtd-eeprom = <&factory 0>; 131 ralink,mtd-eeprom = <&factory 0>;
144 }; 132 };
145   133  
146 &ehci { 134 &ehci {
147 status = "okay"; 135 status = "okay";
148 }; 136 };
149   137  
150 &ohci { 138 &ohci {
151 status = "okay"; 139 status = "okay";
152 }; 140 };
153   141