dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 16:52:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

sysreset: syscon: Support value property

Browse Source 
Per the DT binding, <mask> and <value> property can have either one
or both, and if <value> is missing, <mask> should be used, which is
what current U-Boot sysreset_syscon driver supports.

This adds support to the <value> property to the driver, and <mask>
semantics is updated to really be a mask to the value if both exist.

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Pragnesh Patel <pragnesh.patel@sifive.com>
This commit is contained in:
Bin Meng
2020-06-22 22:29:43 -07:00
committed by Andes
parent 1ce8182b0f
commit 9cdfade85e
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/sysreset/sysreset_syscon.c
View File

@@ -19,6 +19,7 @@ struct syscon_reboot_priv {
struct regmap *regmap; struct regmap *regmap;
unsigned int offset; unsigned int offset;
unsigned int mask; unsigned int mask;
unsigned int value;
}; };
static int syscon_reboot_request(struct udevice *dev, enum sysreset_t type) static int syscon_reboot_request(struct udevice *dev, enum sysreset_t type)
@@ -29,7 +30,7 @@ static int syscon_reboot_request(struct udevice *dev, enum sysreset_t type)
if (type != driver_data) if (type != driver_data)
return -EPROTONOSUPPORT; return -EPROTONOSUPPORT;
regmap_write(priv->regmap, priv->offset, priv->mask); regmap_update_bits(priv->regmap, priv->offset, priv->mask, priv->value);
return -EINPROGRESS; return -EINPROGRESS;
} }
@@ -42,6 +43,7 @@ int syscon_reboot_probe(struct udevice *dev)
{ {
struct syscon_reboot_priv *priv = dev_get_priv(dev); struct syscon_reboot_priv *priv = dev_get_priv(dev);
int err; int err;
int mask_err, value_err;
priv->regmap = syscon_regmap_lookup_by_phandle(dev, "regmap"); priv->regmap = syscon_regmap_lookup_by_phandle(dev, "regmap");
if (IS_ERR(priv->regmap)) { if (IS_ERR(priv->regmap)) {
@@ -55,10 +57,20 @@ int syscon_reboot_probe(struct udevice *dev)
return -ENOENT; return -ENOENT;
} }
err = dev_read_u32(dev, "mask", &priv->mask); mask_err = dev_read_u32(dev, "mask", &priv->mask);
if (err) { value_err = dev_read_u32(dev, "value", &priv->value);
pr_err("unable to find mask\n"); if (mask_err && value_err) {
return -ENOENT; pr_err("unable to find mask and value\n");
return -EINVAL;
}
if (value_err) {
/* support old binding */
priv->value = priv->mask;
priv->mask = 0xffffffff;
} else if (mask_err) {
/* support value without mask*/
priv->mask = 0xffffffff;
} }
return 0; return 0;