summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2019-08-25 17:58:38 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2019-08-28 13:33:42 +0200
commite0c563bbf4df3da50d654eb744441f695ceffcac (patch)
tree5edab7cc4b0cf5f6ff2c92820ddac3550e71ef09
parent058556a5163c68e13ce165f861b895b9f6e9ac32 (diff)
downloadbarebox-e0c563bbf4df3da50d654eb744441f695ceffcac.tar.gz
reset_source: use instance = -1 as default
As with platform device id (does someone still remember?) 0 might be a valid id. So use -1 for "unknown" or "doesn't apply" instead of 0. Also don't pass the instance to the device tree if negative. (This ends up as 0xffffffff otherwise.) Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--common/oftree.c5
-rw-r--r--common/reset_source.c2
-rw-r--r--include/reset_source.h2
3 files changed, 5 insertions, 4 deletions
diff --git a/common/oftree.c b/common/oftree.c
index 5bb5420..28a3b96 100644
--- a/common/oftree.c
+++ b/common/oftree.c
@@ -144,6 +144,7 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
struct device_node *node;
const char *str;
int err;
+ int instance = reset_source_get_instance();
str = linux_bootargs_get();
if (!str)
@@ -160,8 +161,8 @@ static int of_fixup_bootargs(struct device_node *root, void *unused)
return err;
of_property_write_string(node, "reset-source", reset_source_name());
- of_property_write_u32(node, "reset-source-instance",
- reset_source_get_instance());
+ if (instance >= 0)
+ of_property_write_u32(node, "reset-source-instance", instance);
return of_fixup_bootargs_bootsource(root, node);
}
diff --git a/common/reset_source.c b/common/reset_source.c
index 1955d3f..e24aa33 100644
--- a/common/reset_source.c
+++ b/common/reset_source.c
@@ -54,7 +54,7 @@ void reset_source_set_priority(enum reset_src_type st, unsigned int priority)
reset_source = st;
reset_source_priority = priority;
- reset_source_instance = 0;
+ reset_source_instance = -1;
pr_debug("Setting reset source to %s with priority %d\n",
reset_src_names[reset_source], priority);
diff --git a/include/reset_source.h b/include/reset_source.h
index 13bc3bc..2848a91 100644
--- a/include/reset_source.h
+++ b/include/reset_source.h
@@ -49,7 +49,7 @@ static inline enum reset_src_type reset_source_get(void)
static inline int reset_source_get_instance(void)
{
- return 0;
+ return -1;
}
static inline unsigned int of_get_reset_source_priority(struct device_node *node)