kirkwood: update patches and configuration (3.10)
[openwrt/svn-archive/archive.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,18 @@
21
22 partition@0 {
23 label = "u-boot";
24 - reg = <0x0000000 0x100000>;
25 + reg = <0x0000000 0xe0000>;
26 };
27
28 - partition@100000 {
29 - label = "uImage";
30 - reg = <0x0100000 0x600000>;
31 + partition@e0000 {
32 + label = "u-boot environment";
33 + reg = <0xe0000 0x100000>;
34 };
35
36 - partition@700000 {
37 - label = "root";
38 - reg = <0x0700000 0xf900000>;
39 + partition@100000 {
40 + label = "rootfs";
41 + reg = <0x100000 0xff00000>;
42 };
43 -
44 };
45 };
46
47 @@ -84,6 +84,7 @@
48 compatible = "gpio-keys";
49 #address-cells = <1>;
50 #size-cells = <0>;
51 +
52 button@1 {
53 label = "USB Copy";
54 linux,code = <133>;
55 @@ -95,6 +96,7 @@
56 gpios = <&gpio0 28 1>;
57 };
58 };
59 +
60 gpio-leds {
61 compatible = "gpio-leds";
62
63 @@ -112,12 +114,11 @@
64 gpios = <&gpio0 27 0>;
65 };
66 };
67 +
68 gpio_poweroff {
69 compatible = "gpio-poweroff";
70 gpios = <&gpio0 24 0>;
71 };
72 -
73 -
74 };
75
76 &mdio {
77 @@ -131,6 +132,7 @@
78
79 &eth0 {
80 status = "okay";
81 +
82 ethernet0-port@0 {
83 phy-handle = <&ethphy0>;
84 };