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 = "dlink,dir-300-b7", "ralink,rt5350-soc"; 9 compatible = "dlink,dir-300-b7", "ralink,rt5350-soc";
10 model = "D-Link DIR-300 B7"; 10 model = "D-Link DIR-300 B7";
11   -  
12 aliases { -  
13 led-boot = &led_status; -  
14 led-failsafe = &led_status; -  
15 led-running = &led_status; -  
16 led-upgrade = &led_status; -  
17 }; -  
18   11  
19 leds { 12 gpio-leds {
20 compatible = "gpio-leds"; 13 compatible = "gpio-leds";
21   14  
22 led_status: status { 15 status {
23 label = "dir-300-b7:green:status"; 16 label = "dir-300-b7:green:status";
24 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; 17 gpios = <&gpio0 9 GPIO_ACTIVE_LOW>;
25 }; 18 };
26   19  
27 wps { 20 wps {
28 label = "dir-300-b7:blue:wps"; 21 label = "dir-300-b7:blue:wps";
29 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; 22 gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
30 }; 23 };
31 }; 24 };
32   25  
33 keys { 26 gpio-keys-polled {
-   27 compatible = "gpio-keys-polled";
-   28 #address-cells = <1>;
34 compatible = "gpio-keys-polled"; 29 #size-cells = <0>;
35 poll-interval = <20>; 30 poll-interval = <20>;
36   31  
37 reset { 32 reset {
38 label = "reset"; 33 label = "reset";
39 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; 34 gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
40 linux,code = <KEY_RESTART>; 35 linux,code = <KEY_RESTART>;
41 }; 36 };
42   37  
43 wps { 38 wps {
44 label = "wps"; 39 label = "wps";
45 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 40 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
46 linux,code = <KEY_WPS_BUTTON>; 41 linux,code = <KEY_WPS_BUTTON>;
47 }; 42 };
48 }; 43 };
49 }; 44 };
50   45  
51 &spi0 { 46 &spi0 {
52 status = "okay"; 47 status = "okay";
53   48  
54 m25p80@0 { 49 m25p80@0 {
-   50 #address-cells = <1>;
-   51 #size-cells = <1>;
55 compatible = "jedec,spi-nor"; 52 compatible = "jedec,spi-nor";
56 reg = <0>; 53 reg = <0>;
57 spi-max-frequency = <10000000>; 54 spi-max-frequency = <10000000>;
58   -  
59 partitions { -  
60 compatible = "fixed-partitions"; -  
61 #address-cells = <1>; -  
62 #size-cells = <1>; -  
63   55  
64 partition@0 { 56 partition@0 {
65 label = "u-boot"; 57 label = "u-boot";
66 reg = <0x0 0x30000>; 58 reg = <0x0 0x30000>;
67 read-only; 59 read-only;
68 }; 60 };
69   61  
70 partition@30000 { 62 partition@30000 {
71 label = "u-boot-env"; 63 label = "u-boot-env";
72 reg = <0x30000 0x10000>; 64 reg = <0x30000 0x10000>;
73 read-only; 65 read-only;
74 }; 66 };
75   67  
76 factory: partition@40000 { 68 factory: partition@40000 {
77 label = "factory"; 69 label = "factory";
78 reg = <0x40000 0x10000>; 70 reg = <0x40000 0x10000>;
79 read-only; 71 read-only;
80 }; 72 };
81   73  
82 partition@50000 { -  
83 compatible = "denx,uimage"; 74 partition@50000 {
84 label = "firmware"; 75 label = "firmware";
85 reg = <0x50000 0x7b0000>; -  
86 }; 76 reg = <0x50000 0x7b0000>;
87 }; 77 };
88 }; 78 };
89 }; 79 };
90   80  
91 &pinctrl { 81 &pinctrl {
92 state_default: pinctrl0 { 82 state_default: pinctrl0 {
93 gpio { 83 gpio {
94 ralink,group = "i2c", "jtag", "uartf"; 84 ralink,group = "i2c", "jtag", "rgmii", "mdio", "uartf";
95 ralink,function = "gpio"; 85 ralink,function = "gpio";
96 }; 86 };
97 }; 87 };
98 }; 88 };
99   89  
100 &ethernet { 90 &ethernet {
101 mtd-mac-address = <&factory 0x4>; 91 mtd-mac-address = <&factory 0x4>;
102 }; 92 };
103   93  
104 &esw { 94 &esw {
105 mediatek,portmap = <0x2f>; 95 mediatek,portmap = <0x2f>;
106 mediatek,led_polarity = <0x17>; 96 mediatek,led_polarity = <0x17>;
107 }; 97 };
108   98  
109 &wmac { 99 &wmac {
110 status = "okay"; 100 status = "okay";
111 ralink,led-polarity = <1>; 101 ralink,led-polarity = <1>;
112 ralink,mtd-eeprom = <&factory 0>; 102 ralink,mtd-eeprom = <&factory 0>;
113 }; 103 };
114   104