Merge remote-tracking branches 'regulator/fix/anatop' and 'regulator/fix/max77620' into regulator-linus

Mark Brown committed 10 years ago

Commit a29a36f3 parents 4c2e07c 8a092e6 91ff8112 files · +7 −2Browse files

Unified · Split

2 files

@@ -296,7 +296,7 @@ static int anatop_regulator_probe(struct platform_device *pdev) · 295 unmodified lines
296	296	if (!sreg->sel && !strcmp(sreg->name, "vddpu"))
297	297	sreg->sel = 22;
298	298
299		− if (!sreg->sel) {
	299	+ if (!sreg->bypass && !sreg->sel) {
300	300	dev_err(&pdev->dev, "Failed to read a valid default voltage selector.\n");
301	301	return -EINVAL;
302	302	}

@@ -123,6 +123,9 @@ static int max77620_regulator_set_fps_src(struct max77620_regulator *pmic, · 122 unmodified lines
123	123	unsigned int val;
124	124	int ret;
125	125
	126	+ if (!rinfo)
	127	+ return 0;
	128	+
126	129	switch (fps_src) {
127	130	case MAX77620_FPS_SRC_0:
128	131	case MAX77620_FPS_SRC_1:
@@ -171,6 +174,9 @@ static int max77620_regulator_set_fps_slots(struct max77620_regulator *pmic, · 42 unmodified lines
171	174	int pd = rpdata->active_fps_pd_slot;
172	175	int ret = 0;
173	176
	177	+ if (!rinfo)
	178	+ return 0;
	179	+
174	180	if (is_suspend) {
175	181	pu = rpdata->suspend_fps_pu_slot;
176	182	pd = rpdata->suspend_fps_pd_slot;
@@ -680,7 +686,6 @@ static struct max77620_regulator_info max77620_regs_info[MAX77620_NUM_REGS] = { · 503 unmodified lines
680	686	RAIL_SD(SD1, sd1, "in-sd1", SD1, 600000, 1550000, 12500, 0x22, SD1),
681	687	RAIL_SD(SD2, sd2, "in-sd2", SDX, 600000, 3787500, 12500, 0xFF, NONE),
682	688	RAIL_SD(SD3, sd3, "in-sd3", SDX, 600000, 3787500, 12500, 0xFF, NONE),
683		− RAIL_SD(SD4, sd4, "in-sd4", SDX, 600000, 3787500, 12500, 0xFF, NONE),
684	689
685	690	RAIL_LDO(LDO0, ldo0, "in-ldo0-1", N, 800000, 2375000, 25000),
686	691	RAIL_LDO(LDO1, ldo1, "in-ldo0-1", N, 800000, 2375000, 25000),