Unverified Commit b8cabec7 authored by Mark Brown's avatar Mark Brown
Browse files

regulator: Merge up fixes 

So we can base some new debugfs work on it.
parents 6c594a82 a5116375

drivers/regulator/core.c

+2 −2
Original line number Diff line number Diff line
@@ -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(&regulator_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

drivers/regulator/mt6359-regulator.c

+5 −2
Original line number Diff line number Diff line
@@ -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

drivers/regulator/pca9450-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -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,