OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Only display areas with differences – Ignore whitespace
Rev 2 Rev 3
1 #include "rt5350.dtsi" 1 #include "rt5350.dtsi"
2   2  
3 #include <dt-bindings/gpio/gpio.h> 3 #include <dt-bindings/gpio/gpio.h>
4   4  
5 / { 5 / {
6 compatible = "nixcore,x1", "ralink,rt5350-soc"; 6 compatible = "nixcore,x1", "ralink,rt5350-soc";
7   7  
8 chosen { 8 chosen {
9 bootargs = "console=ttyS1,57600"; 9 bootargs = "console=ttyS1,57600";
10 }; 10 };
11   11  
12 gpio-export { 12 gpio-export {
13 compatible = "gpio-export"; 13 compatible = "gpio-export";
14 #size-cells = <0>; 14 #size-cells = <0>;
15   15  
16 gpio0 { 16 gpio0 {
17 gpio-export,name = "gpio0"; 17 gpio-export,name = "gpio0";
18 gpio-export,direction_may_change = <1>; 18 gpio-export,direction_may_change = <1>;
19 gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>; 19 gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
20 }; 20 };
21   21  
22 gpio1 { 22 gpio1 {
23 gpio-export,name = "gpio1"; 23 gpio-export,name = "gpio1";
24 gpio-export,direction_may_change = <1>; 24 gpio-export,direction_may_change = <1>;
25 gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; 25 gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
26 }; 26 };
27   27  
28 /* GPIOs 1-6 are I2C,SPI */ 28 /* GPIOs 1-6 are I2C,SPI */
29 /* GPIO 7-14 are uart1 */ 29 /* GPIO 7-14 are uart1 */
30 /* GPIOs 15 & 16 are uart2 */ 30 /* GPIOs 15 & 16 are uart2 */
31 /* JTAG */ 31 /* JTAG */
32   32  
33 gpio17 { 33 gpio17 {
34 /* JTAG_TDO */ 34 /* JTAG_TDO */
35 gpio-export,name = "gpio17"; 35 gpio-export,name = "gpio17";
36 gpio-export,direction_may_change = <1>; 36 gpio-export,direction_may_change = <1>;
37 gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; 37 gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
38 }; 38 };
39   39  
40 gpio18 { 40 gpio18 {
41 /* JTAG_TDI */ 41 /* JTAG_TDI */
42 gpio-export,name = "gpio18"; 42 gpio-export,name = "gpio18";
43 gpio-export,direction_may_change = <1>; 43 gpio-export,direction_may_change = <1>;
44 gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>; 44 gpios = <&gpio0 18 GPIO_ACTIVE_HIGH>;
45 }; 45 };
46   46  
47 gpio19 { 47 gpio19 {
48 /* JTAG_TMS */ 48 /* JTAG_TMS */
49 gpio-export,name = "gpio19"; 49 gpio-export,name = "gpio19";
50 gpio-export,direction_may_change = <1>; 50 gpio-export,direction_may_change = <1>;
51 gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>; 51 gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
52 }; 52 };
53   53  
54 gpio20 { 54 gpio20 {
55 /* JTAG_TCLK */ 55 /* JTAG_TCLK */
56 gpio-export,name = "gpio20"; 56 gpio-export,name = "gpio20";
57 gpio-export,direction_may_change = <1>; 57 gpio-export,direction_may_change = <1>;
58 gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; 58 gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
59 }; 59 };
60   60  
61 gpio21 { 61 gpio21 {
62 /* JTAG_TRST_N */ 62 /* JTAG_TRST_N */
63 gpio-export,name = "gpio21"; 63 gpio-export,name = "gpio21";
64 gpio-export,direction_may_change = <1>; 64 gpio-export,direction_may_change = <1>;
65 gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>; 65 gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
66 }; 66 };
67   67  
68 /* ETH LEDs */ 68 /* ETH LEDs */
69 /* 69 /*
70 gpio22 { 70 gpio22 {
71 gpio-export,name = "gpio22"; 71 gpio-export,name = "gpio22";
72 gpio-export,direction_may_change = <1>; 72 gpio-export,direction_may_change = <1>;
73 gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; 73 gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
74 }; 74 };
75   75  
76 gpio23 { 76 gpio23 {
77 gpio-export,name = "gpio23"; 77 gpio-export,name = "gpio23";
78 gpio-export,direction_may_change = <1>; 78 gpio-export,direction_may_change = <1>;
79 gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>; 79 gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
80 }; 80 };
81   81  
82 gpio24 { 82 gpio24 {
83 gpio-export,name = "gpio24"; 83 gpio-export,name = "gpio24";
84 gpio-export,direction_may_change = <1>; 84 gpio-export,direction_may_change = <1>;
85 gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>; 85 gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
86 }; 86 };
87   87  
88 gpio25 { 88 gpio25 {
89 gpio-export,name = "gpio25"; 89 gpio-export,name = "gpio25";
90 gpio-export,direction_may_change = <1>; 90 gpio-export,direction_may_change = <1>;
91 gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>; 91 gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
92 }; 92 };
93   93  
94 */ 94 */
95 gpio26 { 95 gpio26 {
96 /* ETH4_LED */ 96 /* ETH4_LED */
97 gpio-export,name = "gpio26"; 97 gpio-export,name = "gpio26";
98 gpio-export,direction_may_change = <1>; 98 gpio-export,direction_may_change = <1>;
99 gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; 99 gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
100 }; 100 };
101   101  
102 gpio27 { 102 gpio27 {
103 /* spi_cs1 */ 103 /* spi_cs1 */
104 gpio-export,name = "gpio27"; 104 gpio-export,name = "gpio27";
105 gpio-export,direction_may_change = <1>; 105 gpio-export,direction_may_change = <1>;
106 gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; 106 gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
107 }; 107 };
108 }; 108 };
109 }; 109 };
110   110  
111 &gpio0 { 111 &gpio0 {
112 status = "okay"; 112 status = "okay";
113 }; 113 };
114   114  
115 &gpio1 { 115 &gpio1 {
116 status = "okay"; 116 status = "okay";
117 }; 117 };
118   118  
119 &i2c { 119 &i2c {
120 status = "okay"; 120 status = "okay";
121 }; 121 };
122   122  
123 &uart { 123 &uart {
124 status = "okay"; 124 status = "okay";
125 reset-names = "gpio uartf"; 125 reset-names = "gpio uartf";
126 }; 126 };
127   127  
128 &pinctrl { 128 &pinctrl {
129 state_default: pinctrl0 { 129 state_default: pinctrl0 {
130 gpio { 130 gpio {
131 ralink,group = "jtag", "led", "spi_cs1"; 131 ralink,group = "jtag", "led", "spi_cs1";
132 ralink,function = "gpio"; 132 ralink,function = "gpio";
133 }; 133 };
134 }; 134 };
135 }; 135 };
136   136  
137 &ethernet { 137 &ethernet {
138 mtd-mac-address = <&factory 0x4>; 138 mtd-mac-address = <&factory 0x4>;
139 }; 139 };
140   140  
141 &esw { 141 &esw {
142 mediatek,portmap = <0x17>; 142 mediatek,portmap = <0x17>;
143 }; 143 };
144   144  
145 &wmac { 145 &wmac {
146 ralink,mtd-eeprom = <&factory 0>; 146 ralink,mtd-eeprom = <&factory 0>;
147 }; 147 };
148   148  
149 &ehci { 149 &ehci {
150 status = "okay"; 150 status = "okay";
151 }; 151 };
152   152  
153 &ohci { 153 &ohci {
154 status = "okay"; 154 status = "okay";
155 }; 155 };
156   156