On Fri, 08 Aug 2014, Richard Fitzgerald wrote:
> From: Richard Fitzgerald <r...@opensource.wolfsonmicro.com>
>
> Moving this control from being a side-effect of the LDO1
> regulator driver to a specific exported function.
>
> Signed-off-by: Richard Fitzgerald <r...@opensource.wolfsonmicro.com>
> Signed-off-by: Charles Keepax <ckee...@opensource.wolfsonmicro.com>
> ---
> drivers/mfd/arizona-core.c | 89
> ++++++++++++++++++++++++++++++++++++++
> include/linux/mfd/arizona/core.h | 12 +++++
> 2 files changed, 101 insertions(+), 0 deletions(-)
If this is the same patch I reviewed before:
Acked-by: Lee Jones <lee.jo...@linaro.org>
I guess we're just waiting for maintainer Acks before I can apply the
set.
> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index cfc191a..04cde4b 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -94,6 +94,94 @@ int arizona_clk32k_disable(struct arizona *arizona)
> }
> EXPORT_SYMBOL_GPL(arizona_clk32k_disable);
>
> +int arizona_dvfs_up(struct arizona *arizona, unsigned int flags)
> +{
> + unsigned int new_flags;
> + int ret = 0;
> +
> + mutex_lock(&arizona->subsys_max_lock);
> +
> + new_flags = arizona->subsys_max_rq | flags;
> +
> + if (arizona->subsys_max_rq != new_flags) {
> + switch (arizona->type) {
> + case WM5102:
> + case WM8997:
> + ret = regulator_set_voltage(arizona->dcvdd,
> + 1800000, 1800000);
> + if (ret != 0) {
> + dev_err(arizona->dev,
> + "Failed to set DCVDD (DVFS up): %d\n",
> + ret);
> + goto err;
> + }
> +
> + ret = regmap_update_bits(arizona->regmap,
> + ARIZONA_DYNAMIC_FREQUENCY_SCALING_1,
> + ARIZONA_SUBSYS_MAX_FREQ, 1);
> + if (ret != 0) {
> + dev_err(arizona->dev,
> + "Failed to enable subsys max: %d\n",
> + ret);
> + regulator_set_voltage(arizona->dcvdd,
> + 1200000, 1800000);
> + goto err;
> + }
> + break;
> +
> + default:
> + break;
> + }
> +
> + arizona->subsys_max_rq = new_flags;
> + }
> +err:
> + mutex_unlock(&arizona->subsys_max_lock);
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(arizona_dvfs_up);
> +
> +int arizona_dvfs_down(struct arizona *arizona, unsigned int flags)
> +{
> + int ret = 0;
> +
> + mutex_lock(&arizona->subsys_max_lock);
> +
> + if ((arizona->subsys_max_rq & flags) != flags)
> + dev_warn(arizona->dev, "Unbalanced DVFS down: %x\n", flags);
> +
> + arizona->subsys_max_rq &= ~flags;
> +
> + if (arizona->subsys_max_rq == 0) {
> + switch (arizona->type) {
> + case WM5102:
> + case WM8997:
> + ret = regmap_update_bits(arizona->regmap,
> + ARIZONA_DYNAMIC_FREQUENCY_SCALING_1,
> + ARIZONA_SUBSYS_MAX_FREQ, 0);
> + if (ret != 0)
> + dev_err(arizona->dev,
> + "Failed to disable subsys max: %d\n",
> + ret);
> +
> + ret = regulator_set_voltage(arizona->dcvdd,
> + 1200000, 1800000);
> + if (ret != 0)
> + dev_err(arizona->dev,
> + "Failed to set DCVDD (DVFS down): %d\n",
> + ret);
> + break;
> +
> + default:
> + break;
> + }
> + }
> +
> + mutex_unlock(&arizona->subsys_max_lock);
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(arizona_dvfs_down);
> +
> static irqreturn_t arizona_clkgen_err(int irq, void *data)
> {
> struct arizona *arizona = data;
> @@ -641,6 +729,7 @@ int arizona_dev_init(struct arizona *arizona)
>
> dev_set_drvdata(arizona->dev, arizona);
> mutex_init(&arizona->clk_lock);
> + mutex_init(&arizona->subsys_max_lock);
>
> if (dev_get_platdata(arizona->dev))
> memcpy(&arizona->pdata, dev_get_platdata(arizona->dev),
> diff --git a/include/linux/mfd/arizona/core.h
> b/include/linux/mfd/arizona/core.h
> index a614b33..4aec6a3 100644
> --- a/include/linux/mfd/arizona/core.h
> +++ b/include/linux/mfd/arizona/core.h
> @@ -109,6 +109,9 @@ struct arizona {
> struct mutex clk_lock;
> int clk32k_ref;
>
> + struct mutex subsys_max_lock;
> + unsigned int subsys_max_rq;
> +
> struct snd_soc_dapm_context *dapm;
>
> int tdm_width[ARIZONA_MAX_AIF];
> @@ -118,8 +121,17 @@ struct arizona {
> uint8_t dac_comp_enabled;
> };
>
> +#define ARIZONA_DVFS_SR1_RQ 0x00000001
> +#define ARIZONA_DVFS_SR2_RQ 0x00000002
> +#define ARIZONA_DVFS_SR3_RQ 0x00000004
> +#define ARIZONA_DVFS_ASR1_RQ 0x00000010
> +#define ARIZONA_DVFS_ASR2_RQ 0x00000020
> +#define ARIZONA_DVFS_ADSP1_RQ 0x00010000
> +
> int arizona_clk32k_enable(struct arizona *arizona);
> int arizona_clk32k_disable(struct arizona *arizona);
> +int arizona_dvfs_up(struct arizona *arizona, unsigned int mask);
> +int arizona_dvfs_down(struct arizona *arizona, unsigned int mask);
>
> int arizona_request_irq(struct arizona *arizona, int irq, char *name,
> irq_handler_t handler, void *data);
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
