mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 14:14:37 +00:00
regulator: Fixes for v6.4
Some fixes that came in since the merge window, nothing terribly exciting - a couple of driver specific fixes and a fix for the error handling when setting up the debugfs for the devices. -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmRt32UACgkQJNaLcl1U h9AYBwf/XcDtTL93J9iXMTTmablx7yg7wv5SZSpE0Kmk7p4GF10XUFNtCoJCBpt3 EPOviUPHRO0O8HqubzLgAc/gp3qo17s1rrGTecyF4DZpHT3lrP4ZUsAzF5mlzv45 aHU4EtKiOTerUiF1wsmgMMyyXCrz3ccl8727hNyPWuaoTDi7TJMkKbrUjvNW1qvN ckK/f+Of0tWcBRLrMopyqqOjO+NnLyWv2fCGgYEF0cK8/XwBgpJMGx1ECaaxmCNH E5y46Nx1S0Yl+0kZs8vv/3oyepr0m/KnDIEm7dX8ufKEFY9Rh6eo4wJIhuYhrMyP GcTJA6UFzKTJENnLJowThvZxvOyXFQ== =toGp -----END PGP SIGNATURE----- Merge tag 'regulator-fix-v6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator Pull regulator fixes from Mark Brown: "Some fixes that came in since the merge window, nothing terribly exciting - a couple of driver specific fixes and a fix for the error handling when setting up the debugfs for the devices" * tag 'regulator-fix-v6.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: mt6359: add read check for PMIC MT6359 regulator: Fix error checking for debugfs_create_dir regulator: pca9450: Fix BUCK2 enable_mask
This commit is contained in:
commit
f767b330d8
3 changed files with 9 additions and 6 deletions
|
@ -5256,7 +5256,7 @@ static void rdev_init_debugfs(struct regulator_dev *rdev)
|
|||
}
|
||||
|
||||
rdev->debugfs = debugfs_create_dir(rname, debugfs_root);
|
||||
if (!rdev->debugfs) {
|
||||
if (IS_ERR(rdev->debugfs)) {
|
||||
rdev_warn(rdev, "Failed to create debugfs directory\n");
|
||||
return;
|
||||
}
|
||||
|
@ -6178,7 +6178,7 @@ static int __init regulator_init(void)
|
|||
ret = class_register(®ulator_class);
|
||||
|
||||
debugfs_root = debugfs_create_dir("regulator", NULL);
|
||||
if (!debugfs_root)
|
||||
if (IS_ERR(debugfs_root))
|
||||
pr_warn("regulator: Failed to create debugfs directory\n");
|
||||
|
||||
#ifdef CONFIG_DEBUG_FS
|
||||
|
|
|
@ -951,9 +951,12 @@ static int mt6359_regulator_probe(struct platform_device *pdev)
|
|||
struct regulator_config config = {};
|
||||
struct regulator_dev *rdev;
|
||||
struct mt6359_regulator_info *mt6359_info;
|
||||
int i, hw_ver;
|
||||
int i, hw_ver, ret;
|
||||
|
||||
ret = regmap_read(mt6397->regmap, MT6359P_HWCID, &hw_ver);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
regmap_read(mt6397->regmap, MT6359P_HWCID, &hw_ver);
|
||||
if (hw_ver >= MT6359P_CHIP_VER)
|
||||
mt6359_info = mt6359p_regulators;
|
||||
else
|
||||
|
|
|
@ -264,7 +264,7 @@ static const struct pca9450_regulator_desc pca9450a_regulators[] = {
|
|||
.vsel_reg = PCA9450_REG_BUCK2OUT_DVS0,
|
||||
.vsel_mask = BUCK2OUT_DVS0_MASK,
|
||||
.enable_reg = PCA9450_REG_BUCK2CTRL,
|
||||
.enable_mask = BUCK1_ENMODE_MASK,
|
||||
.enable_mask = BUCK2_ENMODE_MASK,
|
||||
.ramp_reg = PCA9450_REG_BUCK2CTRL,
|
||||
.ramp_mask = BUCK2_RAMP_MASK,
|
||||
.ramp_delay_table = pca9450_dvs_buck_ramp_table,
|
||||
|
@ -502,7 +502,7 @@ static const struct pca9450_regulator_desc pca9450bc_regulators[] = {
|
|||
.vsel_reg = PCA9450_REG_BUCK2OUT_DVS0,
|
||||
.vsel_mask = BUCK2OUT_DVS0_MASK,
|
||||
.enable_reg = PCA9450_REG_BUCK2CTRL,
|
||||
.enable_mask = BUCK1_ENMODE_MASK,
|
||||
.enable_mask = BUCK2_ENMODE_MASK,
|
||||
.ramp_reg = PCA9450_REG_BUCK2CTRL,
|
||||
.ramp_mask = BUCK2_RAMP_MASK,
|
||||
.ramp_delay_table = pca9450_dvs_buck_ramp_table,
|
||||
|
|
Loading…
Reference in a new issue