kirkwood: switch to 3.14
[openwrt.git] / target / linux / kirkwood / patches-3.10 / 110-ib62x0.patch
1 --- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
2 +++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
3 @@ -5,7 +5,7 @@
4  
5  / {
6         model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
7 -       compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0",  "marvell,kirkwood-88f6281", "marvell,kirkwood";
8 +       compatible = "raidsonic,ib-nas6210-b", "raidsonic,ib-nas6220-b", "raidsonic,ib-nas6210", "raidsonic,ib-nas6220", "raidsonic,ib-nas62x0", "marvell,kirkwood-88f6281", "marvell,kirkwood";
9  
10         memory {
11                 device_type = "memory";
12 @@ -50,6 +50,7 @@
13                                 marvell,function = "gpio";
14                         };
15                 };
16 +
17                 serial@12000 {
18                         status = "okay";
19                 };
20 @@ -64,19 +65,23 @@
21  
22                         partition@0 {
23                                 label = "u-boot";
24 -                               reg = <0x0000000 0x100000>;
25 +                               reg = <0x0000000 0xe0000>;
26 +                       };
27 +
28 +                       partition@e0000 {
29 +                               label = "u-boot environment";
30 +                               reg = <0xe0000 0x100000>;
31                         };
32  
33                         partition@100000 {
34 -                               label = "uImage";
35 -                               reg = <0x0100000 0x600000>;
36 +                               label = "second stage u-boot";
37 +                               reg = <0x100000 0x200000>;
38                         };
39  
40 -                       partition@700000 {
41 +                       partition@200000 {
42                                 label = "root";
43 -                               reg = <0x0700000 0xf900000>;
44 +                               reg = <0x200000 0xfe00000>;
45                         };
46 -
47                 };
48         };
49  
50 @@ -84,6 +89,7 @@
51                 compatible = "gpio-keys";
52                 #address-cells = <1>;
53                 #size-cells = <0>;
54 +
55                 button@1 {
56                         label = "USB Copy";
57                         linux,code = <133>;
58 @@ -95,6 +101,7 @@
59                         gpios = <&gpio0 28 1>;
60                 };
61         };
62 +
63         gpio-leds {
64                 compatible = "gpio-leds";
65  
66 @@ -112,12 +119,11 @@
67                         gpios = <&gpio0 27 0>;
68                 };
69         };
70 +
71         gpio_poweroff {
72                 compatible = "gpio-poweroff";
73                 gpios = <&gpio0 24 0>;
74         };
75 -
76 -
77  };
78  
79  &mdio {
80 @@ -131,6 +137,7 @@
81  
82  &eth0 {
83         status = "okay";
84 +
85         ethernet0-port@0 {
86                 phy-handle = <&ethphy0>;
87         };