Commit dcfec3c0 authored by Sascha Hauer's avatar Sascha Hauer Committed by Vinod Koul
Browse files

dma: imx-sdma: Add ROM script addresses to driver 



This adds the ROM script addresses for i.MX25, i.MX5x and i.MX6 to the
SDMA driver needed for the driver to work without additional firmware.

The ROM script addresses are SoC specific and in some cases even tapeout
specific. This patch adds the ROM script addresses only for SoCs which
do not have a tapeout specific SDMA ROM, because currently it's unclear
how this case should be handled.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 17bba72f

Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt

+6 −1
Original line number Original line Diff line number Diff line 
* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX

* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX





Required properties:

Required properties:

- compatible : Should be "fsl,<chip>-sdma"

- compatible : Should be "fsl,imx31-sdma", "fsl,imx31-to1-sdma",

  "fsl,imx31-to2-sdma", "fsl,imx35-sdma", "fsl,imx35-to1-sdma",

  "fsl,imx35-to2-sdma", "fsl,imx51-sdma", "fsl,imx53-sdma" or

  "fsl,imx6q-sdma". The -to variants should be preferred since they

  allow to determnine the correct ROM script addresses needed for

  the driver to work without additional firmware.

- reg : Should contain SDMA registers location and length

- reg : Should contain SDMA registers location and length

- interrupts : Should contain SDMA interrupt

- interrupts : Should contain SDMA interrupt

- #dma-cells : Must be <3>.

- #dma-cells : Must be <3>.

drivers/dma/imx-sdma.c

+99 −1
Original line number Original line Diff line number Diff line
@@ -308,6 +308,7 @@ struct sdma_firmware_header { 
struct sdma_driver_data {

struct sdma_driver_data {

	int chnenbl0;

	int chnenbl0;

	int num_events;

	int num_events;

	struct sdma_script_start_addrs	*script_addrs;

};

};





struct sdma_engine {

struct sdma_engine {
@@ -331,18 +332,110 @@ struct sdma_driver_data sdma_imx31 = { 
	.num_events = 32,

	.num_events = 32,

};

};





static struct sdma_script_start_addrs sdma_script_imx25 = {

	.ap_2_ap_addr = 729,

	.uart_2_mcu_addr = 904,

	.per_2_app_addr = 1255,

	.mcu_2_app_addr = 834,

	.uartsh_2_mcu_addr = 1120,

	.per_2_shp_addr = 1329,

	.mcu_2_shp_addr = 1048,

	.ata_2_mcu_addr = 1560,

	.mcu_2_ata_addr = 1479,

	.app_2_per_addr = 1189,

	.app_2_mcu_addr = 770,

	.shp_2_per_addr = 1407,

	.shp_2_mcu_addr = 979,

};



struct sdma_driver_data sdma_imx25 = {

	.chnenbl0 = SDMA_CHNENBL0_IMX35,

	.num_events = 48,

	.script_addrs = &sdma_script_imx25,

};



struct sdma_driver_data sdma_imx35 = {

struct sdma_driver_data sdma_imx35 = {

	.chnenbl0 = SDMA_CHNENBL0_IMX35,

	.chnenbl0 = SDMA_CHNENBL0_IMX35,

	.num_events = 48,

	.num_events = 48,

};

};





static struct sdma_script_start_addrs sdma_script_imx51 = {

	.ap_2_ap_addr = 642,

	.uart_2_mcu_addr = 817,

	.mcu_2_app_addr = 747,

	.mcu_2_shp_addr = 961,

	.ata_2_mcu_addr = 1473,

	.mcu_2_ata_addr = 1392,

	.app_2_per_addr = 1033,

	.app_2_mcu_addr = 683,

	.shp_2_per_addr = 1251,

	.shp_2_mcu_addr = 892,

};



struct sdma_driver_data sdma_imx51 = {

	.chnenbl0 = SDMA_CHNENBL0_IMX35,

	.num_events = 48,

	.script_addrs = &sdma_script_imx51,

};



static struct sdma_script_start_addrs sdma_script_imx53 = {

	.ap_2_ap_addr = 642,

	.app_2_mcu_addr = 683,

	.mcu_2_app_addr = 747,

	.uart_2_mcu_addr = 817,

	.shp_2_mcu_addr = 891,

	.mcu_2_shp_addr = 960,

	.uartsh_2_mcu_addr = 1032,

	.spdif_2_mcu_addr = 1100,

	.mcu_2_spdif_addr = 1134,

	.firi_2_mcu_addr = 1193,

	.mcu_2_firi_addr = 1290,

};



struct sdma_driver_data sdma_imx53 = {

	.chnenbl0 = SDMA_CHNENBL0_IMX35,

	.num_events = 48,

	.script_addrs = &sdma_script_imx53,

};



static struct sdma_script_start_addrs sdma_script_imx6q = {

	.ap_2_ap_addr = 642,

	.uart_2_mcu_addr = 817,

	.mcu_2_app_addr = 747,

	.per_2_per_addr = 6331,

	.uartsh_2_mcu_addr = 1032,

	.mcu_2_shp_addr = 960,

	.app_2_mcu_addr = 683,

	.shp_2_mcu_addr = 891,

	.spdif_2_mcu_addr = 1100,

	.mcu_2_spdif_addr = 1134,

};



struct sdma_driver_data sdma_imx6q = {

	.chnenbl0 = SDMA_CHNENBL0_IMX35,

	.num_events = 48,

	.script_addrs = &sdma_script_imx6q,

};



static struct platform_device_id sdma_devtypes[] = {

static struct platform_device_id sdma_devtypes[] = {

	{

	{

		.name = "imx25-sdma",

		.driver_data = (unsigned long)&sdma_imx25,

	}, {

		.name = "imx31-sdma",

		.name = "imx31-sdma",

		.driver_data = (unsigned long)&sdma_imx31,

		.driver_data = (unsigned long)&sdma_imx31,

	}, {

	}, {

		.name = "imx35-sdma",

		.name = "imx35-sdma",

		.driver_data = (unsigned long)&sdma_imx35,

		.driver_data = (unsigned long)&sdma_imx35,

	}, {

		.name = "imx51-sdma",

		.driver_data = (unsigned long)&sdma_imx51,

	}, {

		.name = "imx53-sdma",

		.driver_data = (unsigned long)&sdma_imx53,

	}, {

		.name = "imx6q-sdma",

		.driver_data = (unsigned long)&sdma_imx6q,

	}, {

	}, {

		/* sentinel */

		/* sentinel */

	}

	}
@@ -350,8 +443,11 @@ static struct platform_device_id sdma_devtypes[] = { 
MODULE_DEVICE_TABLE(platform, sdma_devtypes);

MODULE_DEVICE_TABLE(platform, sdma_devtypes);





static const struct of_device_id sdma_dt_ids[] = {

static const struct of_device_id sdma_dt_ids[] = {

	{ .compatible = "fsl,imx31-sdma", .data = &sdma_imx31, },

	{ .compatible = "fsl,imx6q-sdma", .data = &sdma_imx6q, },

	{ .compatible = "fsl,imx53-sdma", .data = &sdma_imx53, },

	{ .compatible = "fsl,imx51-sdma", .data = &sdma_imx51, },

	{ .compatible = "fsl,imx35-sdma", .data = &sdma_imx35, },

	{ .compatible = "fsl,imx35-sdma", .data = &sdma_imx35, },

	{ .compatible = "fsl,imx31-sdma", .data = &sdma_imx31, },

	{ /* sentinel */ }

	{ /* sentinel */ }

};

};

MODULE_DEVICE_TABLE(of, sdma_dt_ids);

MODULE_DEVICE_TABLE(of, sdma_dt_ids);
@@ -1424,6 +1520,8 @@ static int __init sdma_probe(struct platform_device *pdev) 
	if (ret)

	if (ret)

		goto err_init;

		goto err_init;





	if (sdma->drvdata->script_addrs)

		sdma_add_scripts(sdma, sdma->drvdata->script_addrs);

	if (pdata && pdata->script_addrs)

	if (pdata && pdata->script_addrs)

		sdma_add_scripts(sdma, pdata->script_addrs);

		sdma_add_scripts(sdma, pdata->script_addrs);

CRA Git | Maintained and supported by SUSTech CRA and CCSE