Merge "gdsc: Dump GDSC register state if operations time out" (cffd2721) · Commits · e / devices / android_kernel_sony_msm8994

drivers/clk/qcom/gdsc.c

+9 −9

Original line number	Original line	Diff line number	Diff line
	/*		/*
	* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.		* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License version 2 and		* it under the terms of the GNU General Public License version 2 and
	@@ -83,8 +83,8 @@ static int gdsc_enable(struct regulator_dev *rdev)
	ret = readl_tight_poll_timeout(sc->gdscr, regval,		ret = readl_tight_poll_timeout(sc->gdscr, regval,
	regval & PWR_ON_MASK, TIMEOUT_US);		regval & PWR_ON_MASK, TIMEOUT_US);
	if (ret) {		if (ret) {
	dev_err(&rdev->dev, "%s enable timed out\n",		dev_err(&rdev->dev, "%s enable timed out: 0x%x\n",
	sc->rdesc.name);		sc->rdesc.name, regval);
	return ret;		return ret;
	}		}
	} else {		} else {
	@@ -139,8 +139,8 @@ static int gdsc_disable(struct regulator_dev *rdev)
	!(regval & PWR_ON_MASK),		!(regval & PWR_ON_MASK),
	TIMEOUT_US);		TIMEOUT_US);
	if (ret)		if (ret)
	dev_err(&rdev->dev, "%s disable timed out\n",		dev_err(&rdev->dev, "%s disable timed out: 0x%x\n",
	sc->rdesc.name);		sc->rdesc.name, regval);
	} else {		} else {
	for (i = sc->clock_count-1; i >= 0; i--)		for (i = sc->clock_count-1; i >= 0; i--)
	clk_reset(sc->clocks[i], CLK_RESET_ASSERT);		clk_reset(sc->clocks[i], CLK_RESET_ASSERT);
	@@ -212,8 +212,8 @@ static int gdsc_set_mode(struct regulator_dev *rdev, unsigned int mode)
	ret = readl_tight_poll_timeout(sc->gdscr, regval,		ret = readl_tight_poll_timeout(sc->gdscr, regval,
	regval & PWR_ON_MASK, TIMEOUT_US);		regval & PWR_ON_MASK, TIMEOUT_US);
	if (ret) {		if (ret) {
	dev_err(&rdev->dev, "%s set_mode timed out\n",		dev_err(&rdev->dev, "%s set_mode timed out: 0x%x\n",
	sc->rdesc.name);		sc->rdesc.name, regval);
	return ret;		return ret;
	}		}
	break;		break;
	@@ -334,8 +334,8 @@ static int gdsc_probe(struct platform_device *pdev)
	ret = readl_tight_poll_timeout(sc->gdscr, regval,		ret = readl_tight_poll_timeout(sc->gdscr, regval,
	regval & PWR_ON_MASK, TIMEOUT_US);		regval & PWR_ON_MASK, TIMEOUT_US);
	if (ret) {		if (ret) {
	dev_err(&pdev->dev, "%s enable timed out\n",		dev_err(&pdev->dev, "%s enable timed out: 0x%x\n",
	sc->rdesc.name);		sc->rdesc.name, regval);
	return ret;		return ret;
	}		}
	}		}