openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi-imx: Add mx25 support 

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Sascha Hauer 2009-12-13 00:58:41 -07:00 committed by Grant Likely
parent f30d59c5d3
commit 87f673e9ca
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/spi/spi_imx.c
View File

@ -208,7 +208,7 @@ static int mx31_config(struct spi_imx_data *spi_imx,
if (cpu_is_mx31()) if (cpu_is_mx31())
reg |= (config->bpw - 1) << MX31_CSPICTRL_BC_SHIFT; reg |= (config->bpw - 1) << MX31_CSPICTRL_BC_SHIFT;
else if (cpu_is_mx35()) { else if (cpu_is_mx25() || cpu_is_mx35()) {
reg |= (config->bpw - 1) << MX35_CSPICTRL_BL_SHIFT; reg |= (config->bpw - 1) << MX35_CSPICTRL_BL_SHIFT;
reg |= MX31_CSPICTRL_SSCTL; reg |= MX31_CSPICTRL_SSCTL;
} }
@ -222,7 +222,7 @@ static int mx31_config(struct spi_imx_data *spi_imx,
if (config->cs < 0) { if (config->cs < 0) {
if (cpu_is_mx31()) if (cpu_is_mx31())
reg |= (config->cs + 32) << MX31_CSPICTRL_CS_SHIFT; reg |= (config->cs + 32) << MX31_CSPICTRL_CS_SHIFT;
else if (cpu_is_mx35()) else if (cpu_is_mx25() || cpu_is_mx35())
reg |= (config->cs + 32) << MX35_CSPICTRL_CS_SHIFT; reg |= (config->cs + 32) << MX35_CSPICTRL_CS_SHIFT;
} }
@ -566,7 +566,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
goto out_iounmap; goto out_iounmap;
} }
if (cpu_is_mx31() || cpu_is_mx35()) { if (cpu_is_mx25() || cpu_is_mx31() || cpu_is_mx35()) {
spi_imx->intctrl = mx31_intctrl; spi_imx->intctrl = mx31_intctrl;
spi_imx->config = mx31_config; spi_imx->config = mx31_config;
spi_imx->trigger = mx31_trigger; spi_imx->trigger = mx31_trigger;
@ -598,7 +598,7 @@ static int __init spi_imx_probe(struct platform_device *pdev)
writel(1, spi_imx->base + MXC_RESET); writel(1, spi_imx->base + MXC_RESET);
/* drain receive buffer */ /* drain receive buffer */
if (cpu_is_mx31() || cpu_is_mx35()) if (cpu_is_mx25() || cpu_is_mx31() || cpu_is_mx35())
while (readl(spi_imx->base + MX3_CSPISTAT) & MX3_CSPISTAT_RR) while (readl(spi_imx->base + MX3_CSPISTAT) & MX3_CSPISTAT_RR)
readl(spi_imx->base + MXC_CSPIRXDATA); readl(spi_imx->base + MXC_CSPIRXDATA);