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 "bcm6368.dtsi" 3 #include "bcm6368.dtsi"
4   4  
5 #include <dt-bindings/input/input.h> 5 #include <dt-bindings/input/input.h>
6   6  
7 / { 7 / {
8 model = "Actiontec R1000H"; 8 model = "Actiontec R1000H";
9 compatible = "actiontec,r1000h", "brcm,bcm6368"; 9 compatible = "actiontec,r1000h", "brcm,bcm6368";
10   10  
11 chosen { 11 chosen {
12 bootargs = "rootfstype=squashfs noinitrd console=ttyS0,115200"; 12 bootargs = "rootfstype=squashfs noinitrd console=ttyS0,115200";
13 stdout-path = "serial0:115200n8"; 13 stdout-path = "serial0:115200n8";
14 }; 14 };
15   15  
16 keys { 16 gpio-keys-polled {
17 compatible = "gpio-keys-polled"; 17 compatible = "gpio-keys-polled";
18 #address-cells = <1>; 18 #address-cells = <1>;
19 #size-cells = <0>; 19 #size-cells = <0>;
20 poll-interval = <20>; 20 poll-interval = <20>;
-   21 debounce-interval = <60>;
21   22  
22 reset { 23 reset {
23 label = "reset"; 24 label = "reset";
24 gpios = <&pinctrl 34 1>; 25 gpios = <&pinctrl 34 1>;
25 linux,code = <KEY_RESTART>; 26 linux,code = <KEY_RESTART>;
26 debounce-interval = <60>; -  
27 }; 27 };
28   28  
29 wps { 29 wps {
30 label = "wps"; 30 label = "wps";
31 gpios = <&pinctrl 35 1>; 31 gpios = <&pinctrl 35 1>;
32 linux,code = <KEY_WPS_BUTTON>; 32 linux,code = <KEY_WPS_BUTTON>;
33 debounce-interval = <60>; -  
34 }; 33 };
35 }; 34 };
36   35  
37 leds { 36 gpio-leds {
38 compatible = "gpio-leds"; 37 compatible = "gpio-leds";
39   38  
40 inet_green { 39 inet_green {
41 label = "R1000H:green:inet"; 40 label = "R1000H:green:inet";
42 gpios = <&pinctrl 5 0>; 41 gpios = <&pinctrl 5 0>;
43 }; 42 };
44   43  
45 usb_green { 44 usb_green {
46 label = "R1000H:green:usb"; 45 label = "R1000H:green:usb";
47 gpios = <&pinctrl 21 1>; 46 gpios = <&pinctrl 21 1>;
48 }; 47 };
49   48  
50 power_green { 49 power_green {
51 label = "R1000H:green:power"; 50 label = "R1000H:green:power";
52 gpios = <&pinctrl 22 0>; 51 gpios = <&pinctrl 22 0>;
53 default-state = "on"; 52 default-state = "on";
54 }; 53 };
55   54  
56 wps_green { 55 wps_green {
57 label = "R1000H:green:wps"; 56 label = "R1000H:green:wps";
58 gpios = <&pinctrl 23 1>; 57 gpios = <&pinctrl 23 1>;
59 }; 58 };
60   59  
61 power_red { 60 power_red {
62 label = "R1000H:red:power"; 61 label = "R1000H:red:power";
63 gpios = <&pinctrl 24 0>; 62 gpios = <&pinctrl 24 0>;
64 }; 63 };
65   64  
66 wps_red { 65 wps_red {
67 label = "R1000H:red:wps"; 66 label = "R1000H:red:wps";
68 gpios = <&pinctrl 30 1>; 67 gpios = <&pinctrl 30 1>;
69 }; 68 };
70   69  
71 inet_red { 70 inet_red {
72 label = "R1000H:red:inet"; 71 label = "R1000H:red:inet";
73 gpios = <&pinctrl 31 0>; 72 gpios = <&pinctrl 31 0>;
74 }; 73 };
75 }; 74 };
76 }; 75 };
77   76  
78 &pflash { 77 &pflash {
79 status = "ok"; 78 status = "ok";
-   79  
-   80 linux,part-probe = "bcm63xxpart";
80   81  
81 partitions { 82 partitions {
82 compatible = "fixed-partitions"; 83 compatible = "fixed-partitions";
83 #address-cells = <1>; 84 #address-cells = <1>;
84 #size-cells = <1>; 85 #size-cells = <1>;
85   86  
86 CFE@0 { 87 CFE@0 {
87 reg = <0x000000 0x020000>; 88 reg = <0x000000 0x020000>;
88 read-only; 89 read-only;
89 }; 90 };
90   91  
91 linux@20000 { 92 linux@20000 {
92 reg = <0x020000 0x1fc0000>; 93 reg = <0x020000 0x1fc0000>;
93 compatible = "brcm,bcm963xx-imagetag"; 94 compatible = "brcm,bcm963xx-imagetag";
94 }; 95 };
95   96  
96 nvram@1fe0000 { 97 nvram@1fe0000 {
97 reg = <0x1fe0000 0x20000>; 98 reg = <0x1fe0000 0x20000>;
98 }; 99 };
99 }; 100 };
100 }; 101 };
101   102  
102 &uart0 { 103 &uart0 {
103 status = "ok"; 104 status = "ok";
104 }; 105 };
105   106  
106 &uart1 { 107 &uart1 {
107 status = "ok"; 108 status = "ok";
108 }; 109 };
109   110