OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 25... Line 25...
25 led-running = &status; 25 led-running = &status;
26 led-upgrade = &status; 26 led-upgrade = &status;
27 }; 27 };
Line 28... Line 28...
28   28  
29 chosen { 29 chosen {
30 stdout-path = "/plb/opb/serial@ef600400"; 30 linux,stdout-path = "/plb/opb/serial@ef600400";
-   31 };
31 }; 32  
Line 32... Line 33...
32 }; 33 };
33   34  
Line 48... Line 49...
48 /* Ikarem has 32MB of NAND */ 49 /* Ikarem has 32MB of NAND */
49 ndfc@1,0 { 50 ndfc@1,0 {
50 status = "okay"; 51 status = "okay";
51 /* 32 MiB NAND Flash */ 52 /* 32 MiB NAND Flash */
52 nand { 53 nand {
-   54 #address-cells = <1>;
-   55 #size-cells = <1>;
-   56  
53 partition@0 { 57 partition@0 {
54 label = "u-boot"; 58 label = "u-boot";
55 reg = <0x00000000 0x00150000>; 59 reg = <0x00000000 0x00170000>;
56 read-only; -  
57 }; -  
58   -  
59 partition@150000 { -  
60 /* -  
61 * The u-boot environment size is one NAND -  
62 * block (16KiB). u-boot allocates four NAND -  
63 * blocks (64KiB) in order to have spares -  
64 * around for bad block management -  
65 */ -  
66 label = "u-boot-env"; -  
67 reg = <0x00150000 0x00010000>; -  
68 read-only; -  
69 }; -  
70   -  
71 partition@160000 { -  
72 /* -  
73 * redundant u-boot environment. -  
74 * has to be kept it in sync with the -  
75 * data in "u-boot-env". -  
76 */ -  
77 label = "u-boot-env-redundant"; -  
78 reg = <0x00160000 0x00010000>; -  
79 read-only; 60 read-only;
80 }; 61 };
Line 81... Line 62...
81   62  
82 partition@170000 { 63 partition@170000 {
Line 113... Line 94...
113 phy-map = <0x2>; 94 phy-map = <0x2>;
114 phy-address = <0x1>; 95 phy-address = <0x1>;
115 phy-handle = <&phy>; 96 phy-handle = <&phy>;
Line 116... Line 97...
116   97  
117 mdio { -  
118 #address-cells = <1>; -  
119 #size-cells = <0>; -  
120   98 mdio {
121 phy: phy@1 { 99 phy: phy@1 {
122 compatible = "ethernet-phy-ieee802.3-c22"; 100 compatible = "ethernet-phy-ieee802.3-c22";
123 reg = <1>; 101 reg = <1>;
124 }; 102 };
125 }; 103 };
Line 126... Line 104...
126 }; 104 };
127   105  
128 &POB0 { 106 &POB0 {
Line 129... Line 107...
129 leds { 107 gpio-leds {
130 compatible = "gpio-leds"; 108 compatible = "gpio-leds";
131   109  
Line 163... Line 141...
163 label = "mr24:green:wifi4"; 141 label = "mr24:green:wifi4";
164 gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>; 142 gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
165 }; 143 };
166 }; 144 };
Line 167... Line 145...
167   145  
168 keys { 146 gpio_keys_polled {
169 compatible = "gpio-keys-polled"; 147 compatible = "gpio-keys-polled";
170 #address-cells = <1>; 148 #address-cells = <1>;
171 #size-cells = <0>; 149 #size-cells = <0>;
172 poll-interval = <60>; /* 3 * 20 = 60ms */ 150 poll-interval = <60>; /* 3 * 20 = 60ms */
Line 173... Line 151...
173 autorepeat; 151 autorepeat;
174   -  
175 reset { 152  
176 /* Label as per Meraki's "MR24 Installation Guide" */ 153 button@1 {
177 label = "Factory Reset Button"; 154 label = "Reset button";
178 linux,code = <KEY_RESTART>; 155 linux,code = <KEY_RESTART>;
179 gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>; 156 gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>;
180 }; 157 };