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 = "duzun,dm06", "mediatek,mt7628an-soc"; 9 compatible = "duzun,dm06", "mediatek,mt7628an-soc";
10 model = "DuZun DM06"; 10 model = "DuZun DM06";
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 keys { 17 gpio-keys-polled {
-   18 compatible = "gpio-keys-polled";
-   19 #address-cells = <1>;
18 compatible = "gpio-keys-polled"; 20 #size-cells = <0>;
19 poll-interval = <100>; 21 poll-interval = <100>;
20   22  
21 reset { 23 reset {
22 label = "reset"; 24 label = "reset";
23 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; 25 gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
24 linux,code = <KEY_RESTART>; 26 linux,code = <KEY_RESTART>;
25 }; 27 };
26   28  
27 wps { 29 wps {
28 label = "wps"; 30 label = "wps";
29 gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; 31 gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
30 linux,code = <KEY_WPS_BUTTON>; 32 linux,code = <KEY_WPS_BUTTON>;
31 }; 33 };
32 }; 34 };
33   35  
34 sound { 36 sound {
35 compatible = "simple-audio-card"; 37 compatible = "simple-audio-card";
36 simple-audio-card,name = "Audio-I2S"; 38 simple-audio-card,name = "Audio-I2S";
37 simple-audio-card,format = "i2s"; 39 simple-audio-card,format = "i2s";
38 simple-audio-card,bitclock-master = <&dailink0_master>; 40 simple-audio-card,bitclock-master = <&dailink0_master>;
39 simple-audio-card,frame-master = <&dailink0_master>; 41 simple-audio-card,frame-master = <&dailink0_master>;
40 simple-audio-card,widgets = 42 simple-audio-card,widgets =
41 "Headphone", "Headphones"; 43 "Headphone", "Headphones";
42 simple-audio-card,routing = 44 simple-audio-card,routing =
43 "Headphones", "HP_L", 45 "Headphones", "HP_L",
44 "Headphones", "HP_R"; 46 "Headphones", "HP_R";
45 simple-audio-card,mclk-fs = <256>; 47 simple-audio-card,mclk-fs = <256>;
46   48  
47 simple-audio-card,cpu { 49 simple-audio-card,cpu {
48 sound-dai = <&i2s>; 50 sound-dai = <&i2s>;
49 }; 51 };
50   52  
51 dailink0_master: simple-audio-card,codec { 53 dailink0_master: simple-audio-card,codec {
52 sound-dai = <&codec>; 54 sound-dai = <&codec>;
53 }; 55 };
54 }; 56 };
55 }; 57 };
56   58  
57 &pinctrl { 59 &pinctrl {
58 state_default: pinctrl0 { 60 state_default: pinctrl0 {
59 gpio { 61 gpio {
60 ralink,group = "wdt", "uart1"; 62 ralink,group = "wdt", "uart1";
61 ralink,function = "gpio"; 63 ralink,function = "gpio";
62 }; 64 };
63 }; 65 };
64 }; 66 };
65   67  
66 &gpio1 { 68 &gpio1 {
67 status = "okay"; 69 status = "okay";
68 }; 70 };
69   71  
70 &i2c { 72 &i2c {
71 status = "okay"; 73 status = "okay";
72   74  
73 codec: wm8960@1a { 75 codec: wm8960@1a {
74 #sound-dai-cells = <0>; 76 #sound-dai-cells = <0>;
75 compatible = "wlf,wm8960"; 77 compatible = "wlf,wm8960";
76 reg = <0x1a>; 78 reg = <0x1a>;
77   79  
78 wlf,shared-lrclk; 80 wlf,shared-lrclk;
79 }; 81 };
80 }; 82 };
81   83  
82 &ethernet { 84 &ethernet {
83 mtd-mac-address = <&factory 0x4>; 85 mtd-mac-address = <&factory 0x4>;
84 }; 86 };
85   87  
86 &esw { 88 &esw {
87 mediatek,portmap = <0x3>; 89 mediatek,portmap = <0x3>;
88 mediatek,portdisable = <0x3c>; 90 mediatek,portdisable = <0x3c>;
89 }; 91 };
90   92  
91 &i2s { 93 &i2s {
92 #sound-dai-cells = <0>; 94 #sound-dai-cells = <0>;
93 status = "okay"; 95 status = "okay";
94 pinctrl-names = "default"; 96 pinctrl-names = "default";
95 pinctrl-0 = <&i2s_pins>, <&refclk_pins>; 97 pinctrl-0 = <&i2s_pins>, <&refclk_pins>;
96 }; 98 };
97   99  
98 &sdhci { 100 &sdhci {
99 status = "okay"; 101 status = "okay";
100 }; 102 };
101   103  
102 &gdma { 104 &gdma {
103 status = "okay"; 105 status = "okay";
104 }; 106 };
105   107  
106 &spi0 { 108 &spi0 {
107 status = "okay"; 109 status = "okay";
108   110  
109 m25p80@0 { 111 m25p80@0 {
-   112 #address-cells = <1>;
-   113 #size-cells = <1>;
110 compatible = "jedec,spi-nor"; 114 compatible = "jedec,spi-nor";
111 reg = <0>; 115 reg = <0>;
112 spi-max-frequency = <60000000>; 116 spi-max-frequency = <60000000>;
-   117 m25p,chunked-io = <32>;
113 m25p,fast-read; 118 m25p,fast-read;
114   -  
115 partitions { -  
116 compatible = "fixed-partitions"; -  
117 #address-cells = <1>; -  
118 #size-cells = <1>; -  
119   119  
120 partition@0 { 120 partition@0 {
121 label = "u-boot"; 121 label = "u-boot";
122 reg = <0x0 0x30000>; 122 reg = <0x0 0x30000>;
123 read-only; 123 read-only;
124 }; 124 };
125   125  
126 partition@30000 { 126 partition@30000 {
127 label = "u-boot-env"; 127 label = "u-boot-env";
128 reg = <0x30000 0x10000>; 128 reg = <0x30000 0x10000>;
129 read-only; 129 read-only;
130 }; 130 };
131   131  
132 factory: partition@40000 { 132 factory: partition@40000 {
133 label = "factory"; 133 label = "factory";
134 reg = <0x40000 0x10000>; 134 reg = <0x40000 0x10000>;
135 read-only; 135 read-only;
136 }; 136 };
137   137  
138 partition@50000 { -  
139 compatible = "denx,uimage"; 138 partition@50000 {
140 label = "firmware"; 139 label = "firmware";
141 reg = <0x50000 0x7b0000>; -  
142 }; 140 reg = <0x50000 0x7b0000>;
143 }; 141 };
144 }; 142 };
145 }; 143 };
146   144