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 "mt7620a.dtsi" 3 #include "mt7620a.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 = "planex,cs-qr10", "ralink,mt7620a-soc"; 9 compatible = "planex,cs-qr10", "ralink,mt7620a-soc";
10 model = "YUKAI Engineering BOCCO"; 10 model = "YUKAI Engineering BOCCO";
11   11  
12 keys { 12 gpio-keys-polled {
-   13 compatible = "gpio-keys-polled";
-   14 #address-cells = <1>;
13 compatible = "gpio-keys-polled"; 15 #size-cells = <0>;
14 poll-interval = <20>; 16 poll-interval = <20>;
15   17  
16 reset { 18 reset {
17 label = "reset"; 19 label = "reset";
18 gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; 20 gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
19 linux,code = <KEY_RESTART>; 21 linux,code = <KEY_RESTART>;
20 }; 22 };
21 }; 23 };
22   24  
23 gpio_export { 25 gpio_export {
24 compatible = "gpio-export"; 26 compatible = "gpio-export";
25 #size-cells = <0>; 27 #size-cells = <0>;
26   28  
27 s1 { 29 s1 {
28 gpio-export,name = "rec"; 30 gpio-export,name = "rec";
29 gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>; 31 gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
30 }; 32 };
31 s2 { 33 s2 {
32 gpio-export,name = "play"; 34 gpio-export,name = "play";
33 gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; 35 gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
34 }; 36 };
35 }; 37 };
36   38  
37 sound { 39 sound {
38 compatible = "simple-audio-card"; 40 compatible = "simple-audio-card";
39 simple-audio-card,name = "Audio-I2S"; 41 simple-audio-card,name = "Audio-I2S";
40 simple-audio-card,format = "i2s"; 42 simple-audio-card,format = "i2s";
41 simple-audio-card,bitclock-master = <&dailink0_master>; 43 simple-audio-card,bitclock-master = <&dailink0_master>;
42 simple-audio-card,frame-master = <&dailink0_master>; 44 simple-audio-card,frame-master = <&dailink0_master>;
43 simple-audio-card,widgets = 45 simple-audio-card,widgets =
44 "Headphone", "Headphones"; 46 "Headphone", "Headphones";
45 simple-audio-card,routing = 47 simple-audio-card,routing =
46 "Headphones", "HP_L", 48 "Headphones", "HP_L",
47 "Headphones", "HP_R"; 49 "Headphones", "HP_R";
48 simple-audio-card,mclk-fs = <256>; 50 simple-audio-card,mclk-fs = <256>;
49   51  
50 simple-audio-card,cpu { 52 simple-audio-card,cpu {
51 sound-dai = <&i2s>; 53 sound-dai = <&i2s>;
52 }; 54 };
53   55  
54 dailink0_master: simple-audio-card,codec { 56 dailink0_master: simple-audio-card,codec {
55 sound-dai = <&codec>; 57 sound-dai = <&codec>;
56 }; 58 };
57 }; 59 };
58 }; 60 };
59   61  
60 &gpio0 { 62 &gpio0 {
61 status = "okay"; 63 status = "okay";
62 }; 64 };
63   65  
64 &gpio1 { 66 &gpio1 {
65 status = "okay"; 67 status = "okay";
66 }; 68 };
67   69  
68 &gpio2 { 70 &gpio2 {
69 status = "okay"; 71 status = "okay";
70 }; 72 };
71   73  
72 &gpio3 { 74 &gpio3 {
73 status = "okay"; 75 status = "okay";
74 }; 76 };
75   77  
76 &i2c { 78 &i2c {
77 status = "okay"; 79 status = "okay";
78   80  
79 codec: wm8960@1a { 81 codec: wm8960@1a {
80 #sound-dai-cells = <0>; 82 #sound-dai-cells = <0>;
81 compatible = "wlf,wm8960"; 83 compatible = "wlf,wm8960";
82 reg = <0x1a>; 84 reg = <0x1a>;
83   85  
84 wlf,shared-lrclk; 86 wlf,shared-lrclk;
85 }; 87 };
86 }; 88 };
87   89  
88 &i2s { 90 &i2s {
89 #sound-dai-cells = <0>; 91 #sound-dai-cells = <0>;
90 status = "okay"; 92 status = "okay";
91 pinctrl-names = "default"; 93 pinctrl-names = "default";
92 pinctrl-0 = <&pcm_i2s_pins>; 94 pinctrl-0 = <&pcm_i2s_pins>;
93 }; 95 };
94   96  
95 &spi0 { 97 &spi0 {
96 status = "okay"; 98 status = "okay";
97   99  
98 m25p80@0 { 100 m25p80@0 {
-   101 #address-cells = <1>;
-   102 #size-cells = <1>;
99 compatible = "jedec,spi-nor"; 103 compatible = "jedec,spi-nor";
100 reg = <0>; 104 reg = <0>;
101 spi-max-frequency = <10000000>; 105 spi-max-frequency = <10000000>;
102   -  
103 partitions { -  
104 compatible = "fixed-partitions"; -  
105 #address-cells = <1>; -  
106 #size-cells = <1>; -  
107   106  
108 partition@0 { 107 partition@0 {
109 label = "u-boot"; 108 label = "u-boot";
110 reg = <0x0 0x30000>; 109 reg = <0x0 0x30000>;
111 read-only; 110 read-only;
112 }; 111 };
113   112  
114 partition@30000 { 113 partition@30000 {
115 label = "u-boot-env"; 114 label = "u-boot-env";
116 reg = <0x30000 0x10000>; 115 reg = <0x30000 0x10000>;
117 read-only; 116 read-only;
118 }; 117 };
119   118  
120 factory: partition@40000 { 119 factory: partition@40000 {
121 label = "factory"; 120 label = "factory";
122 reg = <0x40000 0x10000>; 121 reg = <0x40000 0x10000>;
123 read-only; 122 read-only;
124 }; 123 };
125   124  
126 partition@50000 { -  
127 compatible = "denx,uimage"; 125 partition@50000 {
128 label = "firmware"; 126 label = "firmware";
129 reg = <0x50000 0x7b0000>; -  
130 }; 127 reg = <0x50000 0x7b0000>;
131 }; 128 };
132 }; 129 };
133 }; 130 };
134   131  
135 &pcm { 132 &pcm {
136 status = "okay"; 133 status = "okay";
137 }; 134 };
138   135  
139 &gdma { 136 &gdma {
140 status = "okay"; 137 status = "okay";
141 }; 138 };
142   139  
143 &pinctrl { 140 &pinctrl {
144 state_default: pinctrl0 { 141 state_default: pinctrl0 {
145 gpio { 142 gpio {
146 ralink,group = "spi refclk", "rgmii1"; 143 ralink,group = "spi refclk", "rgmii1";
147 ralink,function = "gpio"; 144 ralink,function = "gpio";
148 }; 145 };
149 }; 146 };
150 }; 147 };
151   148  
152 &ethernet { 149 &ethernet {
153 pinctrl-names = "default"; 150 pinctrl-names = "default";
154 pinctrl-0 = <&ephy_pins>; 151 pinctrl-0 = <&ephy_pins>;
155 mtd-mac-address = <&factory 0x4>; 152 mtd-mac-address = <&factory 0x4>;
156 mediatek,portmap = "llllw"; 153 mediatek,portmap = "llllw";
157 }; 154 };
158   155  
159 &gsw { 156 &gsw {
160 ralink,port4 = "ephy"; 157 ralink,port4 = "ephy";
161 }; 158 };
162   159  
163 &wmac { 160 &wmac {
164 ralink,mtd-eeprom = <&factory 0>; 161 ralink,mtd-eeprom = <&factory 0>;
165 }; 162 };
166   163