Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5608bd3e authored by Stephen Warren's avatar Stephen Warren
Browse files

ASoC: tegra: convert to standard DMA DT bindings 



By passing no flags when calling snd_dmaengine_pcm_register() from
tegra_pcm.c, we end up using dma_request_slave_channel() rather than
dmaengine_pcm_compat_request_channel(), and hence rely on the standard
DMA DT bindings and stashing the DMA slave ID away during channel
allocation. This means there's no need to use a custom DT property to
store the slave ID. So, remove all the code that parsed it.

Signed-off-by: default avatarStephen Warren <swarren@nvidia.com>
Acked-by: default avatarMark Brown <broonie@linaro.org>
parent d59afb6a

sound/soc/tegra/tegra20_ac97.c

+0 −11
Original line number Diff line number Diff line
@@ -313,7 +313,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) 
{

	struct tegra20_ac97 *ac97;

	struct resource *mem;

	u32 of_dma[2];

	void __iomem *regs;

	int ret = 0;
@@ -348,14 +347,6 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) 
		goto err_clk_put;

	}



	if (of_property_read_u32_array(pdev->dev.of_node,

				       "nvidia,dma-request-selector",

				       of_dma, 2) < 0) {

		dev_err(&pdev->dev, "No DMA resource\n");

		ret = -ENODEV;

		goto err_clk_put;

	}



	ac97->reset_gpio = of_get_named_gpio(pdev->dev.of_node,

					     "nvidia,codec-reset-gpio", 0);

	if (gpio_is_valid(ac97->reset_gpio)) {
@@ -380,12 +371,10 @@ static int tegra20_ac97_platform_probe(struct platform_device *pdev) 
	ac97->capture_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_RX1;

	ac97->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	ac97->capture_dma_data.maxburst = 4;

	ac97->capture_dma_data.slave_id = of_dma[1];



	ac97->playback_dma_data.addr = mem->start + TEGRA20_AC97_FIFO_TX1;

	ac97->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	ac97->playback_dma_data.maxburst = 4;

	ac97->playback_dma_data.slave_id = of_dma[1];



	ret = tegra_asoc_utils_init(&ac97->util_data, &pdev->dev);

	if (ret)

sound/soc/tegra/tegra20_i2s.c

+1 −19
Original line number Diff line number Diff line
@@ -339,9 +339,7 @@ static const struct regmap_config tegra20_i2s_regmap_config = { 
static int tegra20_i2s_platform_probe(struct platform_device *pdev)

{

	struct tegra20_i2s *i2s;

	struct resource *mem, *memregion, *dmareq;

	u32 of_dma[2];

	u32 dma_ch;

	struct resource *mem, *memregion;

	void __iomem *regs;

	int ret;
@@ -370,20 +368,6 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) 
		goto err_clk_put;

	}



	dmareq = platform_get_resource(pdev, IORESOURCE_DMA, 0);

	if (!dmareq) {

		if (of_property_read_u32_array(pdev->dev.of_node,

					"nvidia,dma-request-selector",

					of_dma, 2) < 0) {

			dev_err(&pdev->dev, "No DMA resource\n");

			ret = -ENODEV;

			goto err_clk_put;

		}

		dma_ch = of_dma[1];

	} else {

		dma_ch = dmareq->start;

	}



	memregion = devm_request_mem_region(&pdev->dev, mem->start,

					    resource_size(mem), DRV_NAME);

	if (!memregion) {
@@ -410,12 +394,10 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) 
	i2s->capture_dma_data.addr = mem->start + TEGRA20_I2S_FIFO2;

	i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	i2s->capture_dma_data.maxburst = 4;

	i2s->capture_dma_data.slave_id = dma_ch;



	i2s->playback_dma_data.addr = mem->start + TEGRA20_I2S_FIFO1;

	i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	i2s->playback_dma_data.maxburst = 4;

	i2s->playback_dma_data.slave_id = dma_ch;



	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev)) {

sound/soc/tegra/tegra30_ahub.c

+6 −17
Original line number Diff line number Diff line
@@ -95,8 +95,8 @@ static int tegra30_ahub_runtime_resume(struct device *dev) 
}



int tegra30_ahub_allocate_rx_fifo(enum tegra30_ahub_rxcif *rxcif,

				  dma_addr_t *fiforeg,

				  unsigned int *reqsel)

				  char *dmachan, int dmachan_len,

				  dma_addr_t *fiforeg)

{

	int channel;

	u32 reg, val;
@@ -110,9 +110,9 @@ int tegra30_ahub_allocate_rx_fifo(enum tegra30_ahub_rxcif *rxcif, 
	__set_bit(channel, ahub->rx_usage);



	*rxcif = TEGRA30_AHUB_RXCIF_APBIF_RX0 + channel;

	snprintf(dmachan, dmachan_len, "rx%d", channel);

	*fiforeg = ahub->apbif_addr + TEGRA30_AHUB_CHANNEL_RXFIFO +

		   (channel * TEGRA30_AHUB_CHANNEL_RXFIFO_STRIDE);

	*reqsel = ahub->dma_sel + channel;



	pm_runtime_get_sync(ahub->dev);
@@ -197,8 +197,8 @@ int tegra30_ahub_free_rx_fifo(enum tegra30_ahub_rxcif rxcif) 
EXPORT_SYMBOL_GPL(tegra30_ahub_free_rx_fifo);



int tegra30_ahub_allocate_tx_fifo(enum tegra30_ahub_txcif *txcif,

				  dma_addr_t *fiforeg,

				  unsigned int *reqsel)

				  char *dmachan, int dmachan_len,

				  dma_addr_t *fiforeg)

{

	int channel;

	u32 reg, val;
@@ -212,9 +212,9 @@ int tegra30_ahub_allocate_tx_fifo(enum tegra30_ahub_txcif *txcif, 
	__set_bit(channel, ahub->tx_usage);



	*txcif = TEGRA30_AHUB_TXCIF_APBIF_TX0 + channel;

	snprintf(dmachan, dmachan_len, "tx%d", channel);

	*fiforeg = ahub->apbif_addr + TEGRA30_AHUB_CHANNEL_TXFIFO +

		   (channel * TEGRA30_AHUB_CHANNEL_TXFIFO_STRIDE);

	*reqsel = ahub->dma_sel + channel;



	pm_runtime_get_sync(ahub->dev);
@@ -510,7 +510,6 @@ static int tegra30_ahub_probe(struct platform_device *pdev) 
	struct reset_control *rst;

	int i;

	struct resource *res0, *res1, *region;

	u32 of_dma[2];

	void __iomem *regs_apbif, *regs_ahub;

	int ret = 0;
@@ -573,16 +572,6 @@ static int tegra30_ahub_probe(struct platform_device *pdev) 
		goto err_clk_put_d_audio;

	}



	if (of_property_read_u32_array(pdev->dev.of_node,

				"nvidia,dma-request-selector",

				of_dma, 2) < 0) {

		dev_err(&pdev->dev,

			"Missing property nvidia,dma-request-selector\n");

		ret = -ENODEV;

		goto err_clk_put_d_audio;

	}

	ahub->dma_sel = of_dma[1];



	res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res0) {

		dev_err(&pdev->dev, "No apbif memory resource\n");

sound/soc/tegra/tegra30_ahub.h

+4 −5
Original line number Diff line number Diff line
@@ -465,15 +465,15 @@ enum tegra30_ahub_rxcif { 
};



extern int tegra30_ahub_allocate_rx_fifo(enum tegra30_ahub_rxcif *rxcif,

					 dma_addr_t *fiforeg,

					 unsigned int *reqsel);

					 char *dmachan, int dmachan_len,

					 dma_addr_t *fiforeg);

extern int tegra30_ahub_enable_rx_fifo(enum tegra30_ahub_rxcif rxcif);

extern int tegra30_ahub_disable_rx_fifo(enum tegra30_ahub_rxcif rxcif);

extern int tegra30_ahub_free_rx_fifo(enum tegra30_ahub_rxcif rxcif);



extern int tegra30_ahub_allocate_tx_fifo(enum tegra30_ahub_txcif *txcif,

					 dma_addr_t *fiforeg,

					 unsigned int *reqsel);

					 char *dmachan, int dmachan_len,

					 dma_addr_t *fiforeg);

extern int tegra30_ahub_enable_tx_fifo(enum tegra30_ahub_txcif txcif);

extern int tegra30_ahub_disable_tx_fifo(enum tegra30_ahub_txcif txcif);

extern int tegra30_ahub_free_tx_fifo(enum tegra30_ahub_txcif txcif);
@@ -524,7 +524,6 @@ struct tegra30_ahub { 
	struct device *dev;

	struct clk *clk_d_audio;

	struct clk *clk_apbif;

	int dma_sel;

	resource_size_t apbif_addr;

	struct regmap *regmap_apbif;

	struct regmap *regmap_ahub;

sound/soc/tegra/tegra30_i2s.c

+9 −5
Original line number Diff line number Diff line
@@ -459,8 +459,9 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) 
	i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	i2s->playback_dma_data.maxburst = 4;

	ret = tegra30_ahub_allocate_tx_fifo(&i2s->playback_fifo_cif,

					    &i2s->playback_dma_data.addr,

					    &i2s->playback_dma_data.slave_id);

					    i2s->playback_dma_chan,

					    sizeof(i2s->playback_dma_chan),

					    &i2s->playback_dma_data.addr);

	if (ret) {

		dev_err(&pdev->dev, "Could not alloc TX FIFO: %d\n", ret);

		goto err_suspend;
@@ -475,8 +476,9 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) 
	i2s->capture_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	i2s->capture_dma_data.maxburst = 4;

	ret = tegra30_ahub_allocate_rx_fifo(&i2s->capture_fifo_cif,

					    &i2s->capture_dma_data.addr,

					    &i2s->capture_dma_data.slave_id);

					    i2s->capture_dma_chan,

					    sizeof(i2s->capture_dma_chan),

					    &i2s->capture_dma_data.addr);

	if (ret) {

		dev_err(&pdev->dev, "Could not alloc RX FIFO: %d\n", ret);

		goto err_unroute_tx_fifo;
@@ -496,7 +498,9 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) 
		goto err_unroute_rx_fifo;

	}



	ret = tegra_pcm_platform_register(&pdev->dev);

	ret = tegra_pcm_platform_register_with_chan_names(&pdev->dev,

				&i2s->dma_config, i2s->playback_dma_chan,

				i2s->capture_dma_chan);

	if (ret) {

		dev_err(&pdev->dev, "Could not register PCM: %d\n", ret);

		goto err_unregister_component;