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 "mt7628an.dtsi" 3 #include "mt7628an.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 = "tama,w06", "mediatek,mt7628an-soc"; 9 compatible = "tama,w06", "mediatek,mt7628an-soc";
10 model = "Tama W06"; 10 model = "Tama W06";
11   11  
12 memory@0{ 12 memory@0{
13 device_type = "memory"; 13 device_type = "memory";
14 reg = <0x0 0x4000000>; 14 reg = <0x0 0x4000000>;
15 }; 15 };
16   16  
17 leds { 17 gpio-leds {
18 compatible = "gpio-leds"; 18 compatible = "gpio-leds";
19   19  
20 wps { 20 wps {
21 label = "w06:green:wps"; 21 label = "w06:green:wps";
22 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; 22 gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
23 }; 23 };
24   24  
25 wan { 25 wan {
26 label = "w06:green:wan"; 26 label = "w06:green:wan";
27 gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; 27 gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
28 }; 28 };
29   29  
30 wireless { 30 wireless {
31 label = "w06:green:wlan"; 31 label = "w06:green:wlan";
32 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 32 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
33 }; 33 };
34 }; 34 };
35   35  
36 keys { 36 gpio-keys-polled {
-   37 compatible = "gpio-keys-polled";
-   38 #address-cells = <1>;
37 compatible = "gpio-keys-polled"; 39 #size-cells = <0>;
38 poll-interval = <20>; 40 poll-interval = <20>;
39   41  
40 reset { 42 reset {
41 label = "reset"; 43 label = "reset";
42 gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; 44 gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
43 linux,code = <KEY_RESTART>; 45 linux,code = <KEY_RESTART>;
44 }; 46 };
45 }; 47 };
46 }; 48 };
47   49  
48 &ehci { 50 &ehci {
49 status = "okay"; 51 status = "okay";
50 }; 52 };
51   53  
52 &ethernet { 54 &ethernet {
53 mtd-mac-address = <&factory 0x28>; 55 mtd-mac-address = <&factory 0x28>;
54 }; 56 };
55   57  
56 &ohci { 58 &ohci {
57 status = "okay"; 59 status = "okay";
58 }; 60 };
59   61  
60 &pinctrl { 62 &pinctrl {
61 state_default: pinctrl0 { 63 state_default: pinctrl0 {
62 gpio { 64 gpio {
63 ralink,group = "uart1", "p0led_an", "wdt"; 65 ralink,group = "uart1", "p0led_an", "wdt";
64 ralink,function = "gpio"; 66 ralink,function = "gpio";
65 }; 67 };
66 }; 68 };
67 }; 69 };
68   70  
69 &spi0 { 71 &spi0 {
70 status = "okay"; 72 status = "okay";
71   73  
72 m25p80@0 { 74 m25p80@0 {
-   75 #address-cells = <1>;
-   76 #size-cells = <1>;
73 compatible = "jedec,spi-nor"; 77 compatible = "jedec,spi-nor";
74 reg = <0>; 78 reg = <0>;
75 spi-max-frequency = <10000000>; 79 spi-max-frequency = <10000000>;
-   80 m25p,chunked-io = <32>;
76   -  
77 partitions { -  
78 compatible = "fixed-partitions"; -  
79 #address-cells = <1>; -  
80 #size-cells = <1>; -  
81   81  
82 partition@0 { 82 partition@0 {
83 label = "u-boot"; 83 label = "u-boot";
84 reg = <0x0 0x30000>; 84 reg = <0x0 0x30000>;
85 read-only; 85 read-only;
86 }; 86 };
87   87  
88 partition@30000 { 88 partition@30000 {
89 label = "u-boot-env"; 89 label = "u-boot-env";
90 reg = <0x30000 0x10000>; 90 reg = <0x30000 0x10000>;
91 read-only; 91 read-only;
92 }; 92 };
93   93  
94 factory: partition@40000 { 94 factory: partition@40000 {
95 label = "factory"; 95 label = "factory";
96 reg = <0x40000 0x10000>; 96 reg = <0x40000 0x10000>;
97 read-only; 97 read-only;
98 }; 98 };
99   99  
100 partition@50000 { -  
101 compatible = "denx,uimage"; 100 partition@50000 {
102 label = "firmware"; 101 label = "firmware";
103 reg = <0x50000 0xeb0000>; 102 reg = <0x50000 0xeb0000>;
104 }; 103 };
105   104  
106 partition@f00000 { 105 partition@f00000 {
107 label = "user-data"; 106 label = "user-data";
108 reg = <0xf00000 0x100000>; 107 reg = <0xf00000 0x100000>;
109 read-only; -  
110 }; 108 read-only;
111 }; 109 };
112 }; 110 };
113 }; 111 };
114   112  
115 &wmac { 113 &wmac {
116 status = "okay"; 114 status = "okay";
117 }; 115 };
118   116