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 = "d-team,pbr-d1", "mediatek,mt7628an-soc"; 9 compatible = "d-team,pbr-d1", "mediatek,mt7628an-soc";
10 model = "PBR-D1"; 10 model = "PBR-D1";
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 chosen { 12 chosen {
20 bootargs = "console=ttyS0,115200"; 13 bootargs = "console=ttyS0,115200";
21 }; 14 };
22   15  
23 aliases { 16 aliases {
24 serial0 = &uart2; 17 serial0 = &uart2;
25 }; 18 };
26   19  
27 memory@0 { 20 memory@0 {
28 device_type = "memory"; 21 device_type = "memory";
29 reg = <0x0 0x8000000>; 22 reg = <0x0 0x8000000>;
30 }; 23 };
31   24  
32 leds { 25 gpio-leds {
33 compatible = "gpio-leds"; 26 compatible = "gpio-leds";
34   27  
35 usb { 28 usb {
36 label = "pbr-d1:orange:usb"; 29 label = "pbr-d1:orange:usb";
37 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; 30 gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
38 trigger-sources = <&ohci_port1>, <&ehci_port1>; -  
39 linux,default-trigger = "usbport"; 31 default-state = "off";
40 }; 32 };
41   33  
42 led_power: power { 34 power {
43 label = "pbr-d1:orange:power"; 35 label = "pbr-d1:orange:power";
44 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; 36 gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
45 default-state = "on"; 37 default-state = "on";
46 }; 38 };
47 }; 39 };
48   40  
49 keys { 41 gpio-keys-polled {
-   42 compatible = "gpio-keys-polled";
-   43 #address-cells = <1>;
50 compatible = "gpio-keys-polled"; 44 #size-cells = <0>;
51 poll-interval = <20>; 45 poll-interval = <20>;
52   46  
53 reset { 47 reset {
54 label = "reset"; 48 label = "reset";
55 gpios = <&gpio1 38 GPIO_ACTIVE_LOW>; 49 gpios = <&gpio1 38 GPIO_ACTIVE_LOW>;
56 linux,code = <KEY_RESTART>; 50 linux,code = <KEY_RESTART>;
57 }; 51 };
58 }; 52 };
59   53  
60 wgpio: gpio-wifi { 54 wgpio: gpio-wifi {
61 compatible = "mediatek,gpio-wifi"; 55 compatible = "mediatek,gpio-wifi";
62 #address-cells = <1>; 56 #address-cells = <1>;
63 #size-cells = <0>; 57 #size-cells = <0>;
64 gpio-controller; 58 gpio-controller;
65 #gpio-cells = <2>; 59 #gpio-cells = <2>;
66 }; 60 };
67 }; 61 };
68   62  
69 &pinctrl { 63 &pinctrl {
70 state_default: pinctrl0 { 64 state_default: pinctrl0 {
71 gpio { 65 gpio {
72 ralink,group = "gpio"; 66 ralink,group = "gpio";
73 ralink,function = "gpio"; 67 ralink,function = "gpio";
74 }; 68 };
75   69  
76 i2c { 70 i2c {
77 ralink,group = "i2c"; 71 ralink,group = "i2c";
78 ralink,function = "gpio"; 72 ralink,function = "gpio";
79 }; 73 };
80   74  
81 i2s { 75 i2s {
82 ralink,group = "i2s"; 76 ralink,group = "i2s";
83 ralink,function = "gpio"; 77 ralink,function = "gpio";
84 }; 78 };
85   79  
86 spis { 80 spis {
87 ralink,group = "spis"; 81 ralink,group = "spis";
88 ralink,function = "gpio"; 82 ralink,function = "gpio";
89 }; 83 };
90   84  
91 wdt { 85 wdt {
92 ralink,group = "wdt"; 86 ralink,group = "wdt";
93 ralink,function = "gpio"; 87 ralink,function = "gpio";
94 }; 88 };
95 }; 89 };
96 }; 90 };
97   91  
98 &spi0 { 92 &spi0 {
99 status = "okay"; 93 status = "okay";
100   94  
101 pinctrl-names = "default"; 95 pinctrl-names = "default";
102 pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>; 96 pinctrl-0 = <&spi_pins>, <&spi_cs1_pins>;
103   97  
104 m25p80@0 { 98 m25p80@0 {
-   99 #address-cells = <1>;
-   100 #size-cells = <1>;
105 compatible = "jedec,spi-nor"; 101 compatible = "jedec,spi-nor";
106 reg = <0>; 102 reg = <0>;
107 spi-max-frequency = <40000000>; 103 spi-max-frequency = <40000000>;
-   104 m25p,chunked-io = <31>;
-   105  
-   106 partition@0 {
-   107 label = "u-boot";
-   108 reg = <0x0 0x30000>;
-   109 read-only;
-   110 };
-   111  
-   112 partition@30000 {
-   113 label = "u-boot-env";
-   114 reg = <0x30000 0x10000>;
-   115 };
-   116  
-   117 factory: partition@40000 {
-   118 label = "factory";
-   119 reg = <0x40000 0x10000>;
-   120 read-only;
-   121 };
108   -  
109 partitions { -  
110 compatible = "fixed-partitions"; -  
111 #address-cells = <1>; -  
112 #size-cells = <1>; -  
113   -  
114 partition@0 { -  
115 label = "u-boot"; -  
116 reg = <0x0 0x30000>; -  
117 read-only; -  
118 }; -  
119   -  
120 partition@30000 { -  
121 label = "u-boot-env"; -  
122 reg = <0x30000 0x10000>; -  
123 }; -  
124   -  
125 factory: partition@40000 { -  
126 label = "factory"; -  
127 reg = <0x40000 0x10000>; -  
128 read-only; -  
129 }; -  
130   122  
131 partition@50000 { -  
132 compatible = "denx,uimage"; 123 partition@50000 {
133 label = "firmware"; 124 label = "firmware";
134 reg = <0x50000 0x0fb0000>; -  
135 }; 125 reg = <0x50000 0x0fb0000>;
136 }; 126 };
137 }; 127 };
138   128  
139 spidev@1 { 129 spidev@1 {
140 #address-cells = <1>; 130 #address-cells = <1>;
141 #size-cells = <1>; 131 #size-cells = <1>;
142 compatible = "linux,spidev"; 132 compatible = "linux,spidev";
143 reg = <1>; 133 reg = <1>;
144 spi-max-frequency = <40000000>; 134 spi-max-frequency = <40000000>;
145 }; 135 };
146 }; 136 };
147   137  
148 &i2c { 138 &i2c {
149 status = "okay"; 139 status = "okay";
150 }; 140 };
151   141  
152 &uart1 { 142 &uart1 {
153 status = "okay"; 143 status = "okay";
154 }; 144 };
155   145  
156 &uart2 { 146 &uart2 {
157 status = "okay"; 147 status = "okay";
158 }; 148 };
159   149  
160 &pwm { 150 &pwm {
161 status = "okay"; 151 status = "okay";
162 }; 152 };
163   153  
164 &ethernet { 154 &ethernet {
165 mtd-mac-address = <&factory 0x28>; 155 mtd-mac-address = <&factory 0x28>;
166 }; 156 };
167   157  
168 &sdhci { 158 &sdhci {
169 status = "okay"; 159 status = "okay";
170 mediatek,cd-high; 160 mediatek,cd-high;
171 }; 161 };
172   162