Unverified Commit 688c8461 authored by Hans de Goede's avatar Hans de Goede Committed by Mark Brown
Browse files

ASoC: arizona-jack: Use arizona->dev for runtime-pm 



Drivers for MFD child-devices such as the arizona codec drivers
and the arizona-extcon driver can choose to either make
runtime_pm_get/_put calls on their own child-device, which will
then be propagated to their parent; or they can make them directly
on their MFD parent-device.

The arizona-extcon code was using runtime_pm_get/_put calls on
its own child-device where as the codec drivers are using
runtime_pm_get/_put calls on their parent.

The arizona-extcon MFD cell/child-device has been removed and this
commit is part of refactoring the arizona-extcon code into a library
to be used directly from the codec drivers.

Specifically this commit moves the code over to make
runtime_pm_get/_put calls on the parent device (on arizona->dev)
bringing the code inline with how the codec drivers do this.

Note this also removes the pm_runtime_enable/_disable calls
as pm_runtime support has already been enabled on the parent-device
by the arizona MFD driver.

This is part of a patch series converting the arizona extcon driver into
a helper library for letting the arizona codec-drivers directly report
jack state through the standard sound/soc/soc-jack.c functions.

Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Tested-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20210307151807.35201-9-hdegoede@redhat.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bcda8cc4

sound/soc/codecs/arizona-jack.c

+18 −24
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ static void arizona_start_mic(struct arizona_priv *info) 
	unsigned int mode;



	/* Microphone detection can't use idle mode */

	pm_runtime_get_sync(info->dev);

	pm_runtime_get_sync(arizona->dev);



	if (info->detecting) {

		ret = regulator_allow_bypass(info->micvdd, false);
@@ -296,7 +296,7 @@ static void arizona_start_mic(struct arizona_priv *info) 
		dev_err(arizona->dev, "Failed to enable micd: %d\n", ret);

	} else if (!change) {

		regulator_disable(info->micvdd);

		pm_runtime_put_autosuspend(info->dev);

		pm_runtime_put_autosuspend(arizona->dev);

	}

}
@@ -341,8 +341,8 @@ static void arizona_stop_mic(struct arizona_priv *info) 


	if (change) {

		regulator_disable(info->micvdd);

		pm_runtime_mark_last_busy(info->dev);

		pm_runtime_put_autosuspend(info->dev);

		pm_runtime_mark_last_busy(arizona->dev);

		pm_runtime_put_autosuspend(arizona->dev);

	}

}
@@ -534,7 +534,7 @@ static int arizona_hpdet_do_id(struct arizona_priv *info, int *reading, 
		info->num_hpdet_res = 0;

		info->hpdet_retried = true;

		arizona_start_hpdet_acc_id(info);

		pm_runtime_put(info->dev);

		pm_runtime_put(arizona->dev);

		return -EAGAIN;

	}
@@ -631,7 +631,7 @@ static irqreturn_t arizona_hpdet_irq(int irq, void *data) 
		arizona_start_mic(info);



	if (info->hpdet_active) {

		pm_runtime_put_autosuspend(info->dev);

		pm_runtime_put_autosuspend(arizona->dev);

		info->hpdet_active = false;

	}
@@ -656,7 +656,7 @@ static void arizona_identify_headphone(struct arizona_priv *info) 
	dev_dbg(arizona->dev, "Starting HPDET\n");



	/* Make sure we keep the device enabled during the measurement */

	pm_runtime_get_sync(info->dev);

	pm_runtime_get_sync(arizona->dev);



	info->hpdet_active = true;
@@ -685,7 +685,7 @@ static void arizona_identify_headphone(struct arizona_priv *info) 


err:

	arizona_extcon_hp_clamp(info, false);

	pm_runtime_put_autosuspend(info->dev);

	pm_runtime_put_autosuspend(arizona->dev);



	/* Just report headphone */

	ret = extcon_set_state_sync(info->edev, EXTCON_JACK_HEADPHONE, true);
@@ -708,7 +708,7 @@ static void arizona_start_hpdet_acc_id(struct arizona_priv *info) 
	dev_dbg(arizona->dev, "Starting identification via HPDET\n");



	/* Make sure we keep the device enabled during the measurement */

	pm_runtime_get_sync(info->dev);

	pm_runtime_get_sync(arizona->dev);



	info->hpdet_active = true;
@@ -1006,7 +1006,7 @@ static void arizona_micd_detect(struct work_struct *work) 
	else

		arizona_button_reading(info);



	pm_runtime_mark_last_busy(info->dev);

	pm_runtime_mark_last_busy(arizona->dev);

	mutex_unlock(&info->lock);

}
@@ -1090,7 +1090,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data) 
	cancelled_hp = cancel_delayed_work_sync(&info->hpdet_work);

	cancelled_mic = cancel_delayed_work_sync(&info->micd_timeout_work);



	pm_runtime_get_sync(info->dev);

	pm_runtime_get_sync(arizona->dev);



	mutex_lock(&info->lock);
@@ -1110,7 +1110,7 @@ static irqreturn_t arizona_jackdet(int irq, void *data) 
		dev_err(arizona->dev, "Failed to read jackdet status: %d\n",

			ret);

		mutex_unlock(&info->lock);

		pm_runtime_put_autosuspend(info->dev);

		pm_runtime_put_autosuspend(arizona->dev);

		return IRQ_NONE;

	}
@@ -1210,8 +1210,8 @@ static irqreturn_t arizona_jackdet(int irq, void *data) 


	mutex_unlock(&info->lock);



	pm_runtime_mark_last_busy(info->dev);

	pm_runtime_put_autosuspend(info->dev);

	pm_runtime_mark_last_busy(arizona->dev);

	pm_runtime_put_autosuspend(arizona->dev);



	return IRQ_HANDLED;

}
@@ -1366,7 +1366,6 @@ static int arizona_extcon_probe(struct platform_device *pdev) 


	mutex_init(&info->lock);

	info->arizona = arizona;

	info->dev = &pdev->dev;

	info->last_jackdet = ~(ARIZONA_MICD_CLAMP_STS | ARIZONA_JD1_STS);

	INIT_DELAYED_WORK(&info->hpdet_work, arizona_hpdet_work);

	INIT_DELAYED_WORK(&info->micd_detect_work, arizona_micd_detect);
@@ -1617,9 +1616,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) 


	arizona_extcon_set_mode(info, 0);



	pm_runtime_enable(&pdev->dev);

	pm_runtime_idle(&pdev->dev);

	pm_runtime_get_sync(&pdev->dev);

	pm_runtime_get_sync(arizona->dev);



	if (info->micd_clamp) {

		jack_irq_rise = ARIZONA_IRQ_MICD_CLAMP_RISE;
@@ -1689,7 +1686,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
		goto err_hpdet;

	}



	pm_runtime_put(&pdev->dev);

	pm_runtime_put(arizona->dev);



	return 0;
@@ -1706,8 +1703,7 @@ static int arizona_extcon_probe(struct platform_device *pdev) 
err_rise:

	arizona_free_irq(arizona, jack_irq_rise, info);

err_pm:

	pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	pm_runtime_put(arizona->dev);

err_gpio:

	gpiod_put(info->micd_pol_gpio);

	return ret;
@@ -1747,7 +1743,7 @@ static int arizona_extcon_remove(struct platform_device *pdev) 
			ret);

	} else if (change) {

		regulator_disable(info->micvdd);

		pm_runtime_put(info->dev);

		pm_runtime_put(arizona->dev);

	}



	regmap_update_bits(arizona->regmap,
@@ -1759,8 +1755,6 @@ static int arizona_extcon_remove(struct platform_device *pdev) 


	gpiod_put(info->micd_pol_gpio);



	pm_runtime_disable(&pdev->dev);



	return 0;

}

sound/soc/codecs/arizona.h

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ struct arizona_priv { 
	bool dvfs_cached;



	/* Variables used by arizona-jack.c code */

	struct device *dev;

	struct mutex lock;

	struct delayed_work hpdet_work;

	struct delayed_work micd_detect_work;