aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSimon Guinot <simon.guinot@sequanux.org>2013-04-08 18:41:29 -0400
committerJason Cooper <jason@lakedaemon.net>2013-04-10 14:16:25 -0400
commitd3dde4df4483cefc614317a2ae550b20ef29f58c (patch)
tree7f93b72e8f3cc5915bfa26f9cfff57f8387a7f13 /arch
parent98d4f2acb91ac4a839eab6b92f02f57986af2197 (diff)
ARM: Kirkwood: update Network Space Mini v2 description
LaCie has released two products under the CloudBox name. The netspace_mini_v2 machine is embedded in the oldest product. The cloudbox machine is embedded in the newest one. In order to allow a CloudBox user to select the right machine support, this patch adds some informations to the netspace_mini_v2 Kconfig description. A comment is also added to the dts file. Signed-off-by: Simon Guinot <simon.guinot@sequanux.org> Acked-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/kirkwood-ns2mini.dts1
-rw-r--r--arch/arm/mach-kirkwood/Kconfig8
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts b/arch/arm/boot/dts/kirkwood-ns2mini.dts
index b79f5eb25589..adab1ab25733 100644
--- a/arch/arm/boot/dts/kirkwood-ns2mini.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts
@@ -3,6 +3,7 @@
3/include/ "kirkwood-ns2-common.dtsi" 3/include/ "kirkwood-ns2-common.dtsi"
4 4
5/ { 5/ {
6 /* This machine is embedded in the first LaCie CloudBox product. */
6 model = "LaCie Network Space Mini v2"; 7 model = "LaCie Network Space Mini v2";
7 compatible = "lacie,netspace_mini_v2", "marvell,kirkwood-88f6192", "marvell,kirkwood"; 8 compatible = "lacie,netspace_mini_v2", "marvell,kirkwood-88f6192", "marvell,kirkwood";
8 9
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index 45ab2f51a9a0..7509a89af967 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -258,8 +258,12 @@ config MACH_NETSPACE_MINI_V2_DT
258 select ARCH_KIRKWOOD_DT 258 select ARCH_KIRKWOOD_DT
259 help 259 help
260 Say 'Y' here if you want your kernel to support the LaCie 260 Say 'Y' here if you want your kernel to support the LaCie
261 Network Space Mini v2 NAS (aka SafeBox), using Flattened 261 Network Space Mini v2 NAS using Flattened Device Tree.
262 Device Tree. 262
263 This board is embedded in a product named CloudBox, which
264 provides automatic backup on a 100GB cloud storage. This
265 should not confused with a more recent LaCie NAS also named
266 CloudBox. For this last, the disk capacity is 1TB or above.
263 267
264config MACH_NETSPACE_V2_DT 268config MACH_NETSPACE_V2_DT
265 bool "LaCie Network Space v2 NAS (Flattened Device Tree)" 269 bool "LaCie Network Space v2 NAS (Flattened Device Tree)"