Commit 87f673e9 authored by Sascha Hauer's avatar Sascha Hauer Committed by Grant Likely

spi-imx: Add mx25 support

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent f30d59c5
...@@ -208,7 +208,7 @@ static int mx31_config(struct spi_imx_data *spi_imx, ...@@ -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, ...@@ -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) ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment