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 "mt7621.dtsi" 3 #include "mt7621.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 = "planex,vr500", "mediatek,mt7621-soc"; 9 compatible = "planex,vr500", "mediatek,mt7621-soc";
10 model = "Planex VR500"; 10 model = "Planex VR500";
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 memory@0 { 12 memory@0 {
20 device_type = "memory"; 13 device_type = "memory";
21 reg = <0x0 0x10000000>; 14 reg = <0x0 0x10000000>;
22 }; 15 };
23   16  
24 chosen { 17 chosen {
25 bootargs = "console=ttyS0,57600"; 18 bootargs = "console=ttyS0,57600";
26 }; 19 };
27   20  
28 leds { 21 gpio-leds {
29 compatible = "gpio-leds"; 22 compatible = "gpio-leds";
30   23  
31 led_power: power { 24 power {
32 label = "vr500:green:power"; 25 label = "vr500:green:power";
33 gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; 26 gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
34 }; 27 };
35 }; 28 };
36   29  
37 keys { 30 gpio-keys-polled {
-   31 compatible = "gpio-keys-polled";
-   32 #address-cells = <1>;
38 compatible = "gpio-keys-polled"; 33 #size-cells = <0>;
39 poll-interval = <20>; 34 poll-interval = <20>;
40   35  
41 reset { 36 reset {
42 label = "reset"; 37 label = "reset";
43 gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; 38 gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
44 linux,code = <KEY_RESTART>; 39 linux,code = <KEY_RESTART>;
45 }; 40 };
46 }; 41 };
47 }; 42 };
48   43  
49 &spi0 { 44 &spi0 {
50 status = "okay"; 45 status = "okay";
51   46  
52 m25p80@0 { 47 m25p80@0 {
-   48 #address-cells = <1>;
-   49 #size-cells = <1>;
53 compatible = "jedec,spi-nor"; 50 compatible = "jedec,spi-nor";
54 reg = <0>; 51 reg = <0>;
55 spi-max-frequency = <10000000>; 52 spi-max-frequency = <10000000>;
-   53 m25p,chunked-io = <32>;
-   54  
-   55 partition@0 {
-   56 label = "u-boot";
-   57 reg = <0x0 0x30000>;
-   58 read-only;
-   59 };
-   60  
-   61 partition@30000 {
-   62 label = "u-boot-env";
-   63 reg = <0x30000 0x10000>;
-   64 read-only;
-   65 };
-   66  
-   67 factory: partition@40000 {
-   68 label = "factory";
-   69 reg = <0x40000 0x10000>;
-   70 read-only;
-   71 };
56   -  
57 partitions { -  
58 compatible = "fixed-partitions"; -  
59 #address-cells = <1>; -  
60 #size-cells = <1>; -  
61   -  
62 partition@0 { -  
63 label = "u-boot"; -  
64 reg = <0x0 0x30000>; -  
65 read-only; -  
66 }; -  
67   -  
68 partition@30000 { -  
69 label = "u-boot-env"; -  
70 reg = <0x30000 0x10000>; -  
71 read-only; -  
72 }; -  
73   -  
74 factory: partition@40000 { -  
75 label = "factory"; -  
76 reg = <0x40000 0x10000>; -  
77 read-only; -  
78 }; -  
79   72  
80 partition@50000 { -  
81 compatible = "denx,uimage"; 73 partition@50000 {
82 label = "firmware"; 74 label = "firmware";
83 reg = <0x50000 0x3fb0000>; -  
84 }; 75 reg = <0x50000 0x3fb0000>;
85 }; 76 };
86 }; 77 };
87 }; 78 };
88   79  
89 &pinctrl { 80 &pinctrl {
90 state_default: pinctrl0 { 81 state_default: pinctrl0 {
91 gpio { 82 gpio {
92 ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci"; 83 ralink,group = "i2c", "uart2", "uart3", "rgmii2", "sdhci";
93 ralink,function = "gpio"; 84 ralink,function = "gpio";
94 }; 85 };
95 }; 86 };
96 }; 87 };
97   88