sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

of_path: of_find_path(): add possibility to return .bb device 

This patch adds a flags argument to the of_find_path() function. The only flag
defined for now is OF_FIND_PATH_FLAGS_BB. When used on NAND devices, the
function returns the bad block aware device (the ".bb" device).

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Marc Kleine-Budde 2015-04-22 10:20:12 +02:00 committed by Sascha Hauer
parent 0238fb4c0d
commit 885a1cf27e
4 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/misc/state.c
View File

@ -41,7 +41,7 @@ static int state_probe(struct device_d *dev)
if (IS_ERR(state))
return PTR_ERR(state);
ret = of_find_path(np, "backend", &path);
ret = of_find_path(np, "backend", &path, 0);
if (ret)
return ret;

20
drivers/of/barebox.c
View File

@ -31,28 +31,10 @@ static int environment_probe(struct device_d *dev)
char *path;
int ret;
ret = of_find_path(dev->device_node, "device-path", &path);
ret = of_find_path(dev->device_node, "device-path", &path, OF_FIND_PATH_FLAGS_BB);
if (ret)
return ret;
/*
* The environment support is not bad block aware, hence we
* have to use the .bb device. Test if we have a nand device
* and if yes, append .bb to the filename.
*/
if (!strncmp(path, "/dev/", 5)) {
struct cdev *cdev;
char *cdevname;
cdevname = path + 5;
cdev = cdev_by_name(cdevname);
if (cdev && cdev->mtd && mtd_can_have_bb(cdev->mtd)) {
char *bbpath = asprintf("%s.bb", path);
free(path);
path = bbpath;
}
}
dev_info(dev, "setting default environment path to %s\n", path);
default_environment_path_set(path);

12
drivers/of/of_path.c
View File

@ -21,6 +21,8 @@
#include <malloc.h>
#include <of.h>
#include <linux/mtd/mtd.h>
struct of_path {
struct cdev *cdev;
struct device_d *dev;
@ -112,6 +114,7 @@ out:
* @propname: the property name of the path description
* @outpath: if this function returns 0 outpath will contain the path belonging
* to the input path description. Must be freed with free().
* @flags: use OF_FIND_PATH_FLAGS_BB to return the .bb device if available
*
* paths in the devicetree have the form of a multistring property. The first
* string contains the full path to the physical device containing the path.
@ -127,11 +130,12 @@ out:
* device-path = &mmc0, "partname:0";
* device-path = &norflash, "partname:barebox-environment";
*/
int of_find_path(struct device_node *node, const char *propname, char **outpath)
int of_find_path(struct device_node *node, const char *propname, char **outpath, unsigned flags)
{
struct of_path op = {};
struct device_node *rnode;
const char *path, *str;
bool add_bb = false;
int i, ret;
path = of_get_property(node, propname, NULL);
@ -166,7 +170,11 @@ int of_find_path(struct device_node *node, const char *propname, char **outpath)
if (!op.cdev)
return -ENOENT;
*outpath = asprintf("/dev/%s", op.cdev->name);
if ((flags & OF_FIND_PATH_FLAGS_BB) && op.cdev->mtd &&
mtd_can_have_bb(op.cdev->mtd))
add_bb = true;
*outpath = asprintf("/dev/%s%s", op.cdev->name, add_bb ? ".bb" : "");
return 0;
}

3
include/of.h
View File

@ -240,7 +240,8 @@ int of_add_memory(struct device_node *node, bool dump);
void of_add_memory_bank(struct device_node *node, bool dump, int r,
u64 base, u64 size);
struct device_d *of_find_device_by_node_path(const char *path);
int of_find_path(struct device_node *node, const char *propname, char **outpath);
#define OF_FIND_PATH_FLAGS_BB 1 /* return .bb device if available */
int of_find_path(struct device_node *node, const char *propname, char **outpath, unsigned flags);
int of_register_fixup(int (*fixup)(struct device_node *, void *), void *context);
struct device_node *of_find_node_by_alias(struct device_node *root,
const char *alias);