Skip to content

Commit

Permalink
dmaengine: imx-sdma: Add support for version 3 firmware
Browse files Browse the repository at this point in the history
Currently when version 3.1 of the mx6q SDMA firmware is used we get:

[    0.392169] imx-sdma 20ec000.sdma: unknown firmware version
[    0.399281] imx-sdma 20ec000.sdma: initialized

Add support for it.

Based on a patch from Shengjiu Wang from the internal FSL kernel.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
  • Loading branch information
Fabio Estevam authored and Vinod Koul committed Mar 18, 2015
1 parent 937abe8 commit a572460
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/dma/imx-sdma.c
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,7 @@ static void sdma_issue_pending(struct dma_chan *chan)

#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V1 34
#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2 38
#define SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3 41

static void sdma_add_scripts(struct sdma_engine *sdma,
const struct sdma_script_start_addrs *addr)
Expand Down Expand Up @@ -1302,6 +1303,9 @@ static void sdma_load_firmware(const struct firmware *fw, void *context)
case 2:
sdma->script_number = SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V2;
break;
case 3:
sdma->script_number = SDMA_SCRIPT_ADDRS_ARRAY_SIZE_V3;
break;
default:
dev_err(sdma->dev, "unknown firmware version\n");
goto err_firmware;
Expand Down
3 changes: 3 additions & 0 deletions include/linux/platform_data/dma-imx-sdma.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ struct sdma_script_start_addrs {
s32 ssish_2_mcu_addr;
s32 hdmi_dma_addr;
/* End of v2 array */
s32 zcanfd_2_mcu_addr;
s32 zqspi_2_mcu_addr;
/* End of v3 array */
};

/**
Expand Down

0 comments on commit a572460

Please sign in to comment.