ASoC: max98090: Move interrupt request from codec probe to i2c probe
PATCH 1/5 ASoC: max98090: Move interrupt request from codec probe to i2c probe
Keep MAX98090 interrupt requested after i2c device probing as long as the driver is loaded. This fixes the issue where subsequent codec probe max98090_probe() call fails in interrupt request since interrupt wasn't freed over codec remove-reprobe cycle.
--- sound/soc/codecs/max98090.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-)
sound/soc/codecs/max98090.c +16 -13
@@ -2159,12 +2159,16 @@ static void max98090_jack_work(struct work_struct *work)static irqreturn_t max98090_interrupt (int irq,void *data) { -struct snd_soc_codec *codec = data; -struct max98090_priv *max98090 =snd_soc_codec_get_drvdata (codec); +struct max98090_priv *max98090 = data; +struct snd_soc_codec *codec = max98090->codec;int ret;unsigned int mask;unsigned int active; +/* Treat interrupt before codec is initialized as spurious */ +if (codec ==NULL ) +return IRQ_NONE ; +dev_dbg (codec->dev,"***** max98090_interrupt *****\n" ); ret =regmap_read (max98090->regmap,M98090_REG_INTERRUPT_S , &mask);
@@ -2367,17 +2371,6 @@ static int max98090_probe(struct snd_soc_codec *codec)snd_soc_write (codec,M98090_REG_JACK_DETECT ,M98090_JDETEN_MASK |M98090_JDEB_25MS ); -/* Register for interrupts */ -dev_dbg (codec->dev,"irq = %d\n" , max98090->irq); - - ret =devm_request_threaded_irq (codec->dev, max98090->irq,NULL , - max98090_interrupt,IRQF_TRIGGER_FALLING |IRQF_ONESHOT , -"max98090_interrupt" , codec); -if (ret <0 ) { -dev_err (codec->dev,"request_irq failed: %d\n" , - ret); - } -/* * Clear any old interrupts. * An old interrupt ocurring prior to installing the ISR
@@ -2417,6 +2410,7 @@ static int max98090_remove(struct snd_soc_codec *codec)cancel_delayed_work_sync (&max98090->pll_det_enable_work);cancel_work_sync (&max98090->pll_det_disable_work);cancel_work_sync (&max98090->pll_work); + max98090->codec =NULL ;return 0 ; }
@@ -2478,6 +2472,15 @@ static int max98090_i2c_probe(struct i2c_client *i2c, goto err_enable; } + ret =devm_request_threaded_irq (&i2c->dev, max98090->irq,NULL , + max98090_interrupt,IRQF_TRIGGER_FALLING |IRQF_ONESHOT , +"max98090_interrupt" , max98090); +if (ret <0 ) { +dev_err (&i2c->dev,"request_irq failed: %d\n" , + ret); +return ret; + } + ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_max98090, max98090_dai,ARRAY_SIZE (max98090_dai));
Signature · 1 line
2.1.0
PATCH 2/5 ASoC: max98090: Remove structure member irq from private data
struct max98090_priv member irq is now used only locally in max98090_i2c_probe() and can be removed.
--- sound/soc/codecs/max98090.c | 3 +-- sound/soc/codecs/max98090.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
sound/soc/codecs/max98090.c +1 -2
@@ -2463,7 +2463,6 @@ static int max98090_i2c_probe(struct i2c_client *i2c, max98090->devtype = driver_data;i2c_set_clientdata (i2c, max98090); max98090->pdata = i2c->dev.platform_data; - max98090->irq = i2c->irq; max98090->regmap =devm_regmap_init_i2c (i2c, &max98090_regmap);if (IS_ERR (max98090->regmap)) {
@@ -2472,7 +2471,7 @@ static int max98090_i2c_probe(struct i2c_client *i2c, goto err_enable; } - ret =devm_request_threaded_irq (&i2c->dev, max98090->irq,NULL , + ret =devm_request_threaded_irq (&i2c->dev, i2c->irq,NULL , max98090_interrupt,IRQF_TRIGGER_FALLING |IRQF_ONESHOT ,"max98090_interrupt" , max98090);if (ret <0 ) {
sound/soc/codecs/max98090.h +0 -1
@@ -1529,7 +1529,6 @@ struct max98090_priv {unsigned int bclk;unsigned int lrclk;struct max98090_cdata dai[1 ]; -int irq;int jack_state;struct delayed_work jack_work;struct delayed_work pll_det_enable_work;
Signature · 1 line
2.1.0
PATCH 3/5 ASoC: max98090: Remove structure member extmic_mux from private data
In reply to Jarkko NikulaThere is no other use for extmic_mux than setting it to zero so remove it.
--- sound/soc/codecs/max98090.c | 1 - sound/soc/codecs/max98090.h | 1 - 2 files changed, 2 deletions(-)
sound/soc/codecs/max98090.c +0 -1
@@ -2333,7 +2333,6 @@ static int max98090_probe(struct snd_soc_codec *codec) max98090->lin_state =0 ; max98090->pa1en =0 ; max98090->pa2en =0 ; - max98090->extmic_mux =0 ; ret =snd_soc_read (codec,M98090_REG_REVISION_ID );if (ret <0 ) {
sound/soc/codecs/max98090.h +0 -1
@@ -1541,7 +1541,6 @@ struct max98090_priv {u8 lin_state;unsigned int pa1en;unsigned int pa2en; -unsigned int extmic_mux;unsigned int sidetone;bool master; };
Signature · 1 line
2.1.0
PATCH 4/5 ASoC: max98090: Remove unused version define
In reply to Jarkko Nikula--- sound/soc/codecs/max98090.h | 5 ----- 1 file changed, 5 deletions(-)
sound/soc/codecs/max98090.h +0 -5
@@ -11,11 +11,6 @@#ifndef _MAX98090_H#define _MAX98090_H -#include <linux/version.h> - -/* One can override the Linux version here with an explicit version number */ -#define M98090_LINUX_VERSION LINUX_VERSION_CODE -/* * MAX98090 Register Definitions */
Signature · 1 line
2.1.0
PATCH 5/5 ASoC: max98090: Remove unused byte access macros
In reply to Jarkko Nikula--- sound/soc/codecs/max98090.h | 3 --- 1 file changed, 3 deletions(-)
sound/soc/codecs/max98090.h +0 -3
@@ -1497,9 +1497,6 @@#define M98090_REVID_WIDTH 8#define M98090_REVID_NUM (1<<M98090_REVID_WIDTH) -#define M98090_BYTE1 (w) ((w >> 8) & 0xff) -#define M98090_BYTE0 (w) (w & 0xff) -/* Silicon revision number */ #define M98090_REVA 0x40#define M98091_REVA 0x50
Signature · 1 line
2.1.0
Quoted 4 lines · Jarkko Nikula
Keep MAX98090 interrupt requested after i2c device probing as long as the driver is loaded. This fixes the issue where subsequent codec probe
max98090_probe()call fails in interrupt request since interrupt wasn't freed over codec remove-reprobe cycle.
Applied all, thanks.