OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileIgnore whitespace
Rev 2 Rev 3
Line 7... Line 7...
7   7  
8 / { 8 / {
9 compatible = "samsung,cy-swr1100", "ralink,rt3883-soc"; 9 compatible = "samsung,cy-swr1100", "ralink,rt3883-soc";
Line 10... Line -...
10 model = "Samsung CY-SWR1100"; -  
11   -  
12 aliases { -  
13 led-boot = &led_wps; -  
14 led-failsafe = &led_wps; -  
15 }; 10 model = "Samsung CY-SWR1100";
16   11  
17 nor-flash@1c000000 { 12 nor-flash@1c000000 {
18 compatible = "cfi-flash"; 13 compatible = "cfi-flash";
-   14 reg = <0x1c000000 0x800000>;
-   15 bank-width = <2>;
Line 19... Line -...
19 reg = <0x1c000000 0x800000>; -  
20 bank-width = <2>; -  
21   -  
22 partitions { -  
23 compatible = "fixed-partitions"; -  
24 #address-cells = <1>; 16 #address-cells = <1>;
25 #size-cells = <1>; 17 #size-cells = <1>;
26   18  
27 partition@0 { 19 partition@0 {
28 label = "uboot"; 20 label = "uboot";
Line 29... Line 21...
29 reg = <0x0 0x30000>; 21 reg = <0x0 0x30000>;
30 read-only; 22 read-only;
31 }; 23 };
32   24  
33 partition@30000 { 25 partition@30000 {
Line 34... Line 26...
34 label = "uboot-env"; 26 label = "uboot-env";
35 reg = <0x30000 0x4000>; 27 reg = <0x30000 0x4000>;
36 read-only; 28 read-only;
37 }; 29 };
38   30  
Line 39... Line 31...
39 factory: partition@34000 { 31 factory: partition@34000 {
40 label = "factory"; 32 label = "factory";
41 reg = <0x34000 0x4000>; 33 reg = <0x34000 0x4000>;
42 read-only; 34 read-only;
43 }; 35 };
Line 44... Line 36...
44   36  
45 partition@38000 { 37 partition@38000 {
46 label = "nvram"; 38 label = "nvram";
47 reg = <0x38000 0x8000>; 39 reg = <0x38000 0x8000>;
Line 48... Line 40...
48 read-only; 40 read-only;
49 }; -  
50   41 };
51 partition@40000 { 42  
52 label = "devdata"; -  
53 reg = <0x40000 0x10000>; 43 partition@40000 {
54 }; 44 label = "devdata";
Line 55... Line 45...
55   45 reg = <0x40000 0x10000>;
56 partition@50000 { 46 };
57 compatible = "seama"; 47  
58 label = "firmware"; 48 partition@50000 {
59 reg = <0x50000 0x7b0000>; 49 label = "firmware";
60 }; 50 reg = <0x50000 0x7b0000>;
Line 61... Line 51...
61 }; 51 };
62 }; 52 };
-   53  
-   54 rtl8367 {
63   55 compatible = "realtek,rtl8367";
Line 64... Line 56...
64 rtl8367 { 56 gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>;
65 compatible = "realtek,rtl8367"; 57 gpio-sck = <&gpio0 2 GPIO_ACTIVE_HIGH>;
66 gpio-sda = <&gpio0 1 GPIO_ACTIVE_HIGH>; 58 realtek,extif0 = <1 0 1 1 1 1 1 1 2>;
Line 83... Line 75...
83 gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; 75 gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
84 linux,code = <KEY_WPS_BUTTON>; 76 linux,code = <KEY_WPS_BUTTON>;
85 }; 77 };
86 }; 78 };
Line 87... Line 79...
87   79  
88 leds { 80 gpio-leds {
Line 89... Line 81...
89 compatible = "gpio-leds"; 81 compatible = "gpio-leds";
90   82  
91 led_wps: wps { 83 wps {
92 label = "cy-swr1100:blue:wps"; 84 label = "cy-swr1100:blue:wps";
Line 93... Line 85...
93 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 85 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
94 }; 86 };
95   87  
96 usb { -  
97 label = "cy-swr1100:blue:usb"; -  
98 gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; 88 usb {
99 trigger-sources = <&ohci_port1>, <&ehci_port1>; 89 label = "cy-swr1100:blue:usb";
100 linux,default-trigger = "usbport"; 90 gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
Line 101... Line 91...
101 }; 91 };
Line 122... Line 112...
122 }; 112 };
123 }; 113 };
Line 124... Line 114...
124   114  
125 &pci { 115 &pci {
-   116 status = "okay";
126 status = "okay"; 117 pinctrl-names = "default";
Line -... Line 118...
-   118 pinctrl-0 = <&pci_pins>;
127 }; 119  
-   120 pci_pins: pci {
-   121 pci {
-   122 ralink,group = "pci";
-   123 ralink,function = "pci-fnc";
-   124 };
-   125 };
-   126  
128   127 host-bridge {
Line 129... Line 128...
129 &pci1 { 128 pci-bridge@1 {
130 status = "okay"; 129 status = "okay";
131   130  
132 wifi@0,0 { 131 wifi@0,0 {
133 compatible = "pci0,0"; 132 compatible = "pci0,0";
-   133 reg = <0x10000 0 0 0 0>;
-   134 ralink,5ghz = <0>;
134 reg = <0x10000 0 0 0 0>; 135 ralink,mtd-eeprom = <&factory 0x2000>;
135 ralink,5ghz = <0>; 136 };
Line 136... Line 137...
136 ralink,mtd-eeprom = <&factory 0x2000>; 137 };
137 }; 138 };