summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2024-02-22 11:34:59 -0500
committerTom Rini <trini@konsulko.com>2024-02-22 11:34:59 -0500
commit5e4a0c7f4a2c9d4670b75a6a2056243b1a56512b (patch)
treec6304a00566e4c45b9178b2edeb0511493cc2f20
parent7bb761c42d75b2ebacc7190a76cc5385cbba1045 (diff)
parent22f391e8be11986bae824509470cf11e7bac31b0 (diff)
downloadu-boot-5e4a0c7f4a2c9d4670b75a6a2056243b1a56512b.tar.gz
u-boot-5e4a0c7f4a2c9d4670b75a6a2056243b1a56512b.tar.bz2
u-boot-5e4a0c7f4a2c9d4670b75a6a2056243b1a56512b.zip
Merge branch 'qcom-fixes-2024.04' of https://gitlab.denx.de/u-boot/custodians/u-boot-snapdragon
- Two fixes for the qcom-pmic button driver
-rw-r--r--drivers/button/button-qcom-pmic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/button/button-qcom-pmic.c b/drivers/button/button-qcom-pmic.c
index 34a976d1e6..bad445efa8 100644
--- a/drivers/button/button-qcom-pmic.c
+++ b/drivers/button/button-qcom-pmic.c
@@ -86,7 +86,7 @@ static int qcom_pwrkey_probe(struct udevice *dev)
}
ret = pmic_reg_read(priv->pmic, priv->base + REG_SUBTYPE);
- if ((ret & 0x7) == 0) {
+ if (ret < 0 || (ret & 0x7) == 0) {
printf("%s: unexpected PMCI function subtype %d\n", dev->name, ret);
return -ENXIO;
}
@@ -133,7 +133,7 @@ static int button_qcom_pmic_bind(struct udevice *parent)
} else if (NODE_IS_RESIN(node)) {
uc_plat->label = "vol_down";
} else {
- printf("Unknown button node '%s' should be 'pwrkey' or 'resin'\n",
+ debug("Unknown button node '%s' should be 'pwrkey' or 'resin'\n",
ofnode_get_name(node));
device_unbind(dev);
}