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

Commit 62550cd7 authored by Shawn Guo's avatar Shawn Guo
Browse files

dmaengine: imx-sdma: use platform_device_id to identify sdma version 



It might be not good to use software defined version to identify sdma
device type, when hardware does not define such version.  Instead,
soc name is stable enough to define the device type.

The patch uses platform_device_id rather than version number passed
by platform data to identify sdma device type/version.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarVinod Koul <vinod.koul@intel.com>
parent abfafc2d

arch/arm/mach-imx/clock-imx25.c

+2 −1
Original line number Diff line number Diff line
@@ -308,7 +308,8 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "audmux", audmux_clk)

	_REGISTER_CLOCK("flexcan.0", NULL, can1_clk)

	_REGISTER_CLOCK("flexcan.1", NULL, can2_clk)

	_REGISTER_CLOCK("imx-sdma", NULL, sdma_clk)

	/* i.mx25 has the i.mx35 type sdma */

	_REGISTER_CLOCK("imx35-sdma", NULL, sdma_clk)

};



int __init mx25_clocks_init(void)

arch/arm/mach-imx/clock-imx31.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "ata", ata_clk)

	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)

	_REGISTER_CLOCK(NULL, "rng", rng_clk)

	_REGISTER_CLOCK("imx-sdma", NULL, sdma_clk1)

	_REGISTER_CLOCK("imx31-sdma", NULL, sdma_clk1)

	_REGISTER_CLOCK(NULL, "sdma_ipg", sdma_clk2)

	_REGISTER_CLOCK(NULL, "mstick", mstick1_clk)

	_REGISTER_CLOCK(NULL, "mstick", mstick2_clk)

arch/arm/mach-imx/clock-imx35.c

+1 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ static struct clk_lookup lookups[] = { 
	_REGISTER_CLOCK(NULL, "rtc", rtc_clk)

	_REGISTER_CLOCK(NULL, "rtic", rtic_clk)

	_REGISTER_CLOCK(NULL, "scc", scc_clk)

	_REGISTER_CLOCK("imx-sdma", NULL, sdma_clk)

	_REGISTER_CLOCK("imx35-sdma", NULL, sdma_clk)

	_REGISTER_CLOCK(NULL, "spba", spba_clk)

	_REGISTER_CLOCK(NULL, "spdif", spdif_clk)

	_REGISTER_CLOCK("imx-ssi.0", NULL, ssi1_clk)

arch/arm/mach-imx/mm-imx25.c

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,6 @@ static struct sdma_script_start_addrs imx25_sdma_script __initdata = { 
};



static struct sdma_platform_data imx25_sdma_pdata __initdata = {

	.sdma_version = 2,

	.fw_name = "sdma-imx25.bin",

	.script_addrs = &imx25_sdma_script,

};
@@ -92,5 +91,6 @@ void __init imx25_soc_init(void) 
	mxc_register_gpio("imx31-gpio", 2, MX25_GPIO3_BASE_ADDR, SZ_16K, MX25_INT_GPIO3, 0);

	mxc_register_gpio("imx31-gpio", 3, MX25_GPIO4_BASE_ADDR, SZ_16K, MX25_INT_GPIO4, 0);



	imx_add_imx_sdma(MX25_SDMA_BASE_ADDR, MX25_INT_SDMA, &imx25_sdma_pdata);

	/* i.mx25 has the i.mx35 type sdma */

	imx_add_imx_sdma("imx35-sdma", MX25_SDMA_BASE_ADDR, MX25_INT_SDMA, &imx25_sdma_pdata);

}

arch/arm/mach-imx/mm-imx31.c

+1 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ static struct sdma_script_start_addrs imx31_to2_sdma_script __initdata = { 
};



static struct sdma_platform_data imx31_sdma_pdata __initdata = {

	.sdma_version = 1,

	.fw_name = "sdma-imx31-to2.bin",

	.script_addrs = &imx31_to2_sdma_script,

};
@@ -88,5 +87,5 @@ void __init imx31_soc_init(void) 
		imx31_sdma_pdata.script_addrs = &imx31_to1_sdma_script;

	}



	imx_add_imx_sdma(MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);

	imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);

}