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 "rt5350.dtsi" 3 #include "rt5350.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 = "intenso,memory2move", "ralink,rt5350-soc"; 9 compatible = "intenso,memory2move", "ralink,rt5350-soc";
10 model = "Intenso Memory 2 Move"; 10 model = "Intenso Memory 2 Move";
11   -  
12 aliases { -  
13 led-boot = &led_wifi; -  
14 led-failsafe = &led_wifi; -  
15 led-running = &led_wifi; -  
16 led-upgrade = &led_wifi; -  
17 }; -  
18   11  
19 chosen { 12 chosen {
20 bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5"; 13 bootargs = "console=ttyS0,57600n8 root=/dev/mtdblock5";
21 }; 14 };
22   15  
23 leds { 16 gpio-leds {
24 compatible = "gpio-leds"; 17 compatible = "gpio-leds";
25   18  
26 led_wifi: wifi { 19 wifi {
27 label = "m2m:blue:wifi"; 20 label = "m2m:blue:wifi";
28 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; 21 gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
29 }; 22 };
30   23  
31 wan { 24 wan {
32 label = "m2m:green:wan"; 25 label = "m2m:green:wan";
33 gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; 26 gpios = <&gpio0 12 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 power { 36 power {
42 label = "power"; 37 label = "power";
43 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>; 38 gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
44 linux,code = <KEY_POWER>; 39 linux,code = <KEY_POWER>;
45 }; 40 };
46   41  
47 reset { 42 reset {
48 label = "reset"; 43 label = "reset";
49 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; 44 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
50 linux,code = <KEY_RESTART>; 45 linux,code = <KEY_RESTART>;
51 }; 46 };
52 }; 47 };
53 }; 48 };
54   49  
55 &spi0 { 50 &spi0 {
56 status = "okay"; 51 status = "okay";
57   52  
58 m25p80@0 { 53 m25p80@0 {
-   54 #address-cells = <1>;
-   55 #size-cells = <1>;
59 compatible = "jedec,spi-nor"; 56 compatible = "jedec,spi-nor";
60 reg = <0>; 57 reg = <0>;
61 spi-max-frequency = <10000000>; 58 spi-max-frequency = <10000000>;
62   -  
63 partitions { -  
64 compatible = "fixed-partitions"; -  
65 #address-cells = <1>; -  
66 #size-cells = <1>; -  
67   59  
68 partition@0 { 60 partition@0 {
69 label = "Bootloader"; 61 label = "Bootloader";
70 reg = <0x0 0x30000>; 62 reg = <0x0 0x30000>;
71 read-only; 63 read-only;
72 }; 64 };
73   65  
74 partition@30000 { 66 partition@30000 {
75 label = "Config"; 67 label = "Config";
76 reg = <0x30000 0x10000>; 68 reg = <0x30000 0x10000>;
77 read-only; 69 read-only;
78 }; 70 };
79   71  
80 factory: partition@40000 { 72 factory: partition@40000 {
81 label = "Factory"; 73 label = "Factory";
82 reg = <0x40000 0x10000>; 74 reg = <0x40000 0x10000>;
83 read-only; 75 read-only;
84 }; 76 };
85   77  
86 partition@50000 { -  
87 compatible = "denx,uimage"; 78 partition@50000 {
88 label = "firmware"; 79 label = "firmware";
89 reg = <0x50000 0x7b0000>; -  
90 }; 80 reg = <0x50000 0x7b0000>;
91 }; 81 };
92 }; 82 };
93 }; 83 };
94   84  
95 &pinctrl { 85 &pinctrl {
96 state_default: pinctrl0 { 86 state_default: pinctrl0 {
97 gpio { 87 gpio {
98 ralink,group = "i2c", "uartf"; 88 ralink,group = "i2c", "uartf";
99 ralink,function = "gpio"; 89 ralink,function = "gpio";
100 }; 90 };
101 }; 91 };
102 }; 92 };
103   93  
104 &ethernet { 94 &ethernet {
105 mtd-mac-address = <&factory 0x28>; 95 mtd-mac-address = <&factory 0x28>;
106 }; 96 };
107   97  
108 &esw { 98 &esw {
109 mediatek,portmap = <0x2f>; 99 mediatek,portmap = <0x2f>;
110 }; 100 };
111   101  
112 &ehci { 102 &ehci {
113 status = "okay"; 103 status = "okay";
114 }; 104 };
115   105  
116 &ohci { 106 &ohci {
117 status = "okay"; 107 status = "okay";
118 }; 108 };
119   109  
120 &wmac { 110 &wmac {
121 ralink,mtd-eeprom = <&factory 0x0>; 111 ralink,mtd-eeprom = <&factory 0x0>;
122 }; 112 };
123   113