michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: i2s_sam_ssc.c: store *dev_dma in flash

Browse source 
The DMA module the i2s_sam_ssc relies on cannot change during the
runtime. Store pointer to dev_dma in flash, not in RAM. The new
implementation saves 40 bytes of flash and 32 bytes of RAM.

Signed-off-by: Piotr Mienkowski <piotr.mienkowski@gmail.com>
This commit is contained in:
Piotr Mienkowski 2021-03-01 00:33:35 +01:00 • committed by Ioannis Glaropoulos
commit b22df38d30
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
drivers/i2s/i2s_sam_ssc.c
View file

@ -64,6 +64,7 @@ struct ring_buf {
/* Device constant configuration parameters */ /* Device constant configuration parameters */
struct i2s_sam_dev_cfg { struct i2s_sam_dev_cfg {
const struct device *dev_dma;
Ssc *regs; Ssc *regs;
void (*irq_config)(void); void (*irq_config)(void);
const struct soc_gpio_pin *pin_list; const struct soc_gpio_pin *pin_list;
@ -92,7 +93,6 @@ struct stream {
/* Device run time data */ /* Device run time data */
struct i2s_sam_dev_data { struct i2s_sam_dev_data {
const struct device *dev_dma;
struct stream rx; struct stream rx;
struct stream tx; struct stream tx;
}; };
@ -235,7 +235,7 @@ static void dma_rx_callback(const struct device *dma_dev, void *user_data,
goto rx_disable; goto rx_disable;
} }
ret = start_dma(dev_data->dev_dma, stream->dma_channel, &stream->dma_cfg, ret = start_dma(dev_cfg->dev_dma, stream->dma_channel, &stream->dma_cfg,
(void *)&(ssc->SSC_RHR), stream->mem_block, (void *)&(ssc->SSC_RHR), stream->mem_block,
stream->cfg.block_size); stream->cfg.block_size);
if (ret < 0) { if (ret < 0) {
@ -246,7 +246,7 @@ static void dma_rx_callback(const struct device *dma_dev, void *user_data,
return; return;
rx_disable: rx_disable:
rx_stream_disable(stream, ssc, dev_data->dev_dma); rx_stream_disable(stream, ssc, dev_cfg->dev_dma);
} }
/* This function is executed in the interrupt context */ /* This function is executed in the interrupt context */
@ -296,7 +296,7 @@ static void dma_tx_callback(const struct device *dma_dev, void *user_data,
/* Assure cache coherency before DMA read operation */ /* Assure cache coherency before DMA read operation */
DCACHE_CLEAN(stream->mem_block, mem_block_size); DCACHE_CLEAN(stream->mem_block, mem_block_size);
ret = start_dma(dev_data->dev_dma, stream->dma_channel, &stream->dma_cfg, ret = start_dma(dev_cfg->dev_dma, stream->dma_channel, &stream->dma_cfg,
stream->mem_block, (void *)&(ssc->SSC_THR), stream->mem_block, (void *)&(ssc->SSC_THR),
mem_block_size); mem_block_size);
if (ret < 0) { if (ret < 0) {
@ -307,7 +307,7 @@ static void dma_tx_callback(const struct device *dma_dev, void *user_data,
return; return;
tx_disable: tx_disable:
tx_stream_disable(stream, ssc, dev_data->dev_dma); tx_stream_disable(stream, ssc, dev_cfg->dev_dma);
} }
static int set_rx_data_format(const struct i2s_sam_dev_cfg *const dev_cfg, static int set_rx_data_format(const struct i2s_sam_dev_cfg *const dev_cfg,
@ -777,7 +777,7 @@ static int i2s_sam_trigger(const struct device *dev, enum i2s_dir dir,
__ASSERT_NO_MSG(stream->mem_block == NULL); __ASSERT_NO_MSG(stream->mem_block == NULL);
ret = stream->stream_start(stream, ssc, dev_data->dev_dma); ret = stream->stream_start(stream, ssc, dev_cfg->dev_dma);
if (ret < 0) { if (ret < 0) {
LOG_DBG("START trigger failed %d", ret); LOG_DBG("START trigger failed %d", ret);
return ret; return ret;
@ -815,7 +815,7 @@ static int i2s_sam_trigger(const struct device *dev, enum i2s_dir dir,
LOG_DBG("DROP trigger: invalid state"); LOG_DBG("DROP trigger: invalid state");
return -EIO; return -EIO;
} }
stream->stream_disable(stream, ssc, dev_data->dev_dma); stream->stream_disable(stream, ssc, dev_cfg->dev_dma);
stream->queue_drop(stream); stream->queue_drop(stream);
stream->state = I2S_STATE_READY; stream->state = I2S_STATE_READY;
break; break;
@ -929,8 +929,8 @@ static int i2s_sam_initialize(const struct device *dev)
k_sem_init(&dev_data->tx.sem, CONFIG_I2S_SAM_SSC_TX_BLOCK_COUNT, k_sem_init(&dev_data->tx.sem, CONFIG_I2S_SAM_SSC_TX_BLOCK_COUNT,
CONFIG_I2S_SAM_SSC_TX_BLOCK_COUNT); CONFIG_I2S_SAM_SSC_TX_BLOCK_COUNT);
if (!device_is_ready(dev_data->dev_dma)) { if (!device_is_ready(dev_cfg->dev_dma)) {
LOG_ERR("%s device not ready", dev_data->dev_dma->name); LOG_ERR("%s device not ready", dev_cfg->dev_dma->name);
return -ENODEV; return -ENODEV;
} }
@ -975,6 +975,7 @@ static void i2s0_sam_irq_config(void)
static const struct soc_gpio_pin i2s0_pins[] = ATMEL_SAM_DT_PINS(0); static const struct soc_gpio_pin i2s0_pins[] = ATMEL_SAM_DT_PINS(0);
static const struct i2s_sam_dev_cfg i2s0_sam_config = { static const struct i2s_sam_dev_cfg i2s0_sam_config = {
.dev_dma = DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(0, tx)),
.regs = (Ssc *)DT_INST_REG_ADDR(0), .regs = (Ssc *)DT_INST_REG_ADDR(0),
.irq_config = i2s0_sam_irq_config, .irq_config = i2s0_sam_irq_config,
.periph_id = DT_INST_PROP(0, peripheral_id), .periph_id = DT_INST_PROP(0, peripheral_id),
@ -987,7 +988,6 @@ struct queue_item rx_0_ring_buf[CONFIG_I2S_SAM_SSC_RX_BLOCK_COUNT + 1];
struct queue_item tx_0_ring_buf[CONFIG_I2S_SAM_SSC_TX_BLOCK_COUNT + 1]; struct queue_item tx_0_ring_buf[CONFIG_I2S_SAM_SSC_TX_BLOCK_COUNT + 1];
static struct i2s_sam_dev_data i2s0_sam_data = { static struct i2s_sam_dev_data i2s0_sam_data = {
.dev_dma = DEVICE_DT_GET(DT_INST_DMAS_CTLR_BY_NAME(0, tx)),
.rx = { .rx = {
.dma_channel = DT_INST_DMAS_CELL_BY_NAME(0, rx, channel), .dma_channel = DT_INST_DMAS_CELL_BY_NAME(0, rx, channel),
.dma_cfg = { .dma_cfg = {