[PATCH 1/2] ASoC: Intel: Remove support for Intel MID DMA from firmware loader

[PATCH 1/2] ASoC: Intel: Remove support for Intel MID DMA from firmware loader

[Jarkko Nikula]

Intel MID DMA driver is going to be removed by the coming commit
36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
can be removed from here in advance.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 sound/soc/intel/sst-dsp.h      | 1 -
 sound/soc/intel/sst-firmware.c | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/sound/soc/intel/sst-dsp.h b/sound/soc/intel/sst-dsp.h
index f291e32f0077..3412474083ff 100644
--- a/sound/soc/intel/sst-dsp.h
+++ b/sound/soc/intel/sst-dsp.h
@@ -28,7 +28,6 @@
 
 /* Supported SST DMA Devices */
 #define SST_DMA_TYPE_DW		1
-#define SST_DMA_TYPE_MID	2
 
 /* autosuspend delay 5s*/
 #define SST_RUNTIME_SUSPEND_DELAY	(5 * 1000)
diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index 5e5800897da2..38881f1fb990 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -277,9 +277,6 @@ int sst_dma_new(struct sst_dsp *sst)
 	case SST_DMA_TYPE_DW:
 		dma_dev_name = "dw_dmac";
 		break;
-	case SST_DMA_TYPE_MID:
-		dma_dev_name = "Intel MID DMA";
-		break;
 	default:
 		dev_err(sst->dev, "error: invalid DMA engine %d\n",
 			sst->pdata->dma_engine);
-- 
2.1.4

[PATCH 2/2] ASoC: Intel: Remove vague commit about slave DMA config from firmware loader

[Jarkko Nikula]

Intel MID DMA driver is going to be removed, commit should be a few lines
down near to dmaengine_slave_config() call in order to not confuse and at
quick look Synopsys DesignWare does seem to use some of the slave config
structure fields (see drivers/dma/dw/core.c: dwc_config()).

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 sound/soc/intel/sst-firmware.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sound/soc/intel/sst-firmware.c b/sound/soc/intel/sst-firmware.c
index 38881f1fb990..b5659ecb80de 100644
--- a/sound/soc/intel/sst-firmware.c
+++ b/sound/soc/intel/sst-firmware.c
@@ -221,8 +221,6 @@ int sst_dsp_dma_get_channel(struct sst_dsp *dsp, int chan_id)
 	dma_cap_mask_t mask;
 	int ret;
 
-	/* The Intel MID DMA engine driver needs the slave config set but
-	 * Synopsis DMA engine driver safely ignores the slave config */
 	dma_cap_zero(mask);
 	dma_cap_set(DMA_SLAVE, mask);
 	dma_cap_set(DMA_MEMCPY, mask);
-- 
2.1.4

Re: [PATCH 1/2] ASoC: Intel: Remove support for Intel MID DMA from firmware loader

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 371 bytes --]

On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:
> Intel MID DMA driver is going to be removed by the coming commit
> 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> can be removed from here in advance.

So "only user" wasn't exactly true there then...

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 2/2] ASoC: Intel: Remove vague commit about slave DMA config from firmware loader

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 375 bytes --]

On Wed, Mar 18, 2015 at 10:07:20AM +0200, Jarkko Nikula wrote:
> Intel MID DMA driver is going to be removed, commit should be a few lines
> down near to dmaengine_slave_config() call in order to not confuse and at
> quick look Synopsys DesignWare does seem to use some of the slave config
> structure fields (see drivers/dma/dw/core.c: dwc_config()).

Applied both, thanks.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/2] ASoC: Intel: Remove support for Intel MID DMA from firmware loader

[Andy Shevchenko]

On Wed, 2015-03-18 at 11:43 +0000, Mark Brown wrote:
> On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:
> > Intel MID DMA driver is going to be removed by the coming commit
> > 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> > tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> > can be removed from here in advance.
> 
> So "only user" wasn't exactly true there then...

SST has support of both intel_mid_dma and dw_dmac for a while, but SPI
DW hasn't. That's why the only user.

-- 
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy

Re: [PATCH 1/2] ASoC: Intel: Remove support for Intel MID DMA from firmware loader

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 807 bytes --]

On Wed, Mar 18, 2015 at 01:54:00PM +0200, Andy Shevchenko wrote:
> On Wed, 2015-03-18 at 11:43 +0000, Mark Brown wrote:
> > On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:

> > > Intel MID DMA driver is going to be removed by the coming commit
> > > 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> > > tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> > > can be removed from here in advance.

> > So "only user" wasn't exactly true there then...

> SST has support of both intel_mid_dma and dw_dmac for a while, but SPI
> DW hasn't. That's why the only user.

OK, so that's "only thing that relies on it" or something rather than
only user - only user suggests there's no need to worry about cleanup of
dependencies and users elsewhere.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 1/2] ASoC: Intel: Remove support for Intel MID DMA from firmware loader

[Andy Shevchenko]

On Wed, 2015-03-18 at 13:59 +0000, Mark Brown wrote:
> On Wed, Mar 18, 2015 at 01:54:00PM +0200, Andy Shevchenko wrote:
> > On Wed, 2015-03-18 at 11:43 +0000, Mark Brown wrote:
> > > On Wed, Mar 18, 2015 at 10:07:19AM +0200, Jarkko Nikula wrote:
> 
> > > > Intel MID DMA driver is going to be removed by the coming commit
> > > > 36111da7838e ("dmaengine: intel-mid-dma: remove the driver") in spi.git
> > > > tree. Since there are no users for SST_DMA_TYPE_MID type the support for it
> > > > can be removed from here in advance.
> 
> > > So "only user" wasn't exactly true there then...
> 
> > SST has support of both intel_mid_dma and dw_dmac for a while, but SPI
> > DW hasn't. That's why the only user.
> 
> OK, so that's "only thing that relies on it" or something rather than
> only user - only user suggests there's no need to worry about cleanup of
> dependencies and users elsewhere.

Noted, that's right. Thanks.

-- 
Andy Shevchenko <andriy.shevchenko@intel.com>
Intel Finland Oy