ASoC: wm_adsp: Allow bus error handler to be called directly
Subsystems (5)
Charles Keepax
maintainerPATCH 1/3 ASoC: wm_adsp: Allow bus error handler to be called directly
There is no need for end drivers to add helper functions to allow the bus error handler to be called, simply update the prototype so it can be called directly.
--- sound/soc/codecs/cs47l90.c | 9 +-------- sound/soc/codecs/wm_adsp.c | 6 ++++-- sound/soc/codecs/wm_adsp.h | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-)
sound/soc/codecs/cs47l90.c +1 -8
@@ -2402,13 +2402,6 @@ static irqreturn_t cs47l90_adsp2_irq(int irq, void *data)return IRQ_HANDLED ; } -static irqreturn_t cs47l90_dsp_bus_error (int irq,void *data) -{ -struct wm_adsp *dsp = (struct wm_adsp *)data; - -return wm_adsp2_bus_error (dsp); -} -static int cs47l90_component_probe (struct snd_soc_component *component) {struct cs47l90 *cs47l90 =snd_soc_component_get_drvdata (component);
@@ -2558,7 +2551,7 @@ static int cs47l90_probe(struct platform_device *pdev)if (ret ==0 ) { ret =madera_init_bus_error_irq (&cs47l90->core, i, - cs47l90_dsp_bus_error); + wm_adsp2_bus_error);if (ret !=0 )wm_adsp2_remove (&cs47l90->core.adsp[i]); }
sound/soc/codecs/wm_adsp.c +4 -2
@@ -4242,8 +4242,9 @@ static void wm_adsp_fatal_error(struct wm_adsp *dsp) } } -irqreturn_t wm_adsp2_bus_error (struct wm_adsp *dsp) +irqreturn_t wm_adsp2_bus_error (int irq,void *data) { +struct wm_adsp *dsp = (struct wm_adsp *)data;unsigned int val;struct regmap *regmap = dsp->regmap;int ret =0 ;
@@ -4307,8 +4308,9 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) }EXPORT_SYMBOL_GPL (wm_adsp2_bus_error); -irqreturn_t wm_halo_bus_error (struct wm_adsp *dsp) +irqreturn_t wm_halo_bus_error (int irq,void *data) { +struct wm_adsp *dsp = (struct wm_adsp *)data;struct regmap *regmap = dsp->regmap;unsigned int fault[6 ];struct reg_sequence clear[] = {
sound/soc/codecs/wm_adsp.h +2 -2
@@ -171,8 +171,8 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,int wm_adsp_early_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event); -irqreturn_t wm_adsp2_bus_error (struct wm_adsp *adsp); -irqreturn_t wm_halo_bus_error (struct wm_adsp *dsp); +irqreturn_t wm_adsp2_bus_error (int irq,void *data); +irqreturn_t wm_halo_bus_error (int irq,void *data);irqreturn_t wm_halo_wdt_expire (int irq,void *data); int wm_adsp_event(struct snd_soc_dapm_widget *w,
Signature · 1 line
2.11.0
Charles Keepax
maintainerPATCH v3 2/3 ASoC: cs47l15: Add codec driver for Cirrus Logic CS47L15
From: Richard Fitzgerald <[email protected]>
Adds the codec driver for the CS47L15 SmartCodec. This is a multi-functional codec based on the Cirrus Logic Madera platform.
---
Changes since v2:
- Put Kconfig and Makefile in the correct order
- Remove bus error helper function
Thanks,
Charles
sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l15.c | 1490 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/madera.c | 4 + 4 files changed, 1502 insertions(+) create mode 100644 sound/soc/codecs/cs47l15.c
sound/soc/codecs/Kconfig +6 -0
@@ -70,6 +70,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS43130 if I2C select SND_SOC_CS4341 if SND_SOC_I2C_AND_SPI select SND_SOC_CS4349 if I2C + select SND_SOC_CS47L15 if MFD_CS47L15 select SND_SOC_CS47L24 if MFD_CS47L24 select SND_SOC_CS47L35 if MFD_CS47L35 select SND_SOC_CS47L85 if MFD_CS47L85
@@ -581,6 +582,9 @@ config SND_SOC_CS4349 tristate "Cirrus Logic CS4349 CODEC" depends on I2C +config SND_SOC_CS47L15 + tristate + config SND_SOC_CS47L24 tristate
@@ -722,9 +726,11 @@ config SND_SOC_LOCHNAGAR_SC config SND_SOC_MADERA tristate + default y if SND_SOC_CS47L15=y default y if SND_SOC_CS47L35=y default y if SND_SOC_CS47L85=y default y if SND_SOC_CS47L90=y + default m if SND_SOC_CS47L15=m default m if SND_SOC_CS47L35=m default m if SND_SOC_CS47L85=m default m if SND_SOC_CS47L90=m
sound/soc/codecs/Makefile +2 -0
@@ -64,6 +64,7 @@ snd-soc-cs42xx8-i2c-objs := cs42xx8-i2c.o snd-soc-cs43130-objs := cs43130.o snd-soc-cs4341-objs := cs4341.o snd-soc-cs4349-objs := cs4349.o +snd-soc-cs47l15-objs := cs47l15.o snd-soc-cs47l24-objs := cs47l24.o snd-soc-cs47l35-objs := cs47l35.o snd-soc-cs47l85-objs := cs47l85.o
@@ -346,6 +347,7 @@ obj-$(CONFIG_SND_SOC_CS43130) += snd-soc-cs43130.o obj-$(CONFIG_SND_SOC_CS4341) += snd-soc-cs4341.o obj-$(CONFIG_SND_SOC_CS4349) += snd-soc-cs4349.o obj-$(CONFIG_SND_SOC_CS47L24) += snd-soc-cs47l24.o +obj-$(CONFIG_SND_SOC_CS47L15) += snd-soc-cs47l15.o obj-$(CONFIG_SND_SOC_CS47L35) += snd-soc-cs47l35.o obj-$(CONFIG_SND_SOC_CS47L85) += snd-soc-cs47l85.o obj-$(CONFIG_SND_SOC_CS47L90) += snd-soc-cs47l90.o
sound/soc/codecs/cs47l15.c new file +1490 -0
1,490 lines not on this page · raw message
sound/soc/codecs/madera.c +4 -0
@@ -1041,6 +1041,10 @@ static void madera_configure_input_mode(struct madera *madera)int max_analogue_inputs, max_dmic_sup, i;switch (madera->type) { +case CS47L15 : + max_analogue_inputs =1 ; + max_dmic_sup =2 ; +break ;case CS47L35 : max_analogue_inputs =2 ; max_dmic_sup =2 ;
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: cs47l15: Add codec driver for Cirrus Logic CS47L15" to the asoc tree
The patch
ASoC: cs47l15: Add codec driver for Cirrus Logic CS47L15
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
9cba2d6a144741ad99bfa379337bb984a8ed94bdMon Sep 17 00:00:00 2001
From: Richard Fitzgerald <[email protected]>
Date: Thu, 25 Jul 2019 17:39:30 +0100
Subject: [PATCH] ASoC: cs47l15: Add codec driver for Cirrus Logic CS47L15
Adds the codec driver for the CS47L15 SmartCodec. This is a multi-functional codec based on the Cirrus Logic Madera platform.
--- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l15.c | 1490 ++++++++++++++++++++++++++++++++++++ sound/soc/codecs/madera.c | 4 + 4 files changed, 1502 insertions(+) create mode 100644 sound/soc/codecs/cs47l15.c
sound/soc/codecs/Kconfig +6 -0
@@ -70,6 +70,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS43130 if I2C select SND_SOC_CS4341 if SND_SOC_I2C_AND_SPI select SND_SOC_CS4349 if I2C + select SND_SOC_CS47L15 if MFD_CS47L15 select SND_SOC_CS47L24 if MFD_CS47L24 select SND_SOC_CS47L35 if MFD_CS47L35 select SND_SOC_CS47L85 if MFD_CS47L85
@@ -581,6 +582,9 @@ config SND_SOC_CS4349 tristate "Cirrus Logic CS4349 CODEC" depends on I2C +config SND_SOC_CS47L15 + tristate + config SND_SOC_CS47L24 tristate
@@ -722,9 +726,11 @@ config SND_SOC_LOCHNAGAR_SC config SND_SOC_MADERA tristate + default y if SND_SOC_CS47L15=y default y if SND_SOC_CS47L35=y default y if SND_SOC_CS47L85=y default y if SND_SOC_CS47L90=y + default m if SND_SOC_CS47L15=m default m if SND_SOC_CS47L35=m default m if SND_SOC_CS47L85=m default m if SND_SOC_CS47L90=m
sound/soc/codecs/Makefile +2 -0
@@ -64,6 +64,7 @@ snd-soc-cs42xx8-i2c-objs := cs42xx8-i2c.o snd-soc-cs43130-objs := cs43130.o snd-soc-cs4341-objs := cs4341.o snd-soc-cs4349-objs := cs4349.o +snd-soc-cs47l15-objs := cs47l15.o snd-soc-cs47l24-objs := cs47l24.o snd-soc-cs47l35-objs := cs47l35.o snd-soc-cs47l85-objs := cs47l85.o
@@ -346,6 +347,7 @@ obj-$(CONFIG_SND_SOC_CS43130) += snd-soc-cs43130.o obj-$(CONFIG_SND_SOC_CS4341) += snd-soc-cs4341.o obj-$(CONFIG_SND_SOC_CS4349) += snd-soc-cs4349.o obj-$(CONFIG_SND_SOC_CS47L24) += snd-soc-cs47l24.o +obj-$(CONFIG_SND_SOC_CS47L15) += snd-soc-cs47l15.o obj-$(CONFIG_SND_SOC_CS47L35) += snd-soc-cs47l35.o obj-$(CONFIG_SND_SOC_CS47L85) += snd-soc-cs47l85.o obj-$(CONFIG_SND_SOC_CS47L90) += snd-soc-cs47l90.o
sound/soc/codecs/cs47l15.c new file +1490 -0
1,490 lines not on this page · raw message
sound/soc/codecs/madera.c +4 -0
@@ -1041,6 +1041,10 @@ static void madera_configure_input_mode(struct madera *madera)int max_analogue_inputs, max_dmic_sup, i;switch (madera->type) { +case CS47L15 : + max_analogue_inputs =1 ; + max_dmic_sup =2 ; +break ;case CS47L35 : max_analogue_inputs =2 ; max_dmic_sup =2 ;
Signature · 1 line
2.20.1
Charles Keepax
maintainerPATCH v3 3/3 ASoC: cs47l92: Add codec driver for Cirrus Logic CS47L92
In reply to Charles KeepaxFrom: Stuart Henderson <[email protected]>
Adds the codec driver for the CS47L92 SmartCodec. This is a multi-functional codec based on the Cirrus Logic Madera platform.
---
Changes since v2:
- Remove bus error helper function
Thanks,
Charles
sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l92.c | 2039 ++++++++++++++++++++++++++++++++++++++++++++ sound/soc/codecs/madera.c | 430 +++++++++- sound/soc/codecs/madera.h | 10 + 5 files changed, 2478 insertions(+), 9 deletions(-) create mode 100644 sound/soc/codecs/cs47l92.c
sound/soc/codecs/Kconfig +6 -0
@@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS47L35 if MFD_CS47L35 select SND_SOC_CS47L85 if MFD_CS47L85 select SND_SOC_CS47L90 if MFD_CS47L90 + select SND_SOC_CS47L92 if MFD_CS47L92 select SND_SOC_CS53L30 if I2C select SND_SOC_CX20442 if TTY select SND_SOC_CX2072X if I2C
@@ -597,6 +598,9 @@ config SND_SOC_CS47L85 config SND_SOC_CS47L90 tristate +config SND_SOC_CS47L92 + tristate + # Cirrus Logic Quad-Channel ADC config SND_SOC_CS53L30 tristate "Cirrus Logic CS53L30 CODEC"
@@ -730,10 +734,12 @@ config SND_SOC_MADERA default y if SND_SOC_CS47L35=y default y if SND_SOC_CS47L85=y default y if SND_SOC_CS47L90=y + default y if SND_SOC_CS47L92=y default m if SND_SOC_CS47L15=m default m if SND_SOC_CS47L35=m default m if SND_SOC_CS47L85=m default m if SND_SOC_CS47L90=m + default m if SND_SOC_CS47L92=m config SND_SOC_MAX98088 tristate "Maxim MAX98088/9 Low-Power, Stereo Audio Codec"
sound/soc/codecs/Makefile +2 -0
@@ -69,6 +69,7 @@ snd-soc-cs47l24-objs := cs47l24.o snd-soc-cs47l35-objs := cs47l35.o snd-soc-cs47l85-objs := cs47l85.o snd-soc-cs47l90-objs := cs47l90.o +snd-soc-cs47l92-objs := cs47l92.o snd-soc-cs53l30-objs := cs53l30.o snd-soc-cx20442-objs := cx20442.o snd-soc-cx2072x-objs := cx2072x.o
@@ -351,6 +352,7 @@ obj-$(CONFIG_SND_SOC_CS47L15) += snd-soc-cs47l15.o obj-$(CONFIG_SND_SOC_CS47L35) += snd-soc-cs47l35.o obj-$(CONFIG_SND_SOC_CS47L85) += snd-soc-cs47l85.o obj-$(CONFIG_SND_SOC_CS47L90) += snd-soc-cs47l90.o +obj-$(CONFIG_SND_SOC_CS47L92) += snd-soc-cs47l92.o obj-$(CONFIG_SND_SOC_CS53L30) += snd-soc-cs53l30.o obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_CX2072X) += snd-soc-cx2072x.o
sound/soc/codecs/cs47l92.c new file +2039 -0
2,039 lines not on this page · raw message
sound/soc/codecs/madera.c +421 -9
502 lines not on this page · raw message
sound/soc/codecs/madera.h +10 -0
@@ -47,6 +47,7 @@#define MADERA_CLK_SYSCLK_3 6#define MADERA_CLK_ASYNCCLK_2 7#define MADERA_CLK_DSPCLK 8 +#define MADERA_CLK_OUTCLK 9#define MADERA_CLK_SRC_MCLK1 0x0#define MADERA_CLK_SRC_MCLK2 0x1
@@ -61,6 +62,12 @@#define MADERA_CLK_SRC_AIF4BCLK 0xB#define MADERA_CLK_SRC_FLLAO 0xF +#define MADERA_OUTCLK_SYSCLK 0 +#define MADERA_OUTCLK_ASYNCCLK 1 +#define MADERA_OUTCLK_MCLK1 4 +#define MADERA_OUTCLK_MCLK2 5 +#define MADERA_OUTCLK_MCLK3 6 +#define MADERA_MIXER_VOL_MASK 0x00FE#define MADERA_MIXER_VOL_SHIFT 1#define MADERA_MIXER_VOL_WIDTH 7
@@ -326,6 +333,7 @@ extern const struct soc_enum madera_sample_rate[];extern const struct soc_enum madera_isrc_fsl[];extern const struct soc_enum madera_isrc_fsh[];extern const struct soc_enum madera_asrc1_rate[]; +extern const struct soc_enum madera_asrc1_bidir_rate[];extern const struct soc_enum madera_asrc2_rate[];extern const struct soc_enum madera_dfc_width[];extern const struct soc_enum madera_dfc_type[];
@@ -403,6 +411,8 @@ int madera_set_fll_syncclk(struct madera_fll *fll, int source, unsigned int fref, unsigned int fout);int madera_set_fll_ao_refclk (struct madera_fll *fll,int source,unsigned int fin,unsigned int fout); +int madera_fllhj_set_refclk (struct madera_fll *fll,int source, +unsigned int fin,unsigned int fout);int madera_core_init (struct madera_priv *priv);int madera_core_free (struct madera_priv *priv);
Signature · 1 line
2.11.0
Mark Brown
maintainerApplied "ASoC: cs47l92: Add codec driver for Cirrus Logic CS47L92" to the asoc tree
The patch
ASoC: cs47l92: Add codec driver for Cirrus Logic CS47L92
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
6535e831b4c867467d838f2c7866b4dce1d74679Mon Sep 17 00:00:00 2001
From: Stuart Henderson <[email protected]>
Date: Thu, 25 Jul 2019 17:39:31 +0100
Subject: [PATCH] ASoC: cs47l92: Add codec driver for Cirrus Logic CS47L92
Adds the codec driver for the CS47L92 SmartCodec. This is a multi-functional codec based on the Cirrus Logic Madera platform.
--- sound/soc/codecs/Kconfig | 6 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/cs47l92.c | 2039 ++++++++++++++++++++++++++++++++++++ sound/soc/codecs/madera.c | 430 +++++++- sound/soc/codecs/madera.h | 10 + 5 files changed, 2478 insertions(+), 9 deletions(-) create mode 100644 sound/soc/codecs/cs47l92.c
sound/soc/codecs/Kconfig +6 -0
@@ -75,6 +75,7 @@ config SND_SOC_ALL_CODECS select SND_SOC_CS47L35 if MFD_CS47L35 select SND_SOC_CS47L85 if MFD_CS47L85 select SND_SOC_CS47L90 if MFD_CS47L90 + select SND_SOC_CS47L92 if MFD_CS47L92 select SND_SOC_CS53L30 if I2C select SND_SOC_CX20442 if TTY select SND_SOC_CX2072X if I2C
@@ -597,6 +598,9 @@ config SND_SOC_CS47L85 config SND_SOC_CS47L90 tristate +config SND_SOC_CS47L92 + tristate + # Cirrus Logic Quad-Channel ADC config SND_SOC_CS53L30 tristate "Cirrus Logic CS53L30 CODEC"
@@ -730,10 +734,12 @@ config SND_SOC_MADERA default y if SND_SOC_CS47L35=y default y if SND_SOC_CS47L85=y default y if SND_SOC_CS47L90=y + default y if SND_SOC_CS47L92=y default m if SND_SOC_CS47L15=m default m if SND_SOC_CS47L35=m default m if SND_SOC_CS47L85=m default m if SND_SOC_CS47L90=m + default m if SND_SOC_CS47L92=m config SND_SOC_MAX98088 tristate "Maxim MAX98088/9 Low-Power, Stereo Audio Codec"
sound/soc/codecs/Makefile +2 -0
@@ -69,6 +69,7 @@ snd-soc-cs47l24-objs := cs47l24.o snd-soc-cs47l35-objs := cs47l35.o snd-soc-cs47l85-objs := cs47l85.o snd-soc-cs47l90-objs := cs47l90.o +snd-soc-cs47l92-objs := cs47l92.o snd-soc-cs53l30-objs := cs53l30.o snd-soc-cx20442-objs := cx20442.o snd-soc-cx2072x-objs := cx2072x.o
@@ -351,6 +352,7 @@ obj-$(CONFIG_SND_SOC_CS47L15) += snd-soc-cs47l15.o obj-$(CONFIG_SND_SOC_CS47L35) += snd-soc-cs47l35.o obj-$(CONFIG_SND_SOC_CS47L85) += snd-soc-cs47l85.o obj-$(CONFIG_SND_SOC_CS47L90) += snd-soc-cs47l90.o +obj-$(CONFIG_SND_SOC_CS47L92) += snd-soc-cs47l92.o obj-$(CONFIG_SND_SOC_CS53L30) += snd-soc-cs53l30.o obj-$(CONFIG_SND_SOC_CX20442) += snd-soc-cx20442.o obj-$(CONFIG_SND_SOC_CX2072X) += snd-soc-cx2072x.o
sound/soc/codecs/cs47l92.c new file +2039 -0
2,039 lines not on this page · raw message
sound/soc/codecs/madera.c +421 -9
502 lines not on this page · raw message
sound/soc/codecs/madera.h +10 -0
@@ -47,6 +47,7 @@#define MADERA_CLK_SYSCLK_3 6#define MADERA_CLK_ASYNCCLK_2 7#define MADERA_CLK_DSPCLK 8 +#define MADERA_CLK_OUTCLK 9#define MADERA_CLK_SRC_MCLK1 0x0#define MADERA_CLK_SRC_MCLK2 0x1
@@ -61,6 +62,12 @@#define MADERA_CLK_SRC_AIF4BCLK 0xB#define MADERA_CLK_SRC_FLLAO 0xF +#define MADERA_OUTCLK_SYSCLK 0 +#define MADERA_OUTCLK_ASYNCCLK 1 +#define MADERA_OUTCLK_MCLK1 4 +#define MADERA_OUTCLK_MCLK2 5 +#define MADERA_OUTCLK_MCLK3 6 +#define MADERA_MIXER_VOL_MASK 0x00FE#define MADERA_MIXER_VOL_SHIFT 1#define MADERA_MIXER_VOL_WIDTH 7
@@ -326,6 +333,7 @@ extern const struct soc_enum madera_sample_rate[];extern const struct soc_enum madera_isrc_fsl[];extern const struct soc_enum madera_isrc_fsh[];extern const struct soc_enum madera_asrc1_rate[]; +extern const struct soc_enum madera_asrc1_bidir_rate[];extern const struct soc_enum madera_asrc2_rate[];extern const struct soc_enum madera_dfc_width[];extern const struct soc_enum madera_dfc_type[];
@@ -403,6 +411,8 @@ int madera_set_fll_syncclk(struct madera_fll *fll, int source, unsigned int fref, unsigned int fout);int madera_set_fll_ao_refclk (struct madera_fll *fll,int source,unsigned int fin,unsigned int fout); +int madera_fllhj_set_refclk (struct madera_fll *fll,int source, +unsigned int fin,unsigned int fout);int madera_core_init (struct madera_priv *priv);int madera_core_free (struct madera_priv *priv);
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: wm_adsp: Allow bus error handler to be called directly" to the asoc tree
In reply to Charles KeepaxThe patch
ASoC: wm_adsp: Allow bus error handler to be called directly
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.4
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
01ec57a4371e573bfcfa898307af098a8c6f9dcfMon Sep 17 00:00:00 2001
From: Charles Keepax <[email protected]>
Date: Thu, 25 Jul 2019 17:39:29 +0100
Subject: [PATCH] ASoC: wm_adsp: Allow bus error handler to be called directly
There is no need for end drivers to add helper functions to allow the bus error handler to be called, simply update the prototype so it can be called directly.
--- sound/soc/codecs/cs47l90.c | 9 +-------- sound/soc/codecs/wm_adsp.c | 6 ++++-- sound/soc/codecs/wm_adsp.h | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-)
sound/soc/codecs/cs47l90.c +1 -8
@@ -2402,13 +2402,6 @@ static irqreturn_t cs47l90_adsp2_irq(int irq, void *data)return IRQ_HANDLED ; } -static irqreturn_t cs47l90_dsp_bus_error (int irq,void *data) -{ -struct wm_adsp *dsp = (struct wm_adsp *)data; - -return wm_adsp2_bus_error (dsp); -} -static int cs47l90_component_probe (struct snd_soc_component *component) {struct cs47l90 *cs47l90 =snd_soc_component_get_drvdata (component);
@@ -2558,7 +2551,7 @@ static int cs47l90_probe(struct platform_device *pdev)if (ret ==0 ) { ret =madera_init_bus_error_irq (&cs47l90->core, i, - cs47l90_dsp_bus_error); + wm_adsp2_bus_error);if (ret !=0 )wm_adsp2_remove (&cs47l90->core.adsp[i]); }
sound/soc/codecs/wm_adsp.c +4 -2
@@ -4242,8 +4242,9 @@ static void wm_adsp_fatal_error(struct wm_adsp *dsp) } } -irqreturn_t wm_adsp2_bus_error (struct wm_adsp *dsp) +irqreturn_t wm_adsp2_bus_error (int irq,void *data) { +struct wm_adsp *dsp = (struct wm_adsp *)data;unsigned int val;struct regmap *regmap = dsp->regmap;int ret =0 ;
@@ -4307,8 +4308,9 @@ irqreturn_t wm_adsp2_bus_error(struct wm_adsp *dsp) }EXPORT_SYMBOL_GPL (wm_adsp2_bus_error); -irqreturn_t wm_halo_bus_error (struct wm_adsp *dsp) +irqreturn_t wm_halo_bus_error (int irq,void *data) { +struct wm_adsp *dsp = (struct wm_adsp *)data;struct regmap *regmap = dsp->regmap;unsigned int fault[6 ];struct reg_sequence clear[] = {
sound/soc/codecs/wm_adsp.h +2 -2
@@ -171,8 +171,8 @@ int wm_adsp1_event(struct snd_soc_dapm_widget *w,int wm_adsp_early_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event); -irqreturn_t wm_adsp2_bus_error (struct wm_adsp *adsp); -irqreturn_t wm_halo_bus_error (struct wm_adsp *dsp); +irqreturn_t wm_adsp2_bus_error (int irq,void *data); +irqreturn_t wm_halo_bus_error (int irq,void *data);irqreturn_t wm_halo_wdt_expire (int irq,void *data); int wm_adsp_event(struct snd_soc_dapm_widget *w,
Signature · 1 line
2.20.1