OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 8... Line 8...
8   8  
9 chosen { 9 chosen {
10 bootargs = "console=ttyS0,115200"; 10 bootargs = "console=ttyS0,115200";
Line 11... Line 11...
11 }; 11 };
12   12  
-   13 gpio-keys-polled {
-   14 compatible = "gpio-keys-polled";
13 keys { 15 #address-cells = <1>;
Line 14... Line 16...
14 compatible = "gpio-keys-polled"; 16 #size-cells = <0>;
15 poll-interval = <20>; 17 poll-interval = <20>;
16   18  
Line 53... Line 55...
53   55  
54 &spi0 { 56 &spi0 {
Line 55... Line 57...
55 status = "okay"; 57 status = "okay";
-   58  
-   59 m25p80@0 {
56   60 #address-cells = <1>;
57 m25p80@0 { 61 #size-cells = <1>;
58 compatible = "jedec,spi-nor"; 62 compatible = "jedec,spi-nor";
Line 59... Line -...
59 reg = <0>; -  
60 spi-max-frequency = <10000000>; -  
61   -  
62 partitions { -  
63 compatible = "fixed-partitions"; -  
64 #address-cells = <1>; 63 reg = <0>;
65 #size-cells = <1>; 64 spi-max-frequency = <10000000>;
66   65  
67 partition@0 { -  
68 label = "u-boot"; 66 partition@0 {
69 reg = <0x0 0x30000>; 67 label = "u-boot";
70 read-only; 68 reg = <0x0 0x30000>;
71 }; 69 };
72   70  
73 partition@30000 { 71 partition@30000 {
74 label = "u-boot-env"; 72 label = "u-boot-env";
75 reg = <0x30000 0x10000>; 73 reg = <0x30000 0x10000>;
76 read-only; 74 read-only;
77 }; 75 };
78   76  
79 factory: partition@40000 { -  
80 label = "factory"; 77 factory: partition@40000 {
81 reg = <0x40000 0x10000>; 78 label = "factory";
82 read-only; 79 reg = <0x40000 0x10000>;
83 }; -  
84   80 };
85 partition@50000 { 81  
86 compatible = "denx,uimage"; 82 partition@50000 {
87 label = "firmware"; 83 label = "firmware";
88 reg = <0x50000 0xf80000>; 84 reg = <0x50000 0xf80000>;
89 }; 85 };
90   86  
91 partition@fd0000 { -  
92 label = "hwf_config"; 87 partition@fd0000 {
93 reg = <0xfd0000 0x10000>; 88 label = "hwf_config";
94 read-only; 89 reg = <0xfd0000 0x10000>;
95 }; 90 };
96   91  
97 bdinfo: partition@fe0000 { -  
98 label = "bdinfo"; 92 bdinfo: partition@fe0000 {
99 reg = <0xfe0000 0x10000>; 93 label = "bdinfo";
100 read-only; 94 reg = <0xfe0000 0x10000>;
101 }; 95 };
102   96  
103 partition@ff0000 { -  
104 label = "backup"; -  
105 reg = <0xff0000 0x10000>; 97 partition@ff0000 {
106 read-only; 98 label = "backup";
107 }; 99 reg = <0xff0000 0x10000>;
Line -... Line 100...
-   100 };
-   101 };
-   102 };
-   103  
-   104 &ehci {
-   105 status = "okay";
-   106 };
-   107  
108 }; 108 &ohci {
109 }; 109 status = "okay";
110 }; 110 };
111   111  
112 &ethernet { 112 &ethernet {
Line 124... Line 124...
124 ralink,mtd-eeprom = <&factory 0>; 124 ralink,mtd-eeprom = <&factory 0>;
125 pinctrl-names = "default"; 125 pinctrl-names = "default";
126 pinctrl-0 = <&pa_pins>; 126 pinctrl-0 = <&pa_pins>;
127 }; 127 };
Line -... Line 128...
-   128  
-   129 &pcie {
-   130 status = "okay";
-   131 };
128   132  
129 &pinctrl { 133 &pinctrl {
130 state_default: pinctrl0 { 134 state_default: pinctrl0 {
131 gpio { 135 gpio {
132 ralink,group = "uartf", "wled"; 136 ralink,group = "uartf", "wled", "nd_sd";
133 ralink,function = "gpio"; 137 ralink,function = "gpio";
134 }; 138 };
135 }; 139 };