ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi

A lot of device setup is shared between DNS-320 and DNS-325, move the definitions into a common include. Signed-off-by: Jamie Lentin <jm@lentin.co.uk> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
author: Jamie Lentin <jm@lentin.co.uk> 2012-07-19 16:30:59 -0400
committer: Andrew Lunn <andrew@lunn.ch> 2012-07-27 10:49:53 -0400
commit: 5b60c1453d8cf1ac39e897878cfc090181d9a229 (patch)
tree: 624a240ecf7440d7705e41a103e206d0dba0151d
parent: 09059e9f29d6167511b8df0f6518e8a0b1bd4c70 (diff)
3 files changed, 50 insertions, 82 deletions
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index 9368382eac2b..5bb0bf39d3b8 100644
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
-/include/ "kirkwood.dtsi"
+/include/ "kirkwood-dnskw.dtsi"
 / {
        model = "D-Link DNS-320 NAS (Rev A1)";
@@ -50,45 +50,5 @@
                        clock-frequency = <166666667>;
                        status = "okay";
                };
-                sata@80000 {
-                        status = "okay";
-                        nr-ports = <2>;
-                };
-                nand@3000000 {
-                        status = "okay";
-                        partition@0 {
-                                label = "u-boot";
-                                reg = <0x0000000 0x100000>;
-                                read-only;
-                        };
-                        partition@100000 {
-                                label = "uImage";
-                                reg = <0x0100000 0x500000>;
-                        };
-                        partition@600000 {
-                                label = "ramdisk";
-                                reg = <0x0600000 0x500000>;
-                        };
-                        partition@b00000 {
-                                label = "image";
-                                reg = <0x0b00000 0x6600000>;
-                        };
-                        partition@7100000 {
-                                label = "mini firmware";
-                                reg = <0x7100000 0xa00000>;
-                        };
-                        partition@7b00000 {
-                                label = "config";
-                                reg = <0x7b00000 0x500000>;
-                        };
-                };
        };
 };
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
index a24597044d5f..d430713ea9b9 100644
--- a/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
-/include/ "kirkwood.dtsi"
+/include/ "kirkwood-dnskw.dtsi"
 / {
        model = "D-Link DNS-325 NAS (Rev A1)";
@@ -53,45 +53,5 @@
                        clock-frequency = <200000000>;
                        status = "okay";
                };
-                sata@80000 {
-                        status = "okay";
-                        nr-ports = <2>;
-                };
-                nand@3000000 {
-                        status = "okay";
-                        partition@0 {
-                                label = "u-boot";
-                                reg = <0x0000000 0x100000>;
-                                read-only;
-                        };
-                        partition@100000 {
-                                label = "uImage";
-                                reg = <0x0100000 0x500000>;
-                        };
-                        partition@600000 {
-                                label = "ramdisk";
-                                reg = <0x0600000 0x500000>;
-                        };
-                        partition@b00000 {
-                                label = "image";
-                                reg = <0x0b00000 0x6600000>;
-                        };
-                        partition@7100000 {
-                                label = "mini firmware";
-                                reg = <0x7100000 0xa00000>;
-                        };
-                        partition@7b00000 {
-                                label = "config";
-                                reg = <0x7b00000 0x500000>;
-                        };
-                };
        };
 };
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
new file mode 100644
index 000000000000..067672cff320
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -0,0 +1,48 @@
+/include/ "kirkwood.dtsi"
+/ {
+        model = "D-Link DNS NASes (kirkwood-based)";
+        compatible = "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
+        ocp@f1000000 {
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+                nand@3000000 {
+                        status = "okay";
+                        partition@0 {
+                                label = "u-boot";
+                                reg = <0x0000000 0x100000>;
+                                read-only;
+                        };
+                        partition@100000 {
+                                label = "uImage";
+                                reg = <0x0100000 0x500000>;
+                        };
+                        partition@600000 {
+                                label = "ramdisk";
+                                reg = <0x0600000 0x500000>;
+                        };
+                        partition@b00000 {
+                                label = "image";
+                                reg = <0x0b00000 0x6600000>;
+                        };
+                        partition@7100000 {
+                                label = "mini firmware";
+                                reg = <0x7100000 0xa00000>;
+                        };
+                        partition@7b00000 {
+                                label = "config";
+                                reg = <0x7b00000 0x500000>;
+                        };
+                };
+        };
+};
author	Jamie Lentin <jm@lentin.co.uk>	2012-07-19 16:30:59 -0400
committer	Andrew Lunn <andrew@lunn.ch>	2012-07-27 10:49:53 -0400
commit	5b60c1453d8cf1ac39e897878cfc090181d9a229 (patch)
tree	624a240ecf7440d7705e41a103e206d0dba0151d
parent	09059e9f29d6167511b8df0f6518e8a0b1bd4c70 (diff)

diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts index 9368382eac2b..5bb0bf39d3b8 100644 --- a/arch/arm/boot/dts/kirkwood-dns320.dts +++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -1,6 +1,6 @@
1	/dts-v1/;	1	/dts-v1/;
2		2
3	/include/ "kirkwood.dtsi"	3	/include/ "kirkwood-dnskw.dtsi"
4		4
5	/ {	5	/ {
6	model = "D-Link DNS-320 NAS (Rev A1)";	6	model = "D-Link DNS-320 NAS (Rev A1)";
@@ -50,45 +50,5 @@
50	clock-frequency = <166666667>;	50	clock-frequency = <166666667>;
51	status = "okay";	51	status = "okay";
52	};	52	};
53
54	sata@80000 {
55	status = "okay";
56	nr-ports = <2>;
57	};
58
59	nand@3000000 {
60	status = "okay";
61
62	partition@0 {
63	label = "u-boot";
64	reg = <0x0000000 0x100000>;
65	read-only;
66	};
67
68	partition@100000 {
69	label = "uImage";
70	reg = <0x0100000 0x500000>;
71	};
72
73	partition@600000 {
74	label = "ramdisk";
75	reg = <0x0600000 0x500000>;
76	};
77
78	partition@b00000 {
79	label = "image";
80	reg = <0x0b00000 0x6600000>;
81	};
82
83	partition@7100000 {
84	label = "mini firmware";
85	reg = <0x7100000 0xa00000>;
86	};
87
88	partition@7b00000 {
89	label = "config";
90	reg = <0x7b00000 0x500000>;
91	};
92	};
93	};	53	};
94	};	54	};


diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts index a24597044d5f..d430713ea9b9 100644 --- a/arch/arm/boot/dts/kirkwood-dns325.dts +++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -1,6 +1,6 @@
1	/dts-v1/;	1	/dts-v1/;
2		2
3	/include/ "kirkwood.dtsi"	3	/include/ "kirkwood-dnskw.dtsi"
4		4
5	/ {	5	/ {
6	model = "D-Link DNS-325 NAS (Rev A1)";	6	model = "D-Link DNS-325 NAS (Rev A1)";
@@ -53,45 +53,5 @@
53	clock-frequency = <200000000>;	53	clock-frequency = <200000000>;
54	status = "okay";	54	status = "okay";
55	};	55	};
56
57	sata@80000 {
58	status = "okay";
59	nr-ports = <2>;
60	};
61
62	nand@3000000 {
63	status = "okay";
64
65	partition@0 {
66	label = "u-boot";
67	reg = <0x0000000 0x100000>;
68	read-only;
69	};
70
71	partition@100000 {
72	label = "uImage";
73	reg = <0x0100000 0x500000>;
74	};
75
76	partition@600000 {
77	label = "ramdisk";
78	reg = <0x0600000 0x500000>;
79	};
80
81	partition@b00000 {
82	label = "image";
83	reg = <0x0b00000 0x6600000>;
84	};
85
86	partition@7100000 {
87	label = "mini firmware";
88	reg = <0x7100000 0xa00000>;
89	};
90
91	partition@7b00000 {
92	label = "config";
93	reg = <0x7b00000 0x500000>;
94	};
95	};
96	};	56	};
97	};	57	};


diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi new file mode 100644 index 000000000000..067672cff320 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -0,0 +1,48 @@
		1	/include/ "kirkwood.dtsi"
		2
		3	/ {
		4	model = "D-Link DNS NASes (kirkwood-based)";
		5	compatible = "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";
		6
		7	ocp@f1000000 {
		8	sata@80000 {
		9	status = "okay";
		10	nr-ports = <2>;
		11	};
		12
		13	nand@3000000 {
		14	status = "okay";
		15
		16	partition@0 {
		17	label = "u-boot";
		18	reg = <0x0000000 0x100000>;
		19	read-only;
		20	};
		21
		22	partition@100000 {
		23	label = "uImage";
		24	reg = <0x0100000 0x500000>;
		25	};
		26
		27	partition@600000 {
		28	label = "ramdisk";
		29	reg = <0x0600000 0x500000>;
		30	};
		31
		32	partition@b00000 {
		33	label = "image";
		34	reg = <0x0b00000 0x6600000>;
		35	};
		36
		37	partition@7100000 {
		38	label = "mini firmware";
		39	reg = <0x7100000 0xa00000>;
		40	};
		41
		42	partition@7b00000 {
		43	label = "config";
		44	reg = <0x7b00000 0x500000>;
		45	};
		46	};
		47	};
		48	};