mfd: arizona: Ensure 32k clock is put on driver unbind and error (ddff6c45) · Commits · 戴 / test

Whilst it doesn't matter if the internal 32k clock register settings are cleaned up on exit, as the part will be turned off losing any settings, hence the driver hasn't historially bothered. The external clock should however be cleaned up, as it could cause clocks to be left on, and will at best generate a warning on unbind. Add clean up on both the probe error path and unbind for the 32k clock. Fixes: ("mfd: arizona: Add gating of external MCLKn clocks") Signed-off-by:

Charles Keepax <ckeepax@opensource.cirrus.com> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/arizona-core.c

+18 −0

Original line number	Diff line number	Diff line
		@@ -1426,6 +1426,15 @@ err_irq:
		arizona_irq_exit(arizona);
		err_pm:
		pm_runtime_disable(arizona->dev);

		switch (arizona->pdata.clk32k_src) {
		case ARIZONA_32KZ_MCLK1:
		case ARIZONA_32KZ_MCLK2:
		arizona_clk32k_disable(arizona);
		break;
		default:
		break;
		}
		err_reset:
		arizona_enable_reset(arizona);
		regulator_disable(arizona->dcvdd);
		@@ -1448,6 +1457,15 @@ int arizona_dev_exit(struct arizona *arizona)
		regulator_disable(arizona->dcvdd);
		regulator_put(arizona->dcvdd);

		switch (arizona->pdata.clk32k_src) {
		case ARIZONA_32KZ_MCLK1:
		case ARIZONA_32KZ_MCLK2:
		arizona_clk32k_disable(arizona);
		break;
		default:
		break;
		}

		mfd_remove_devices(arizona->dev);
		arizona_free_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, arizona);
		arizona_free_irq(arizona, ARIZONA_IRQ_OVERCLOCKED, arizona);

Admin message