Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3d5f615f9fcba6df382bd9a204b5e9ad3080ac48

Authored by Guenter Roeck
Committed by Mark Brown
1 parent e1d4d3c854
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

ASoC: fsl: Fix build problem 

Commit 432481220 (ASoC: fsl-ssi: Use regmap) removed struct ccsr_ssi.
Unfortunately, the structure is still used. This causes
mpc85xx_smp_defconfig and mpc85xx_defconfig builds to fail with

sound/soc/fsl/fsl_dma.c:926:50:
  error: invalid use of undefined type 'struct ccsr_ssi'
  dma->ssi_stx_phys = res.start + offsetof(struct ccsr_ssi, stx0);
ound/soc/fsl/fsl_dma.c:927:50:
  error: invalid use of undefined type 'struct ccsr_ssi'
  dma->ssi_srx_phys = res.start + offsetof(struct ccsr_ssi, srx0);

Fix by using constants, similar to original commit.

Cc: Markus Pargmann <mpa@pengutronix.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Mark Brown <broonie@linaro.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

sound/soc/fsl/fsl_dma.c
Diff comments   View file @ 3d5f615
... ... @@ -923,8 +923,8 @@
923 923 dma->dai.pcm_free = fsl_dma_free_dma_buffers;
924 924  
925 925 /* Store the SSI-specific information that we need */
926   - dma->ssi_stx_phys = res.start + offsetof(struct ccsr_ssi, stx0);
927   - dma->ssi_srx_phys = res.start + offsetof(struct ccsr_ssi, srx0);
  926 + dma->ssi_stx_phys = res.start + CCSR_SSI_STX0;
  927 + dma->ssi_srx_phys = res.start + CCSR_SSI_SRX0;
928 928  
929 929 iprop = of_get_property(ssi_np, "fsl,fifo-depth", NULL);
930 930 if (iprop)