ASoC: twl6040: Configure ramp step based on platform (1fbe9952) · Commits · 戴 / test

include/linux/i2c/twl.h

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -664,6 +664,10 @@ struct twl4030_codec_data {
	unsigned int check_defaults:1;		unsigned int check_defaults:1;
	unsigned int reset_registers:1;		unsigned int reset_registers:1;
	unsigned int hs_extmute:1;		unsigned int hs_extmute:1;
			u16 hs_left_step;
			u16 hs_right_step;
			u16 hf_left_step;
			u16 hf_right_step;
	void (*set_hs_extmute)(int mute);		void (*set_hs_extmute)(int mute);
	};		};

sound/soc/codecs/twl6040.c

+71 −20

Original line number	Original line	Diff line number	Diff line
	@@ -83,6 +83,10 @@ struct twl6040_data {
	int hs_power_mode_locked;		int hs_power_mode_locked;
	unsigned int clk_in;		unsigned int clk_in;
	unsigned int sysclk;		unsigned int sysclk;
			u16 hs_left_step;
			u16 hs_right_step;
			u16 hf_left_step;
			u16 hf_right_step;
	struct snd_pcm_hw_constraint_list *sysclk_constraints;		struct snd_pcm_hw_constraint_list *sysclk_constraints;
	struct twl6040_jack_data hs_jack;		struct twl6040_jack_data hs_jack;
	struct snd_soc_codec *codec;		struct snd_soc_codec *codec;
	@@ -339,7 +343,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
	if (headset->ramp == TWL6040_RAMP_UP) {		if (headset->ramp == TWL6040_RAMP_UP) {
	/* ramp step up */		/* ramp step up */
	if (val < headset->left_vol) {		if (val < headset->left_vol) {
			if (val + left_step > headset->left_vol)
			val = headset->left_vol;
			else
	val += left_step;		val += left_step;

	reg &= ~TWL6040_HSL_VOL_MASK;		reg &= ~TWL6040_HSL_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HSGAIN,		twl6040_write(codec, TWL6040_REG_HSGAIN,
	(reg \| (~val & TWL6040_HSL_VOL_MASK)));		(reg \| (~val & TWL6040_HSL_VOL_MASK)));
	@@ -349,7 +357,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
	} else if (headset->ramp == TWL6040_RAMP_DOWN) {		} else if (headset->ramp == TWL6040_RAMP_DOWN) {
	/* ramp step down */		/* ramp step down */
	if (val > 0x0) {		if (val > 0x0) {
			if ((int)val - (int)left_step < 0)
			val = 0;
			else
	val -= left_step;		val -= left_step;

	reg &= ~TWL6040_HSL_VOL_MASK;		reg &= ~TWL6040_HSL_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HSGAIN, reg \|		twl6040_write(codec, TWL6040_REG_HSGAIN, reg \|
	(~val & TWL6040_HSL_VOL_MASK));		(~val & TWL6040_HSL_VOL_MASK));
	@@ -366,7 +378,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
	if (headset->ramp == TWL6040_RAMP_UP) {		if (headset->ramp == TWL6040_RAMP_UP) {
	/* ramp step up */		/* ramp step up */
	if (val < headset->right_vol) {		if (val < headset->right_vol) {
			if (val + right_step > headset->right_vol)
			val = headset->right_vol;
			else
	val += right_step;		val += right_step;

	reg &= ~TWL6040_HSR_VOL_MASK;		reg &= ~TWL6040_HSR_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HSGAIN,		twl6040_write(codec, TWL6040_REG_HSGAIN,
	(reg \| (~val << TWL6040_HSR_VOL_SHIFT)));		(reg \| (~val << TWL6040_HSR_VOL_SHIFT)));
	@@ -376,7 +392,11 @@ static inline int twl6040_hs_ramp_step(struct snd_soc_codec *codec,
	} else if (headset->ramp == TWL6040_RAMP_DOWN) {		} else if (headset->ramp == TWL6040_RAMP_DOWN) {
	/* ramp step down */		/* ramp step down */
	if (val > 0x0) {		if (val > 0x0) {
			if ((int)val - (int)right_step < 0)
			val = 0;
			else
	val -= right_step;		val -= right_step;

	reg &= ~TWL6040_HSR_VOL_MASK;		reg &= ~TWL6040_HSR_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HSGAIN,		twl6040_write(codec, TWL6040_REG_HSGAIN,
	reg \| (~val << TWL6040_HSR_VOL_SHIFT));		reg \| (~val << TWL6040_HSR_VOL_SHIFT));
	@@ -407,7 +427,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
	if (handsfree->ramp == TWL6040_RAMP_UP) {		if (handsfree->ramp == TWL6040_RAMP_UP) {
	/* ramp step up */		/* ramp step up */
	if (val < handsfree->left_vol) {		if (val < handsfree->left_vol) {
			if (val + left_step > handsfree->left_vol)
			val = handsfree->left_vol;
			else
	val += left_step;		val += left_step;

	reg &= ~TWL6040_HF_VOL_MASK;		reg &= ~TWL6040_HF_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HFLGAIN,		twl6040_write(codec, TWL6040_REG_HFLGAIN,
	reg \| (0x1D - val));		reg \| (0x1D - val));
	@@ -417,7 +441,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
	} else if (handsfree->ramp == TWL6040_RAMP_DOWN) {		} else if (handsfree->ramp == TWL6040_RAMP_DOWN) {
	/* ramp step down */		/* ramp step down */
	if (val > 0) {		if (val > 0) {
			if ((int)val - (int)left_step < 0)
			val = 0;
			else
	val -= left_step;		val -= left_step;

	reg &= ~TWL6040_HF_VOL_MASK;		reg &= ~TWL6040_HF_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HFLGAIN,		twl6040_write(codec, TWL6040_REG_HFLGAIN,
	reg \| (0x1D - val));		reg \| (0x1D - val));
	@@ -434,7 +462,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
	if (handsfree->ramp == TWL6040_RAMP_UP) {		if (handsfree->ramp == TWL6040_RAMP_UP) {
	/* ramp step up */		/* ramp step up */
	if (val < handsfree->right_vol) {		if (val < handsfree->right_vol) {
			if (val + right_step > handsfree->right_vol)
			val = handsfree->right_vol;
			else
	val += right_step;		val += right_step;

	reg &= ~TWL6040_HF_VOL_MASK;		reg &= ~TWL6040_HF_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HFRGAIN,		twl6040_write(codec, TWL6040_REG_HFRGAIN,
	reg \| (0x1D - val));		reg \| (0x1D - val));
	@@ -444,7 +476,11 @@ static inline int twl6040_hf_ramp_step(struct snd_soc_codec *codec,
	} else if (handsfree->ramp == TWL6040_RAMP_DOWN) {		} else if (handsfree->ramp == TWL6040_RAMP_DOWN) {
	/* ramp step down */		/* ramp step down */
	if (val > 0) {		if (val > 0) {
			if ((int)val - (int)right_step < 0)
			val = 0;
			else
	val -= right_step;		val -= right_step;

	reg &= ~TWL6040_HF_VOL_MASK;		reg &= ~TWL6040_HF_VOL_MASK;
	twl6040_write(codec, TWL6040_REG_HFRGAIN,		twl6040_write(codec, TWL6040_REG_HFRGAIN,
	reg \| (0x1D - val));		reg \| (0x1D - val));
	@@ -473,8 +509,6 @@ static void twl6040_pga_hs_work(struct work_struct *work)

	/* HS PGA volumes have 4 bits of resolution to ramp */		/* HS PGA volumes have 4 bits of resolution to ramp */
	for (i = 0; i <= 16; i++) {		for (i = 0; i <= 16; i++) {
	headset_complete = 1;
	if (headset->ramp != TWL6040_RAMP_NONE)
	headset_complete = twl6040_hs_ramp_step(codec,		headset_complete = twl6040_hs_ramp_step(codec,
	headset->left_step,		headset->left_step,
	headset->right_step);		headset->right_step);
	@@ -518,8 +552,6 @@ static void twl6040_pga_hf_work(struct work_struct *work)

	/* HF PGA volumes have 5 bits of resolution to ramp */		/* HF PGA volumes have 5 bits of resolution to ramp */
	for (i = 0; i <= 32; i++) {		for (i = 0; i <= 32; i++) {
	handsfree_complete = 1;
	if (handsfree->ramp != TWL6040_RAMP_NONE)
	handsfree_complete = twl6040_hf_ramp_step(codec,		handsfree_complete = twl6040_hf_ramp_step(codec,
	handsfree->left_step,		handsfree->left_step,
	handsfree->right_step);		handsfree->right_step);
	@@ -563,12 +595,16 @@ static int pga_event(struct snd_soc_dapm_widget *w,
	out = &priv->headset;		out = &priv->headset;
	work = &priv->hs_delayed_work;		work = &priv->hs_delayed_work;
	queue = priv->hs_workqueue;		queue = priv->hs_workqueue;
			out->left_step = priv->hs_left_step;
			out->right_step = priv->hs_right_step;
	out->step_delay = 5; /* 5 ms between volume ramp steps */		out->step_delay = 5; /* 5 ms between volume ramp steps */
	break;		break;
	case 4:		case 4:
	out = &priv->handsfree;		out = &priv->handsfree;
	work = &priv->hf_delayed_work;		work = &priv->hf_delayed_work;
	queue = priv->hf_workqueue;		queue = priv->hf_workqueue;
			out->left_step = priv->hf_left_step;
			out->right_step = priv->hf_right_step;
	out->step_delay = 5; /* 5 ms between volume ramp steps */		out->step_delay = 5; /* 5 ms between volume ramp steps */
	if (SND_SOC_DAPM_EVENT_ON(event))		if (SND_SOC_DAPM_EVENT_ON(event))
	priv->non_lp++;		priv->non_lp++;
	@@ -601,8 +637,6 @@ static int pga_event(struct snd_soc_dapm_widget *w,

	if (!delayed_work_pending(work)) {		if (!delayed_work_pending(work)) {
	/* use volume ramp for power-down */		/* use volume ramp for power-down */
	out->left_step = 1;
	out->right_step = 1;
	out->ramp = TWL6040_RAMP_DOWN;		out->ramp = TWL6040_RAMP_DOWN;
	INIT_COMPLETION(out->ramp_done);		INIT_COMPLETION(out->ramp_done);

	@@ -1492,6 +1526,7 @@ static int twl6040_resume(struct snd_soc_codec *codec)
	static int twl6040_probe(struct snd_soc_codec *codec)		static int twl6040_probe(struct snd_soc_codec *codec)
	{		{
	struct twl6040_data *priv;		struct twl6040_data *priv;
			struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev);
	int ret = 0;		int ret = 0;

	priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);		priv = kzalloc(sizeof(struct twl6040_data), GFP_KERNEL);
	@@ -1502,6 +1537,22 @@ static int twl6040_probe(struct snd_soc_codec *codec)
	priv->codec = codec;		priv->codec = codec;
	codec->control_data = dev_get_drvdata(codec->dev->parent);		codec->control_data = dev_get_drvdata(codec->dev->parent);

			if (pdata && pdata->hs_left_step && pdata->hs_right_step) {
			priv->hs_left_step = pdata->hs_left_step;
			priv->hs_right_step = pdata->hs_right_step;
			} else {
			priv->hs_left_step = 1;
			priv->hs_right_step = 1;
			}

			if (pdata && pdata->hf_left_step && pdata->hf_right_step) {
			priv->hf_left_step = pdata->hf_left_step;
			priv->hf_right_step = pdata->hf_right_step;
			} else {
			priv->hf_left_step = 1;
			priv->hf_right_step = 1;
			}

	priv->sysclk_constraints = &hp_constraints;		priv->sysclk_constraints = &hp_constraints;
	priv->workqueue = create_singlethread_workqueue("twl6040-codec");		priv->workqueue = create_singlethread_workqueue("twl6040-codec");
	if (!priv->workqueue) {		if (!priv->workqueue) {

Admin message