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 #include <dt-bindings/input/input.h> 2 #include <dt-bindings/input/input.h>
3 #include <dt-bindings/gpio/gpio.h> 3 #include <dt-bindings/gpio/gpio.h>
4   4  
5 #include "mt7628an.dtsi" 5 #include "mt7628an.dtsi"
6   6  
7 / { 7 / {
8 compatible = "zbtlink,zbt-we1226", "mediatek,mt7628an-soc"; 8 compatible = "zbtlink,zbt-we1226", "mediatek,mt7628an-soc";
9 model = "Zbtlink ZBT-WE1226"; 9 model = "Zbtlink ZBT-WE1226";
10   -  
11 aliases { -  
12 led-boot = &led_wlan; -  
13 led-failsafe = &led_wlan; -  
14 led-running = &led_wlan; -  
15 led-upgrade = &led_wlan; -  
16 }; -  
17   10  
18 chosen { 11 chosen {
19 bootargs = "console=ttyS0,115200"; 12 bootargs = "console=ttyS0,115200";
20 }; 13 };
21   14  
22 memory@0 { 15 memory@0 {
23 device_type = "memory"; 16 device_type = "memory";
24 reg = <0x0 0x4000000>; 17 reg = <0x0 0x4000000>;
25 }; 18 };
26   19  
27 keys { 20 gpio-keys-polled {
-   21 compatible = "gpio-keys-polled";
-   22 #address-cells = <1>;
28 compatible = "gpio-keys-polled"; 23 #size-cells = <0>;
29 poll-interval = <20>; 24 poll-interval = <20>;
30   25  
31 reset { 26 reset {
32 label = "reset"; 27 label = "reset";
33 gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; 28 gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
34 linux,code = <KEY_RESTART>; 29 linux,code = <KEY_RESTART>;
35 }; 30 };
36 }; 31 };
37   32  
38 leds { 33 gpio-leds {
39 compatible = "gpio-leds"; 34 compatible = "gpio-leds";
40   35  
41 wan { 36 wan {
42 label = "zbt-we1226:green:wan"; 37 label = "zbt-we1226:green:wan";
43 gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; 38 gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
44 }; 39 };
45   40  
46 lan1 { 41 lan1 {
47 label = "zbt-we1226:green:lan1"; 42 label = "zbt-we1226:green:lan1";
48 gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 43 gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
49 }; 44 };
50   45  
51 lan2 { 46 lan2 {
52 label = "zbt-we1226:green:lan2"; 47 label = "zbt-we1226:green:lan2";
53 gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; 48 gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
54 }; 49 };
55   50  
56 led_wlan: wlan { 51 wlan {
57 label = "zbt-we1226:green:wlan"; 52 label = "zbt-we1226:green:wlan";
58 gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; 53 gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
59 }; 54 };
60 }; 55 };
61 }; 56 };
62   57  
63 &pinctrl { 58 &pinctrl {
64 state_default: pinctrl0 { 59 state_default: pinctrl0 {
65 gpio { 60 gpio {
66 ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an"; 61 ralink,group = "p0led_an", "p1led_an", "p4led_an", "wdt", "wled_an";
67 ralink,function = "gpio"; 62 ralink,function = "gpio";
68 }; 63 };
69 }; 64 };
70 }; 65 };
71   66  
72 &spi0 { 67 &spi0 {
73 status = "okay"; 68 status = "okay";
74   69  
75 m25p80@0 { 70 m25p80@0 {
-   71 #address-cells = <1>;
-   72 #size-cells = <1>;
76 compatible = "jedec,spi-nor"; 73 compatible = "jedec,spi-nor";
77 reg = <0>; 74 reg = <0>;
78 spi-max-frequency = <10000000>; 75 spi-max-frequency = <10000000>;
-   76 m25p,chunked-io = <32>;
-   77  
-   78 partition@0 {
-   79 label = "u-boot";
-   80 reg = <0x0 0x30000>;
-   81 read-only;
-   82 };
-   83  
-   84 partition@30000 {
-   85 label = "u-boot-env";
-   86 reg = <0x30000 0x10000>;
-   87 read-only;
-   88 };
-   89  
-   90 factory: partition@40000 {
-   91 label = "factory";
-   92 reg = <0x40000 0x10000>;
-   93 read-only;
-   94 };
79   -  
80 partitions { -  
81 compatible = "fixed-partitions"; -  
82 #address-cells = <1>; -  
83 #size-cells = <1>; -  
84   -  
85 partition@0 { -  
86 label = "u-boot"; -  
87 reg = <0x0 0x30000>; -  
88 read-only; -  
89 }; -  
90   -  
91 partition@30000 { -  
92 label = "u-boot-env"; -  
93 reg = <0x30000 0x10000>; -  
94 read-only; -  
95 }; -  
96   -  
97 factory: partition@40000 { -  
98 label = "factory"; -  
99 reg = <0x40000 0x10000>; -  
100 read-only; -  
101 }; -  
102   95  
103 partition@50000 { -  
104 compatible = "denx,uimage"; 96 partition@50000 {
105 label = "firmware"; 97 label = "firmware";
106 reg = <0x50000 0x7b0000>; -  
107 }; 98 reg = <0x50000 0x7b0000>;
108 }; 99 };
109 }; 100 };
110 }; 101 };
111   102  
112 &wmac { 103 &wmac {
113 status = "okay"; 104 status = "okay";
114 ralink,mtd-eeprom = <&factory 0x4>; 105 ralink,mtd-eeprom = <&factory 0x4>;
115 }; 106 };
116   107  
117 &ethernet { 108 &ethernet {
118 mtd-mac-address = <&factory 0x2e>; 109 mtd-mac-address = <&factory 0x2e>;
119 mediatek,portmap = "llllw"; 110 mediatek,portmap = "llllw";
120 }; 111 };
121   112