Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f628c4ed authored by Jeffy Chen's avatar Jeffy Chen Committed by Mark Brown
Browse files

ASoC: rockchip: Correct 'dmic-delay' property name 



The 'dmic-delay' property name is different with the dt-binding.

So correct it with 'dmic-wakeup-delay-ms'.

Fixes: 3a6f9dce (ASoC: rk3399_gru_sound: fix recording pop at first attempt)
Signed-off-by: default avatarJeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent dc94d245

sound/soc/rockchip/rk3399_gru_sound.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -38,7 +38,7 @@ 




#define SOUND_FS	256

#define SOUND_FS	256





static unsigned int rt5514_dmic_delay;

static unsigned int dmic_wakeup_delay;





static struct snd_soc_jack rockchip_sound_jack;

static struct snd_soc_jack rockchip_sound_jack;
@@ -126,7 +126,7 @@ static int rockchip_sound_rt5514_hw_params(struct snd_pcm_substream *substream, 
	}

	}





	/* Wait for DMIC stable */

	/* Wait for DMIC stable */

	msleep(rt5514_dmic_delay);

	msleep(dmic_wakeup_delay);





	return 0;

	return 0;

}

}
@@ -348,13 +348,13 @@ static int rockchip_sound_probe(struct platform_device *pdev) 
		return -ENODEV;

		return -ENODEV;

	}

	}





	/* Set DMIC delay */

	/* Set DMIC wakeup delay */

	ret = device_property_read_u32(&pdev->dev, "dmic-delay",

	ret = device_property_read_u32(&pdev->dev, "dmic-wakeup-delay-ms",

					&rt5514_dmic_delay);

					&dmic_wakeup_delay);

	if (ret) {

	if (ret) {

		rt5514_dmic_delay = 0;

		dmic_wakeup_delay = 0;

		dev_dbg(&pdev->dev,

		dev_dbg(&pdev->dev,

			"no optional property 'dmic-delay' found, default: no delay\n");

			"no optional property 'dmic-wakeup-delay-ms' found, default: no delay\n");

	}

	}





	rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL);

	rockchip_dailinks[DAILINK_RT5514_DSP].cpu_name = kstrdup_const(dev_name(dev), GFP_KERNEL);