[PATCH v2 1/3] common: oftree: Add fuction to register set status fixup

[PATCH v2 1/3] common: oftree: Add fuction to register set status fixup

[Teresa Remmet]

Added a function to register a fixup to enable or disable
device tree nodes.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 common/oftree.c | 36 ++++++++++++++++++++++++++++++++++++
 include/of.h    |  1 +
 2 files changed, 37 insertions(+)

diff --git a/common/oftree.c b/common/oftree.c
index d408f14..3103bb1 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -139,6 +139,42 @@ static int of_register_bootargs_fixup(void)
 }
 late_initcall(of_register_bootargs_fixup);
 
+struct of_fixup_status_data {
+	char *node;
+	bool status;
+};
+
+static int of_fixup_status(struct device_node *root, void *context)
+{
+	struct of_fixup_status_data *data = context;
+	struct device_node *node;
+
+	node = of_find_node_by_path_or_alias(root, data->node);
+	if (!node)
+		return -ENODEV;
+
+	if (data->status)
+		return of_device_enable(node);
+	else
+		return of_device_disable(node);
+}
+
+/**
+ * of_register_set_status_fixup - register fix up to set status of nodes
+ * Register a fixup to enable or disable a node in the devicet tree by
+ * passing the path or alias.
+ */
+int of_register_set_status_fixup(char *node, bool status)
+{
+	struct of_fixup_status_data *data;
+
+	data = xzalloc(sizeof(*data));
+	data->node = node;
+	data->status = status;
+
+	return of_register_fixup(of_fixup_status, (void *)data);
+}
+
 struct of_fixup {
 	int (*fixup)(struct device_node *, void *);
 	void *context;
diff --git a/include/of.h b/include/of.h
index 75cc3c1..ae65409 100644
--- a/include/of.h
+++ b/include/of.h
@@ -249,6 +249,7 @@ int of_find_path(struct device_node *node, const char *propname, char **outpath,
 int of_find_path_by_node(struct device_node *node, char **outpath, unsigned flags);
 int of_register_fixup(int (*fixup)(struct device_node *, void *), void *context);
 int of_unregister_fixup(int (*fixup)(struct device_node *, void *), void *context);
+int of_register_set_status_fixup(char *node, bool status);
 struct device_node *of_find_node_by_alias(struct device_node *root,
 		const char *alias);
 struct device_node *of_find_node_by_path_or_alias(struct device_node *root,
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH v2 2/3] commands: Add of_fixup_status

[Teresa Remmet]

of_fixup_status enables or disables the status property of a
given node with a device tree fixup.

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 commands/Kconfig           | 16 ++++++++++
 commands/Makefile          |  1 +
 commands/of_fixup_status.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 commands/of_fixup_status.c

diff --git a/commands/Kconfig b/commands/Kconfig
index b4fdc86..9519a44 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -2114,6 +2114,22 @@ config CMD_OF_DISPLAY_TIMINGS
 		  -s path	select display-timings and register oftree fixup
 		  -f dtb	work on dtb. Has no effect on -s option
 
+config CMD_OF_FIXUP_STATUS
+	tristate
+	select OFTREE
+	prompt "of_fixup_status"
+	help
+	  Register a fixup to enable or disable node
+
+	  Usage: of_fixup_node [-d] path
+
+	  Options:
+		  -d		disable node
+		  path		Node path or alias
+
+	  Register a fixup to enable or disable a device tree node.
+	  Nodes are enabled on default. Disabled with -d.
+
 config CMD_OFTREE
 	tristate
 	select OFTREE
diff --git a/commands/Makefile b/commands/Makefile
index d985341..8975d4b 100644
--- a/commands/Makefile
+++ b/commands/Makefile
@@ -78,6 +78,7 @@ obj-$(CONFIG_CMD_OF_PROPERTY)	+= of_property.o
 obj-$(CONFIG_CMD_OF_NODE)	+= of_node.o
 obj-$(CONFIG_CMD_OF_DUMP)	+= of_dump.o
 obj-$(CONFIG_CMD_OF_DISPLAY_TIMINGS)	+= of_display_timings.o
+obj-$(CONFIG_CMD_OF_FIXUP_STATUS)	+= of_fixup_status.o
 obj-$(CONFIG_CMD_MAGICVAR)	+= magicvar.o
 obj-$(CONFIG_CMD_IOMEM)		+= iomemport.o
 obj-$(CONFIG_CMD_LINUX_EXEC)	+= linux_exec.o
diff --git a/commands/of_fixup_status.c b/commands/of_fixup_status.c
new file mode 100644
index 0000000..9a4a619
--- /dev/null
+++ b/commands/of_fixup_status.c
@@ -0,0 +1,74 @@
+/*
+ * of_fixup_status.c - Register a fixup to enable or disable nodes in the
+ * device tree
+ *
+ * Copyright (c) 2014-2016 PHYTEC Messtechnik GmbH
+ * Author:
+ *	Teresa Remmet
+ *	Wadim Egorov
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <common.h>
+#include <of.h>
+#include <command.h>
+#include <malloc.h>
+#include <complete.h>
+#include <asm/byteorder.h>
+#include <linux/err.h>
+#include <getopt.h>
+#include <string.h>
+
+static int do_of_fixup_status(int argc, char *argv[])
+{
+	int opt;
+	bool status = 1;
+	char *node = NULL;
+
+	while ((opt = getopt(argc, argv, "d")) > 0) {
+		switch (opt) {
+		case 'd':
+			status = 0;
+			break;
+		default:
+			return COMMAND_ERROR_USAGE;
+		}
+	}
+
+	if (optind == argc)
+		return COMMAND_ERROR_USAGE;
+
+	node = xstrdup(argv[optind]);
+
+	of_register_set_status_fixup(node, status);
+
+	return 0;
+}
+
+BAREBOX_CMD_HELP_START(of_fixup_status)
+BAREBOX_CMD_HELP_TEXT("Options:")
+BAREBOX_CMD_HELP_OPT("-d",  "disable node")
+BAREBOX_CMD_HELP_OPT("path",  "Node path\n")
+BAREBOX_CMD_HELP_TEXT("Register a fixup to enable or disable a device tree node.")
+BAREBOX_CMD_HELP_TEXT("Nodes are enabled on default. Disabled with -d.")
+BAREBOX_CMD_HELP_END
+
+BAREBOX_CMD_START(of_fixup_status)
+	.cmd	= do_of_fixup_status,
+	BAREBOX_CMD_DESC("register a fixup to enable or disable node")
+	BAREBOX_CMD_OPTS("[-d] path")
+	BAREBOX_CMD_GROUP(CMD_GRP_MISC)
+	BAREBOX_CMD_COMPLETE(devicetree_file_complete)
+	BAREBOX_CMD_HELP(cmd_of_fixup_status_help)
+BAREBOX_CMD_END
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH v2 3/3] ARM: am335x_defconfig: Enable the of_fixup_status command

[Teresa Remmet]

Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
---
 arch/arm/configs/am335x_defconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/configs/am335x_defconfig b/arch/arm/configs/am335x_defconfig
index 7cf48b8..9196fb8 100644
--- a/arch/arm/configs/am335x_defconfig
+++ b/arch/arm/configs/am335x_defconfig
@@ -84,6 +84,7 @@ CONFIG_CMD_BAREBOX_UPDATE=y
 CONFIG_CMD_OF_NODE=y
 CONFIG_CMD_OF_PROPERTY=y
 CONFIG_CMD_OF_DISPLAY_TIMINGS=y
+CONFIG_CMD_OF_FIXUP_STATUS=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
 CONFIG_NET=y
-- 
1.9.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH v2 1/3] common: oftree: Add fuction to register set status fixup

[Sascha Hauer]

On Thu, Feb 25, 2016 at 08:36:47AM +0100, Teresa Remmet wrote:
> Added a function to register a fixup to enable or disable
> device tree nodes.
> 
> Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
> ---
>  common/oftree.c | 36 ++++++++++++++++++++++++++++++++++++
>  include/of.h    |  1 +
>  2 files changed, 37 insertions(+)

Applied, thanks

Possible future enhancements could be that we can list the fixups and
maybe even remove them.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH v2 1/3] common: oftree: Add fuction to register set status fixup

[Trent Piepho]

On Thu, 2016-02-25 at 08:36 +0100, Teresa Remmet wrote:

>  
> +struct of_fixup_status_data {
> +	char *node;

const char *node.

I think path would be a better name, as node usually is a device_node
pointer, not a path.

> +	bool status;
> +};
> +
> +static int of_fixup_status(struct device_node *root, void *context)
> +{
> +	struct of_fixup_status_data *data = context;

const struct of_fixup_status_data *data

> +	struct device_node *node;
> +
> +	node = of_find_node_by_path_or_alias(root, data->node);
> +	if (!node)
> +		return -ENODEV;
> +
> +	if (data->status)
> +		return of_device_enable(node);
> +	else
> +		return of_device_disable(node);
> +}
> +
> +/**
> + * of_register_set_status_fixup - register fix up to set status of nodes
> + * Register a fixup to enable or disable a node in the devicet tree by
> + * passing the path or alias.
> + */
> +int of_register_set_status_fixup(char *node, bool status)

(const char *path, bool status)

> +{
> +	struct of_fixup_status_data *data;
> +
> +	data = xzalloc(sizeof(*data));
> +	data->node = node;
> +	data->status = status;
> +
> +	return of_register_fixup(of_fixup_status, (void *)data);
> +}
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH v2 1/3] common: oftree: Add fuction to register set status fixup

[Teresa Remmet]

Hello Trent,

Am Donnerstag, den 25.02.2016, 18:18 +0000 schrieb Trent Piepho:
> On Thu, 2016-02-25 at 08:36 +0100, Teresa Remmet wrote:
> 
> >  
> > +struct of_fixup_status_data {
> > +	char *node;
> 
> const char *node.
> 
> I think path would be a better name, as node usually is a device_node
> pointer, not a path.

I named it node as it could also be an alias and not only a path.
But I don't might to rename it.

I'll send a fixup, also for the rest.

Regards,
Teresa

> 
> > +	bool status;
> > +};
> > +
> > +static int of_fixup_status(struct device_node *root, void *context)
> > +{
> > +	struct of_fixup_status_data *data = context;
> 
> const struct of_fixup_status_data *data
> 
> > +	struct device_node *node;
> > +
> > +	node = of_find_node_by_path_or_alias(root, data->node);
> > +	if (!node)
> > +		return -ENODEV;
> > +
> > +	if (data->status)
> > +		return of_device_enable(node);
> > +	else
> > +		return of_device_disable(node);
> > +}
> > +
> > +/**
> > + * of_register_set_status_fixup - register fix up to set status of nodes
> > + * Register a fixup to enable or disable a node in the devicet tree by
> > + * passing the path or alias.
> > + */
> > +int of_register_set_status_fixup(char *node, bool status)
> 
> (const char *path, bool status)
> 
> > +{
> > +	struct of_fixup_status_data *data;
> > +
> > +	data = xzalloc(sizeof(*data));
> > +	data->node = node;
> > +	data->status = status;
> > +
> > +	return of_register_fixup(of_fixup_status, (void *)data);
> > +}



_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox