Add DT support for Network Space v2 and parents

arch/arm/mach-kirkwood/Kconfig +10 -0

index 50bca50..847e0c2 100644
@@ -130,6 +130,27 @@ config MACH_KM_KIRKWOOD_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
+config MACH_INETSPACE_V2_DT
+	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Internet Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_V2_DT
+	bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT

Same here. I actually think this is a table that is no longer needed -- the board compat can/should be done on the generic compatible string instead of for each most-specific board string.

arch/arm/mach-kirkwood/board-ns2.c line 66

Quoted 4 lines

arch/arm/mach-kirkwood/board-ns2.c new file +4 -0

+static void ns2_power_off(void)
+{
+	gpio_set_value(NS2_GPIO_POWER_OFF, 1);
+}

This kind of thing should be possible to generalize through a generic binding.

Hi Olof

We are getting near to having boards fully described in DT. The last major piece we are missing is a DT binding for the Ethernet driver. Once that is in we can remove many of these per-board files and C code in board-dt.c. However, this is not going to happen before this merge window :-(

Quoted 10 lines

Same here. I actually think this is a table that is no longer needed -- the board compat can/should be done on the generic compatible string instead of for each most-specific board string.

arch/arm/mach-kirkwood/board-ns2.c line 66

Quoted 4 lines

arch/arm/mach-kirkwood/board-ns2.c new file +4 -0

+static void ns2_power_off(void)
+{
+   gpio_set_value(NS2_GPIO_POWER_OFF, 1);
+}

This kind of thing should be possible to generalize through a generic binding.

Such a generic binding is part of the pull requests. We converted two existing boards to this new binding. However, the new boards don't make use of a lot of new features we added this cycle, including this generic binding and pinctrl. We might have time to convert them before the merge window, otherwise it will be one of the first things we do for the next cycle.

Hi,

This is more directed at Jason and the other maintainers than you, Simon -- it's something I noticed when looking at his pull request.

Quoted 18 lines · Simon Guinot

arch/arm/mach-kirkwood/Kconfig +10 -0

index 50bca50..847e0c2 100644
@@ -130,6 +130,27 @@ config MACH_KM_KIRKWOOD_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
+config MACH_INETSPACE_V2_DT
+	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Internet Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_V2_DT
+	bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT

arch/arm/mach-kirkwood/Kconfig config MACH_KM_KIRKWOOD_DT · line 152

Quoted 10 lines

arch/arm/mach-kirkwood/Kconfig +10 -0

+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_MAX_V2_DT
+	bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space Max v2 NAS, using Flattened Device Tree.

It would be nice to get away from these config options. The whole point with device tree is to no longer have to do code changes for new similar boards.

And even then, since they share the same init function, there's no need for three options, just one.

arch/arm/mach-kirkwood/Makefile obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o · line 36

Quoted 11 lines

arch/arm/mach-kirkwood/Makefile +3 -0

index 294779f..1f63d80 100644
@@ -31,3 +31,6 @@ obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
 obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
+obj-$(CONFIG_MACH_INETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o

Same here.

Quoted 6 lines

arch/arm/mach-kirkwood/board-dt.c +0 -0

index 70c5a28..b3e0519 100644

arch/arm/mach-kirkwood/board-dt.c static void __init kirkwood_dt_init(void) · line 103

Quoted 8 lines

arch/arm/mach-kirkwood/board-dt.c +5 -0

@@ -96,6 +96,11 @@ static void __init kirkwood_dt_init(void)
 	if (of_machine_is_compatible("keymile,km_kirkwood"))
 		km_kirkwood_init();
 
+	if (of_machine_is_compatible("lacie,inetspace_v2") ||
+	    of_machine_is_compatible("lacie,netspace_v2") ||
+	    of_machine_is_compatible("lacie,netspace_max_v2"))
+		ns2_init();
+

This function is now a long sequence of if statments like the ones above. It would be great if they could be removed by moving most of the functionality implemented in the board file to the device tree. Looks like it's not a whole lot left, so that's promising. I'm guessing there's already efforts underway to take care of the last pieces.

But, until then, I think it'd be nice to make this a table driven lookup instead of a sequence of open-coded if statements. Tegra had this early on before the board files were removed too. I.e. just a table of

static struct match_table {
	char *compat;
	void (*fn)(void);
} match_table = {
	{ "lacie,inetspace_v2", ns2_init },
	{ "lacie,netspace_v2", ns2_init },
	....
}

and then an interator over that table.

arch/arm/mach-kirkwood/board-dt.c static const char *kirkwood_dt_board_compat[] = { · line 124

Quoted 9 lines

arch/arm/mach-kirkwood/board-dt.c +3 -0

@@ -112,6 +117,9 @@ static const char *kirkwood_dt_board_compat[] = {
 	"buffalo,lsxl",
 	"iom,ix2-200",
 	"keymile,km_kirkwood",
+	"lacie,inetspace_v2",
+	"lacie,netspace_max_v2",
+	"lacie,netspace_v2",
 	NULL
 };

Same here. I actually think this is a table that is no longer needed -- the board compat can/should be done on the generic compatible string instead of for each most-specific board string.

arch/arm/mach-kirkwood/board-dt.c static const char *kirkwood_dt_board_compat[] = {

Quoted 4 lines

arch/arm/mach-kirkwood/board-dt.c +4 -0

+static void ns2_power_off(void)
+{
+	gpio_set_value(NS2_GPIO_POWER_OFF, 1);
+}

This kind of thing should be possible to generalize through a generic binding.

-Olof

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 42 lines · Olof Johansson

Hi,

This is more directed at Jason and the other maintainers than you, Simon -- it's something I noticed when looking at his pull request.

Quoted 18 lines · Simon Guinot

arch/arm/mach-kirkwood/Kconfig +10 -0

index 50bca50..847e0c2 100644
@@ -130,6 +130,27 @@ config MACH_KM_KIRKWOOD_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
+config MACH_INETSPACE_V2_DT
+	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Internet Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_V2_DT
+	bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT

arch/arm/mach-kirkwood/Kconfig config MACH_KM_KIRKWOOD_DT · line 152

Quoted 10 lines

arch/arm/mach-kirkwood/Kconfig +10 -0

+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_MAX_V2_DT
+	bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space Max v2 NAS, using Flattened Device Tree.

It would be nice to get away from these config options. The whole point with device tree is to no longer have to do code changes for new similar boards.

And even then, since they share the same init function, there's no need for three options, just one.

Quoted 13 lines

arch/arm/mach-kirkwood/Makefile obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o · line 36

Quoted 11 lines

arch/arm/mach-kirkwood/Makefile +3 -0

index 294779f..1f63d80 100644
@@ -31,3 +31,6 @@ obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
 obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
+obj-$(CONFIG_MACH_INETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o

Same here.

Hi,

All this configuration options (plus those for ns2 lite and mini) are indeed useless as we are using a single init function. Moreover there is no code relying on this options in the file board-ns2.c. All the checks are made at run-time.

I will send a patch to remove this options.

Quoted 64 lines · Simon Guinot

Quoted 42 lines · Olof Johansson

Hi,

This is more directed at Jason and the other maintainers than you, Simon -- it's something I noticed when looking at his pull request.

Quoted 18 lines · Simon Guinot

arch/arm/mach-kirkwood/Kconfig +10 -0

index 50bca50..847e0c2 100644
@@ -130,6 +130,27 @@ config MACH_KM_KIRKWOOD_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
+config MACH_INETSPACE_V2_DT
+	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Internet Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_V2_DT
+	bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT

arch/arm/mach-kirkwood/Kconfig config MACH_KM_KIRKWOOD_DT · line 152

Quoted 10 lines

arch/arm/mach-kirkwood/Kconfig +10 -0

+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_MAX_V2_DT
+	bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space Max v2 NAS, using Flattened Device Tree.

It would be nice to get away from these config options. The whole point with device tree is to no longer have to do code changes for new similar boards.

And even then, since they share the same init function, there's no need for three options, just one.

Quoted 13 lines

arch/arm/mach-kirkwood/Makefile obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o · line 36

Quoted 11 lines

arch/arm/mach-kirkwood/Makefile +3 -0

index 294779f..1f63d80 100644
@@ -31,3 +31,6 @@ obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
 obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
+obj-$(CONFIG_MACH_INETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o

Same here.

Hi,

All this configuration options (plus those for ns2 lite and mini) are indeed useless as we are using a single init function. Moreover there is no code relying on this options in the file board-ns2.c. All the checks are made at run-time.

Quoted 1 line

I will send a patch to remove this options.

No need to jump on it just yet. Nothing more is going into 3.8. We plan on cleaning up a lot of this as the first part of stuff for 3.9. It'll be easier to have one series knocking it all out as opposed to several board-specific patches from individuals.

Unless, of course, you're volunteering to do the whole cleanup. Then by all means, don't let me stand in your way. :-)

Otherwise, I'll put this series together near v3.8-rc1.

thx,

Jason.

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 67 lines · Jason Cooper

Quoted 65 lines · Simon Guinot

Quoted 42 lines · Olof Johansson

Hi,

This is more directed at Jason and the other maintainers than you, Simon -- it's something I noticed when looking at his pull request.

Quoted 18 lines · Simon Guinot

arch/arm/mach-kirkwood/Kconfig +10 -0

index 50bca50..847e0c2 100644
@@ -130,6 +130,27 @@ config MACH_KM_KIRKWOOD_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
 
+config MACH_INETSPACE_V2_DT
+	bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Internet Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_V2_DT
+	bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT

arch/arm/mach-kirkwood/Kconfig config MACH_KM_KIRKWOOD_DT · line 152

Quoted 10 lines

arch/arm/mach-kirkwood/Kconfig +10 -0

+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space v2 NAS, using Flattened Device Tree.
+
+config MACH_NETSPACE_MAX_V2_DT
+	bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space Max v2 NAS, using Flattened Device Tree.

It would be nice to get away from these config options. The whole point with device tree is to no longer have to do code changes for new similar boards.

And even then, since they share the same init function, there's no need for three options, just one.

Quoted 13 lines

arch/arm/mach-kirkwood/Makefile obj-$(CONFIG_MACH_GOFLEXNET_DT) += board-goflexnet.o · line 36

Quoted 11 lines

arch/arm/mach-kirkwood/Makefile +3 -0

index 294779f..1f63d80 100644
@@ -31,3 +31,6 @@ obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o
 obj-$(CONFIG_MACH_LSXL_DT)		+= board-lsxl.o
 obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)	+= board-iomega_ix2_200.o
 obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)	+= board-km_kirkwood.o
+obj-$(CONFIG_MACH_INETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_V2_DT)	+= board-ns2.o
+obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)	+= board-ns2.o

Same here.

Hi,

All this configuration options (plus those for ns2 lite and mini) are indeed useless as we are using a single init function. Moreover there is no code relying on this options in the file board-ns2.c. All the checks are made at run-time.

I will send a patch to remove this options.

Quoted 4 lines

No need to jump on it just yet. Nothing more is going into 3.8. We plan on cleaning up a lot of this as the first part of stuff for 3.9. It'll be easier to have one series knocking it all out as opposed to several board-specific patches from individuals.

About the config duplicate options, I think that the ns2 is the only problem. But if you plan to remove the board-*.c files for 3.9, maybe there is no need at all to fix the issue ?

Quoted 2 lines

Unless, of course, you're volunteering to do the whole cleanup. Then by all means, don't let me stand in your way. :-)

The whole cleanup, I don't know :) But for sure, I can help. For example, I could do the gpio-poweroff migration.

Quoted 19 lines · Jason Cooper

Quoted 18 lines · Simon Guinot

Quoted 10 lines · Olof Johansson

arch/arm/mach-kirkwood/Kconfig config MACH_KM_KIRKWOOD_DT · line 152

Quoted 6 lines

arch/arm/mach-kirkwood/Kconfig +6 -0

+config MACH_NETSPACE_MAX_V2_DT
+	bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
+	select ARCH_KIRKWOOD_DT
+	help
+	  Say 'Y' here if you want your kernel to support the LaCie
+	  Network Space Max v2 NAS, using Flattened Device Tree.

It would be nice to get away from these config options. The whole point with device tree is to no longer have to do code changes for new similar boards.

Quoted 3 lines

And even then, since they share the same init function, there's no need for three options, just one.

I will send a patch to remove this options.

Quoted 4 lines

No need to jump on it just yet. Nothing more is going into 3.8. We plan on cleaning up a lot of this as the first part of stuff for 3.9. It'll be easier to have one series knocking it all out as opposed to several board-specific patches from individuals.

About the config duplicate options, I think that the ns2 is the only problem. But if you plan to remove the board-*.c files for 3.9, maybe there is no need at all to fix the issue ?

Are there any plans to convert the existing non-DT kirkwood boards in 3.9, too?

This patch series provides DT support for LaCie NAS Network Space v2 and parents. This includes the following machines:
- Internet Space v2
- Network Space v2
- Network Space Max v2
- Network Space Lite v2
- Network Space Mini v2

This patch series provides DT support for LaCie NAS Network Space v2 and parents. This includes the following machines:
- Internet Space v2
- Network Space v2
- Network Space Max v2
- Network Space Lite v2
- Network Space Mini v2

Note that the three first boards are already supported by the Linux kernel via an "old-fashion" board setup. The two lasts (Lite and Mini) are new boards.

Also note that the first patch of the series is related with the LED subsystem. It adds device tree binding to the driver leds-ns2.