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 "rt3883.dtsi" 3 #include "rt3883.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 = "sitecom,wlr-6000", "ralink,rt3883-soc"; 9 compatible = "sitecom,wlr-6000", "ralink,rt3883-soc";
10 model = "Sitecom WLR-6000"; 10 model = "Sitecom WLR-6000";
11   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   -  
19 keys { 12 gpio-keys-polled {
-   13 compatible = "gpio-keys-polled";
-   14 #address-cells = <1>;
20 compatible = "gpio-keys-polled"; 15 #size-cells = <0>;
21 poll-interval = <20>; 16 poll-interval = <20>;
22   17  
23 reset { 18 reset {
24 label = "reset"; 19 label = "reset";
25 gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; 20 gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
26 linux,code = <KEY_RESTART>; 21 linux,code = <KEY_RESTART>;
27 }; 22 };
28 }; 23 };
29   24  
30 leds { 25 gpio-leds {
31 compatible = "gpio-leds"; 26 compatible = "gpio-leds";
32   27  
33 led_power: power { 28 power {
34 label = "wlr-6000:red:power"; 29 label = "wlr-6000:red:power";
35 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; 30 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
36 }; 31 };
37   32  
38 ops { 33 ops {
39 label = "wlr-6000:white:ops"; 34 label = "wlr-6000:white:ops";
40 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 35 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
41 }; 36 };
42 }; 37 };
43   38  
44 gpio_export { 39 gpio_export {
45 compatible = "gpio-export"; 40 compatible = "gpio-export";
46 #size-cells = <0>; 41 #size-cells = <0>;
47   42  
48 usb { 43 usb {
49 gpio-export,name = "usb"; 44 gpio-export,name = "usb";
50 gpio-export,output = <1>; 45 gpio-export,output = <1>;
51 gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>; 46 gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
52 }; 47 };
53 }; 48 };
54 }; 49 };
55   50  
56 &gpio1 { 51 &gpio1 {
57 status = "okay"; 52 status = "okay";
58 }; 53 };
59   54  
60 &pinctrl { 55 &pinctrl {
61 state_default: pinctrl0 { 56 state_default: pinctrl0 {
62 gpio { 57 gpio {
63 ralink,group = "i2c", "jtag", "uartf"; 58 ralink,group = "i2c", "jtag", "uartf";
64 ralink,function = "gpio"; 59 ralink,function = "gpio";
65 }; 60 };
66 }; 61 };
67 }; 62 };
68   63  
69 &ethernet { 64 &ethernet {
70 status = "okay"; 65 status = "okay";
71 mtd-mac-address = <&factory 0x8004>; 66 mtd-mac-address = <&factory 0x8004>;
72 mtd-mac-address-increment = <1>; 67 mtd-mac-address-increment = <1>;
73   68  
74 port@0 { 69 port@0 {
75 phy-handle = <&phy0>; 70 phy-handle = <&phy0>;
76 phy-mode = "rgmii"; 71 phy-mode = "rgmii";
77 }; 72 };
78   73  
79 mdio-bus { 74 mdio-bus {
80 status = "okay"; 75 status = "okay";
81   76  
82 phy0: ethernet-phy@0 { 77 phy0: ethernet-phy@0 {
83 reg = <0>; 78 reg = <0>;
84 phy-mode = "rgmii"; 79 phy-mode = "rgmii";
85   80  
86 qca,ar8327-initvals = < 81 qca,ar8327-initvals = <
87 0x04 0x07600000 /* PORT0 PAD MODE CTRL */ 82 0x04 0x07600000 /* PORT0 PAD MODE CTRL */
88 0x0c 0x07600000 /* PORT6 PAD MODE CTRL */ 83 0x0c 0x07600000 /* PORT6 PAD MODE CTRL */
89 0x10 0x40000000 /* Power-on Strapping: 176-pin interface configuration */ 84 0x10 0x40000000 /* Power-on Strapping: 176-pin interface configuration */
90 0x50 0xc437c437 /* LED Control Register 0 */ 85 0x50 0xc437c437 /* LED Control Register 0 */
91 0x54 0xc337c337 /* LED Control Register 1 */ 86 0x54 0xc337c337 /* LED Control Register 1 */
92 0x58 0x00000000 /* LED Control Register 2 */ 87 0x58 0x00000000 /* LED Control Register 2 */
93 0x5c 0x03ffff00 /* LED Control Register 3 */ 88 0x5c 0x03ffff00 /* LED Control Register 3 */
94 0x7c 0x0000007e /* PORT0_STATUS */ 89 0x7c 0x0000007e /* PORT0_STATUS */
95 0x94 0x0000007e /* PORT6 STATUS */ 90 0x94 0x0000007e /* PORT6 STATUS */
96 >; 91 >;
97 }; 92 };
98 }; 93 };
99 }; 94 };
100   95  
101 &spi0 { 96 &spi0 {
102 status = "okay"; 97 status = "okay";
103   98  
104 m25p80@0 { 99 m25p80@0 {
-   100 #address-cells = <1>;
-   101 #size-cells = <1>;
105 compatible = "jedec,spi-nor"; 102 compatible = "jedec,spi-nor";
106 reg = <0>; 103 reg = <0>;
107 spi-max-frequency = <8600000>; 104 spi-max-frequency = <8600000>;
108 m25p,fast-read; 105 m25p,fast-read;
109   -  
110 partitions { -  
111 compatible = "fixed-partitions"; -  
112 #address-cells = <1>; -  
113 #size-cells = <1>; -  
114   106  
115 partition@0 { 107 partition@0 {
116 label = "u-boot"; 108 label = "u-boot";
117 reg = <0x0 0x30000>; 109 reg = <0x0 0x30000>;
118 read-only; 110 read-only;
119 }; 111 };
120   112  
121 partition@30000 { 113 partition@30000 {
122 label = "u-boot-env"; 114 label = "u-boot-env";
123 reg = <0x30000 0x10000>; 115 reg = <0x30000 0x10000>;
124 read-only; 116 read-only;
125 }; 117 };
126   118  
127 factory: partition@40000 { 119 factory: partition@40000 {
128 label = "factory"; 120 label = "factory";
129 reg = <0x40000 0x10000>; 121 reg = <0x40000 0x10000>;
130 read-only; -  
131 }; 122 read-only;
132   123 };
133 partition@50000 { 124  
134 compatible = "denx,uimage"; 125 partition@50000 {
135 label = "firmware"; 126 label = "firmware";
136 reg = <0x50000 0x713000>; 127 reg = <0x50000 0x713000>;
137 }; 128 };
138   129  
139 partition@763000 { 130 partition@763000 {
140 label = "manufacture"; 131 label = "manufacture";
141 reg = <0x763000 0x7D000>; 132 reg = <0x763000 0x7D000>;
142 read-only; 133 read-only;
143 }; 134 };
144   135  
145 partition@7E0000 { 136 partition@7E0000 {
146 label = "backup"; 137 label = "backup";
147 reg = <0x7E0000 0x10000>; 138 reg = <0x7E0000 0x10000>;
148 read-only; -  
149 }; 139 read-only;
150   140 };
151 partition@7F0000 { 141  
152 label = "storage"; 142 partition@7F0000 {
153 reg = <0x7F0000 0x10000>; 143 label = "storage";
154 read-only; 144 reg = <0x7F0000 0x10000>;
155 }; 145 read-only;
156 }; 146 };
157 }; 147 };
158 }; 148 };
159   149  
160 &pci { 150 &pci {
161 status = "okay"; 151 status = "okay";
-   152 pinctrl-names = "default";
162 }; 153 pinctrl-0 = <&pci_pins>;
-   154  
163   155 pci_pins: pci {
-   156 pci {
-   157 ralink,group = "pci";
-   158 ralink,function = "pci-fnc";
-   159 };
-   160 };
-   161  
-   162 host-bridge {
164 &pci1 { 163 pci-bridge@1 {
165 status = "okay"; 164 status = "okay";
166   165  
167 wifi@0,0 { 166 wifi@1814,3091 {
168 compatible = "pci1814,3091"; 167 compatible = "pci1814,3091";
-   168 reg = <0x10000 0 0 0 0>;
-   169 ralink,mtd-eeprom = <&factory 0x8000>;
169 reg = <0x10000 0 0 0 0>; 170 };
170 ralink,mtd-eeprom = <&factory 0x8000>; 171 };
171 }; 172 };
172 }; 173 };
173   174  
174 &wmac { 175 &wmac {
175 status = "okay"; 176 status = "okay";
176 ralink,2ghz = <0>; 177 ralink,2ghz = <0>;
177 ralink,mtd-eeprom = <&factory 0x0>; 178 ralink,mtd-eeprom = <&factory 0x0>;
178 }; 179 };
179   180  
180 &ehci { 181 &ehci {
181 status = "okay"; 182 status = "okay";
182 }; 183 };
183   184  
184 &ohci { 185 &ohci {
185 status = "okay"; 186 status = "okay";
186 }; 187 };
187   188