94462138f3
The null pointer check on regmap that checks for a dev_get_regmap failure
is currently returning -ENOENT if the regmap succeeded. Fix this by adding
in the missing ! operator.
Fixes: 4fe66d5a62 ("regulator: Add support for QCOM PMIC VBUS booster")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Addresses-Coverity: ("Dereference after null check")
Link: https://lore.kernel.org/r/20200702115659.38208-1-colin.king@canonical.com
Signed-off-by: Mark Brown <broonie@kernel.org>
98 lines
2.5 KiB
C
98 lines
2.5 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
//
|
|
// Qualcomm PMIC VBUS output regulator driver
|
|
//
|
|
// Copyright (c) 2020, The Linux Foundation. All rights reserved.
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/err.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/of.h>
|
|
#include <linux/of_device.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/regulator/driver.h>
|
|
#include <linux/regulator/of_regulator.h>
|
|
#include <linux/regmap.h>
|
|
|
|
#define CMD_OTG 0x40
|
|
#define OTG_EN BIT(0)
|
|
#define OTG_CFG 0x53
|
|
#define OTG_EN_SRC_CFG BIT(1)
|
|
|
|
static const struct regulator_ops qcom_usb_vbus_reg_ops = {
|
|
.enable = regulator_enable_regmap,
|
|
.disable = regulator_disable_regmap,
|
|
.is_enabled = regulator_is_enabled_regmap,
|
|
};
|
|
|
|
static struct regulator_desc qcom_usb_vbus_rdesc = {
|
|
.name = "usb_vbus",
|
|
.ops = &qcom_usb_vbus_reg_ops,
|
|
.owner = THIS_MODULE,
|
|
.type = REGULATOR_VOLTAGE,
|
|
};
|
|
|
|
static int qcom_usb_vbus_regulator_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
struct regulator_dev *rdev;
|
|
struct regmap *regmap;
|
|
struct regulator_config config = { };
|
|
struct regulator_init_data *init_data;
|
|
int ret;
|
|
u32 base;
|
|
|
|
ret = of_property_read_u32(dev->of_node, "reg", &base);
|
|
if (ret < 0) {
|
|
dev_err(dev, "no base address found\n");
|
|
return ret;
|
|
}
|
|
|
|
regmap = dev_get_regmap(dev->parent, NULL);
|
|
if (!regmap) {
|
|
dev_err(dev, "Failed to get regmap\n");
|
|
return -ENOENT;
|
|
}
|
|
|
|
init_data = of_get_regulator_init_data(dev, dev->of_node,
|
|
&qcom_usb_vbus_rdesc);
|
|
if (!init_data)
|
|
return -ENOMEM;
|
|
|
|
qcom_usb_vbus_rdesc.enable_reg = base + CMD_OTG;
|
|
qcom_usb_vbus_rdesc.enable_mask = OTG_EN;
|
|
config.dev = dev;
|
|
config.init_data = init_data;
|
|
config.regmap = regmap;
|
|
|
|
rdev = devm_regulator_register(dev, &qcom_usb_vbus_rdesc, &config);
|
|
if (IS_ERR(rdev)) {
|
|
ret = PTR_ERR(rdev);
|
|
dev_err(dev, "not able to register vbus reg %d\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
/* Disable HW logic for VBUS enable */
|
|
regmap_update_bits(regmap, base + OTG_CFG, OTG_EN_SRC_CFG, 0);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id qcom_usb_vbus_regulator_match[] = {
|
|
{ .compatible = "qcom,pm8150b-vbus-reg" },
|
|
{ }
|
|
};
|
|
MODULE_DEVICE_TABLE(of, qcom_usb_vbus_regulator_match);
|
|
|
|
static struct platform_driver qcom_usb_vbus_regulator_driver = {
|
|
.driver = {
|
|
.name = "qcom-usb-vbus-regulator",
|
|
.of_match_table = qcom_usb_vbus_regulator_match,
|
|
},
|
|
.probe = qcom_usb_vbus_regulator_probe,
|
|
};
|
|
module_platform_driver(qcom_usb_vbus_regulator_driver);
|
|
|
|
MODULE_DESCRIPTION("Qualcomm USB vbus regulator driver");
|
|
MODULE_LICENSE("GPL v2");
|