OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileRegard whitespace
Rev 2 Rev 3
Line 12... Line 12...
12   12  
13 &spi0 { 13 &spi0 {
Line 14... Line 14...
14 status = "okay"; 14 status = "okay";
-   15  
-   16 m25p80@0 {
15   17 #address-cells = <1>;
16 m25p80@0 { 18 #size-cells = <1>;
17 compatible = "jedec,spi-nor"; 19 compatible = "jedec,spi-nor";
Line 18... Line -...
18 reg = <0>; -  
19 spi-max-frequency = <10000000>; -  
20   -  
21 partitions { -  
22 compatible = "fixed-partitions"; -  
23 #address-cells = <1>; 20 reg = <0>;
24 #size-cells = <1>; 21 spi-max-frequency = <10000000>;
25   22  
26 partition@0 { 23 partition@0 {
27 label = "u-boot"; 24 label = "u-boot";
Line 40... Line 37...
40 reg = <0x40000 0x10000>; 37 reg = <0x40000 0x10000>;
41 read-only; 38 read-only;
42 }; 39 };
Line 43... Line 40...
43   40  
44 partition@50000 { -  
45 compatible = "denx,uimage"; 41 partition@50000 {
46 label = "firmware"; 42 label = "firmware";
47 reg = <0x50000 0x7b0000>; 43 reg = <0x50000 0x7b0000>;
48 }; 44 };
49 }; 45 };
50 }; -  
Line 51... Line 46...
51 }; 46 };
52   47  
53 &gpio1 { 48 &gpio1 {
Line 54... Line 49...
54 status = "okay"; 49 status = "okay";
55 }; 50 };
56   51  
57 &pinctrl { 52 &pinctrl {
58 state_default: pinctrl0 { 53 state_default: pinctrl0 {
59 gpio { 54 gpio {
60 ralink,group = "jtag"; 55 ralink,group = "jtag", "rgmii", "mdio";
61 ralink,function = "gpio"; 56 ralink,function = "gpio";
62 }; 57 };